From 69537e6aa64a03d027a5e98247e9df7b2f6db4c0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 22 Dec 2023 21:09:26 +0000 Subject: [PATCH 001/481] libssh2: add some key reverse-dependencies to passthru.tests --- .../development/libraries/libssh2/default.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 091885a1f084..fa9115ea0070 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchurl, openssl, zlib, windows }: +{ lib +, stdenv +, fetchurl +, openssl +, zlib +, windows + +# for passthru.tests +, aria2 +, curl +, libgit2 +, mc +, vlc +}: stdenv.mkDerivation rec { pname = "libssh2"; @@ -15,6 +28,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; + passthru.tests = { + inherit aria2 libgit2 mc vlc; + curl = (curl.override { scpSupport = true; }).tests.withCheck; + }; + meta = with lib; { description = "A client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; From e6dc0fb1a1e4d191fd7f663cb1cbf93fa7f43609 Mon Sep 17 00:00:00 2001 From: Ruben Sanchez Diez Date: Tue, 16 Apr 2024 10:09:02 +0200 Subject: [PATCH 002/481] rustPlatform.importCargoLock: Adding sparse protocol When added the new sparse protocol the derivation is not handling properly Cargo.lock with sparse+ registries --- pkgs/build-support/rust/import-cargo-lock.nix | 5 +- .../basic-sparse/.cargo/config.toml | 5 ++ .../import-cargo-lock/basic-sparse/Cargo.lock | 75 +++++++++++++++++++ .../import-cargo-lock/basic-sparse/Cargo.toml | 9 +++ .../basic-sparse/default.nix | 33 ++++++++ .../basic-sparse/src/main.rs | 9 +++ 6 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index e3fe57ef06da..3db3f0e5e1f0 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -12,6 +12,8 @@ # Additional registries to pull sources from # { "https://" = "https://"; } + # or if the registry is using the new sparse protocol + # { "sparse+https://" = "https://"; } # where: # - "index URL" is the "index" value of the configuration entry for that registry # https://doc.rust-lang.org/cargo/reference/registries.html#using-an-alternate-registry @@ -117,7 +119,8 @@ let gitParts = parseGit pkg.source; registryIndexUrl = lib.removePrefix "registry+" pkg.source; in - if lib.hasPrefix "registry+" pkg.source && builtins.hasAttr registryIndexUrl registries then + if (lib.hasPrefix "registry+" pkg.source || lib.hasPrefix "sparse+" pkg.source) + && builtins.hasAttr registryIndexUrl registries then let crateTarball = fetchCrate pkg registries.${registryIndexUrl}; in runCommand "${pkg.name}-${pkg.version}" {} '' diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml new file mode 100644 index 000000000000..be8d304fa79d --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml @@ -0,0 +1,5 @@ +[registries.sparse-crates-io] +index = "sparse+https://index.crates.io/" + +[registries.crates-io] +protocol = "git" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock new file mode 100644 index 000000000000..104557e66a7b --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock @@ -0,0 +1,75 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "basic-sparse" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "sparse+https://index.crates.io/" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "sparse+https://index.crates.io/" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.153" +source = "sparse+https://index.crates.io/" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "sparse+https://index.crates.io/" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "rand" +version = "0.8.5" +source = "sparse+https://index.crates.io/" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "sparse+https://index.crates.io/" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "sparse+https://index.crates.io/" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "sparse+https://index.crates.io/" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml new file mode 100644 index 000000000000..1e62743eff18 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "basic-sparse" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +rand = { version = "0.8", registry = "sparse-crates-io" } diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix new file mode 100644 index 000000000000..7a87a69e5dac --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix @@ -0,0 +1,33 @@ +{ lib, rustPlatform }: +let + fs = lib.fileset; +in +rustPlatform.buildRustPackage { + pname = "basic-sparse"; + version = "0.1.0"; + + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./.cargo/config.toml + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + extraRegistries = { + "sparse+https://index.crates.io/" = "https://static.crates.io/crates"; + }; + }; + + doInstallCheck = true; + postConfigure = '' + cargo metadata --offline + ''; + installCheckPhase = '' + $out/bin/basic-sparse + ''; +} diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs new file mode 100644 index 000000000000..50b4ed799e43 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} From 804bc033a6d4736dabd996e1168c3630e77e83c7 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Sat, 11 May 2024 11:50:58 +0200 Subject: [PATCH 003/481] nixos/btrfs: refactor global `with lib;` --- nixos/modules/tasks/filesystems/btrfs.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 17e3a274c0e9..a5a95992c209 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -1,8 +1,18 @@ { config, lib, pkgs, utils, ... }: -with lib; - let + inherit (lib) + mkEnableOption + mkOption + types + mkMerge + mkIf + optionals + mkDefault + mapAttrsToList + nameValuePair + listToAttrs + filterAttrs; inInitrd = config.boot.initrd.supportedFilesystems.btrfs or false; inSystem = config.boot.supportedFilesystems.btrfs or false; From d0239a1e50a4aac0a768fe226eb4cc0acbd540d6 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Sat, 11 May 2024 12:10:38 +0200 Subject: [PATCH 004/481] nixos/btrfs: improve default selection of filesystems for `autoScrub` --- nixos/modules/tasks/filesystems/btrfs.nix | 28 +++++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index a5a95992c209..7329a7981337 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -9,10 +9,11 @@ let mkIf optionals mkDefault - mapAttrsToList nameValuePair listToAttrs - filterAttrs; + filterAttrs + mapAttrsToList + foldl'; inInitrd = config.boot.initrd.supportedFilesystems.btrfs or false; inSystem = config.boot.supportedFilesystems.btrfs or false; @@ -37,8 +38,9 @@ in description = '' List of paths to btrfs filesystems to regularly call {command}`btrfs scrub` on. Defaults to all mount points with btrfs filesystems. - If you mount a filesystem multiple times or additionally mount subvolumes, - you need to manually specify this list to avoid scrubbing multiple times. + Note that if you have filesystems that span multiple devices (e.g. RAID), you should + take care to use the same device for any given mount point and let btrfs take care + of automatically mounting the rest, in order to avoid scrubbing the same data multiple times. ''; }; @@ -107,12 +109,18 @@ in } ]; - # This will yield duplicated units if the user mounts a filesystem multiple times - # or additionally mounts subvolumes, but going the other way around via devices would - # yield duplicated units when a filesystem spans multiple devices. - # This way around seems like the more sensible default. - services.btrfs.autoScrub.fileSystems = mkDefault (mapAttrsToList (name: fs: fs.mountPoint) - (filterAttrs (name: fs: fs.fsType == "btrfs") config.fileSystems)); + # This will remove duplicated units from either having a filesystem mounted multiple + # time, or additionally mounted subvolumes, as well as having a filesystem span + # multiple devices (provided the same device is used to mount said filesystem). + services.btrfs.autoScrub.fileSystems = + let + isDeviceInList = list: device: builtins.filter (e: e.device == device) list != [ ]; + + uniqueDeviceList = foldl' (acc: e: if isDeviceInList acc e.device then acc else acc ++ [ e ]) [ ]; + in + mkDefault (map (e: e.mountPoint) + (uniqueDeviceList (mapAttrsToList (name: fs: { mountPoint = fs.mountPoint; device = fs.device; }) + (filterAttrs (name: fs: fs.fsType == "btrfs") config.fileSystems)))); # TODO: Did not manage to do it via the usual btrfs-scrub@.timer/.service # template units due to problems enabling the parameterized units, From 392a10f528c6ad36f94c57daed558dd99cb72df9 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 23 May 2024 17:11:33 -0700 Subject: [PATCH 005/481] shellclear: set buildAndTestSubdir --- pkgs/tools/security/shellclear/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/shellclear/default.nix b/pkgs/tools/security/shellclear/default.nix index 32be52bae267..3ab52fda2a70 100644 --- a/pkgs/tools/security/shellclear/default.nix +++ b/pkgs/tools/security/shellclear/default.nix @@ -16,6 +16,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-vPd1cFfoSkOnXH3zKQUB0zWDzEtao50AUrUzhpZIkgI="; + buildAndTestSubdir = "shellclear"; + meta = with lib; { description = "Secure shell history commands by finding sensitive data"; homepage = "https://github.com/rusty-ferris-club/shellclear"; From 814c20956308e52b446c80c3e282c2f325b7066c Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 23 May 2024 17:12:42 -0700 Subject: [PATCH 006/481] tokio-console: set buildAndTestSubdir --- pkgs/development/tools/tokio-console/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix index c37bf85de975..c86aa4b5d0f3 100644 --- a/pkgs/development/tools/tokio-console/default.nix +++ b/pkgs/development/tools/tokio-console/default.nix @@ -18,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-86KQpRpYSCQs6SUeG0HV26b58x/QUyovoL+5fg8JCOI="; + buildAndTestSubdir = "tokio-console"; + nativeBuildInputs = [ installShellFiles protobuf From dc9f57c229809c2c1ed8abe004935693a644101e Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 23 May 2024 17:15:34 -0700 Subject: [PATCH 007/481] llm-ls: set buildAndTestSubdir --- pkgs/by-name/ll/llm-ls/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix index d9fb4d6f60f6..9f1fca3eabea 100644 --- a/pkgs/by-name/ll/llm-ls/package.nix +++ b/pkgs/by-name/ll/llm-ls/package.nix @@ -21,6 +21,8 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-7McUyQjnCuV0JG65hUoR8TtB4vrjiEO1l7NXYochgG8="; + buildAndTestSubdir = "crates/llm-ls"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 9355057472638b6269edc72dac967756ff22bdb5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 13 Jun 2024 11:35:04 +0300 Subject: [PATCH 008/481] syncall: mark as broken --- pkgs/by-name/sy/syncall/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sy/syncall/package.nix b/pkgs/by-name/sy/syncall/package.nix index 5ad793b672a2..1e6392c9e6d0 100644 --- a/pkgs/by-name/sy/syncall/package.nix +++ b/pkgs/by-name/sy/syncall/package.nix @@ -69,5 +69,8 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/bergercookie/syncall"; license = licenses.mit; maintainers = with maintainers; [ raitobezarius ]; + # Upstream issue making it practically unusable: + # https://github.com/bergercookie/syncall/issues/99 + broken = true; }; } From fc0fdbe85ed4b70f56fd5d81bc6769e034fce779 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 25 Jun 2024 14:33:54 +0200 Subject: [PATCH 009/481] nixos/gitlab-runner: allow access to podman socket Allows access to podman control socket to gitlab-runner. --- .../services/continuous-integration/gitlab-runner.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 62c62c5d2360..406096536e40 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.gitlab-runner; hasDocker = config.virtualisation.docker.enable; + hasPodman = config.virtualisation.podman.enable && config.virtualisation.podman.dockerSocket.enable; /* The whole logic of this module is to diff the hashes of the desired vs existing runners The hash is recorded in the runner's name because we can't do better yet @@ -539,8 +540,11 @@ in { description = "Gitlab Runner"; documentation = [ "https://docs.gitlab.com/runner/" ]; after = [ "network.target" ] - ++ optional hasDocker "docker.service"; - requires = optional hasDocker "docker.service"; + ++ optional hasDocker "docker.service" + ++ optional hasPodman "podman.service"; + + requires = optional hasDocker "docker.service" + ++ optional hasPodman "podman.service"; wantedBy = [ "multi-user.target" ]; environment = config.networking.proxy.envVars // { HOME = "/var/lib/gitlab-runner"; @@ -562,7 +566,8 @@ in { # Make sure to restart service or changes won't apply. DynamicUser = true; StateDirectory = "gitlab-runner"; - SupplementaryGroups = optional hasDocker "docker"; + SupplementaryGroups = optional hasDocker "docker" + ++ optional hasPodman "podman"; ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure"; ExecStart = "${startScript}/bin/gitlab-runner-start"; ExecReload = "!${configureScript}/bin/gitlab-runner-configure"; From 9c4622d0738ae30829d4a23419833795f1276ae8 Mon Sep 17 00:00:00 2001 From: eriedaberrie Date: Tue, 2 Apr 2024 21:12:18 -0700 Subject: [PATCH 010/481] maintainers: add eriedaberrie --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3967b9202955..539314b1d292 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6047,6 +6047,13 @@ githubId = 323436; name = "Eric Yen"; }; + eriedaberrie = { + email = "eriedaberrie@gmail.com"; + matrix = "@eriedaberrie:matrix.org"; + github = "eriedaberrie"; + githubId = 64395218; + name = "eriedaberrie"; + }; erikarvstedt = { email = "erik.arvstedt@gmail.com"; matrix = "@erikarvstedt:matrix.org"; From 0a753aebc93ef87fce3574b7849750efd69a428b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 29 Feb 2024 21:48:20 +0100 Subject: [PATCH 011/481] haskell-modules/generic-builder.nix: use runCommand instead of phases --- pkgs/development/haskell-modules/generic-builder.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 6c60efe1bce5..f59e9fc93c64 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, buildHaskellPackages, ghc -, jailbreak-cabal, hscolour, cpphs +, jailbreak-cabal, hscolour, cpphs, runCommand , ghcWithHoogle, ghcWithPackages , nodejs }: @@ -790,8 +790,8 @@ stdenv.mkDerivation ({ lib.optionals (!isCross) setupHaskellDepends); ghcCommandCaps = lib.toUpper ghcCommand'; - in stdenv.mkDerivation { - inherit name shellHook; + in runCommand name { + inherit shellHook; depsBuildBuild = lib.optional isCross ghcEnvForBuild; nativeBuildInputs = @@ -799,8 +799,6 @@ stdenv.mkDerivation ({ collectedToolDepends; buildInputs = otherBuildInputsSystem; - phases = ["installPhase"]; - installPhase = "echo $nativeBuildInputs $buildInputs > $out"; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}"; @@ -810,7 +808,7 @@ stdenv.mkDerivation ({ "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false then "${ghcEnv}/lib/HaLVM-${ghc.version}" else "${ghcEnv}/${ghcLibdir}"; - }; + } "echo $nativeBuildInputs $buildInputs > $out"; env = envFunc { }; From 19e49c4b866eda859e44a4424def479885d6b4f7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 Jul 2024 19:17:59 +0100 Subject: [PATCH 012/481] python3Packages.flask-cors: add key reverse-dependencies to passthru.tests --- pkgs/development/python-modules/flask-cors/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 2456aa9ab52a..b9d62fcbd8e0 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -6,6 +6,10 @@ packaging, pytestCheckHook, setuptools, + + # for passthru.tests + aiobotocore, + moto, }: buildPythonPackage rec { @@ -29,6 +33,10 @@ buildPythonPackage rec { packaging ]; + passthru.tests = { + inherit aiobotocore moto; + }; + meta = with lib; { description = "Flask extension adding a decorator for CORS support"; homepage = "https://github.com/corydolphin/flask-cors"; From 2a88af5e63877cf0bdcc0f51b5dcee99a2012947 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 10 Jul 2024 23:20:31 +0200 Subject: [PATCH 013/481] python312Packages.pip-api: 0.0.33 -> 0.0.34 Diff: https://github.com/di/pip-api/compare/refs/tags/0.0.33...0.0.34 Changelog: https://github.com/di/pip-api/blob/0.0.34/CHANGELOG --- pkgs/development/python-modules/pip-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix index c6239ac4d151..562f701dece7 100644 --- a/pkgs/development/python-modules/pip-api/default.nix +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pip-api"; - version = "0.0.33"; + version = "0.0.34"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "di"; repo = "pip-api"; rev = "refs/tags/${version}"; - hash = "sha256-bDM31YpVB0pZMqeGTCbnINSmJc03N0HuU8hcc8nnHgw="; + hash = "sha256-nmCP4hp+BsD80OBjerOu+QTBBExGHvn/v19od4V3ncI="; }; nativeBuildInputs = [ setuptools ]; From b15945b43c05deaf013aa088393d727684cac003 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Thu, 11 Jul 2024 09:49:51 +0800 Subject: [PATCH 014/481] tplay: fix runtime ffprobe dependency --- pkgs/by-name/tp/tplay/package.nix | 37 ++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index 37bf1db7d198..39204176b534 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -1,13 +1,15 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, clang -, ffmpeg -, openssl -, alsa-lib -, libclang -, opencv +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + clang, + ffmpeg, + openssl, + alsa-lib, + libclang, + opencv, + makeWrapper, }: rustPlatform.buildRustPackage rec { pname = "tplay"; @@ -16,13 +18,13 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "maxcurzi"; repo = "tplay"; - rev = "v${version}"; + rev = "v${version}"; hash = "sha256-/3ui0VOxf+kYfb0JQXPVbjAyXPph2LOg2xB0DGmAbwc="; }; cargoHash = "sha256-zRkIEH37pvxHUbnfg25GW1Z7od9XMkRmP2Qvs64uUjg="; checkFlags = [ - # requires network access + # requires network access "--skip=pipeline::image_pipeline::tests::test_process" "--skip=pipeline::image_pipeline::tests::test_to_ascii" "--skip=pipeline::image_pipeline::tests::test_to_ascii_ext" @@ -34,6 +36,7 @@ rustPlatform.buildRustPackage rec { pkg-config clang ffmpeg + makeWrapper ]; buildInputs = [ @@ -44,11 +47,19 @@ rustPlatform.buildRustPackage rec { opencv ]; + postFixup = '' + wrapProgram $out/bin/tplay \ + --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" + ''; + meta = { description = "Terminal Media Player"; homepage = "https://github.com/maxcurzi/tplay"; platforms = lib.platforms.linux; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ demine colemickens ]; + maintainers = with lib.maintainers; [ + demine + colemickens + ]; }; } From 64575c36c1822e8791f4807abcfdd82fb4c54cf2 Mon Sep 17 00:00:00 2001 From: Aaron Kaiser Date: Sat, 13 Jul 2024 10:16:40 +0200 Subject: [PATCH 015/481] maintainers: add rixxc --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 01211d6d7be8..886fdb1a98f9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17163,6 +17163,12 @@ githubId = 449990; name = "Cedric Cellier"; }; + rixxc = { + email = "a_kaiser+nixpkgs@posteo.de"; + github = "Rixxc"; + githubId = 30271441; + name = "Aaron Kaiser"; + }; rizary = { email = "andika@numtide.com"; github = "Rizary"; From c6c5e5cd67bf448c7cb70777ba6f18302f8f75fd Mon Sep 17 00:00:00 2001 From: Aaron Kaiser Date: Thu, 11 Jul 2024 10:36:33 +0200 Subject: [PATCH 016/481] oqs-provider: init at 0.6.1 --- pkgs/by-name/oq/oqs-provider/package.nix | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/oq/oqs-provider/package.nix diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix new file mode 100644 index 000000000000..84ffce3f8f5c --- /dev/null +++ b/pkgs/by-name/oq/oqs-provider/package.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, cmake +, openssl +, liboqs +, lib +, nix-update-script +}: +stdenv.mkDerivation (finalAttrs: { + name = "oqs-provider"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "open-quantum-safe"; + repo = "oqs-provider"; + rev = finalAttrs.version; + hash = "sha256-AW0rOszXm9Hy55b2fQ2mpZulhXjYwvztwL6DIFgIzjA="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + openssl + liboqs + ]; + + nativeCheckInputs = [ openssl.bin ]; + + configureFlags = [ "--with-modulesdir=$$out/lib/ossl-modules" ]; + + postPatch = '' + echo ${finalAttrs.version} > VERSION + ''; + + preInstall = '' + mkdir -p "$out" + for dir in "$out" "${openssl.out}"; do + mkdir -p .install/"$(dirname -- "$dir")" + ln -s "$out" ".install/$dir" + done + export DESTDIR="$(realpath .install)" + ''; + + enableParallelInstalling = false; + + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/open-quantum-safe/oqs-provider"; + description = "Open Quantum Safe provider for OpenSSL (3.x)"; + license = licenses.mit; + maintainers = with maintainers; [ rixxc ]; + platforms = platforms.all; + }; +}) From 98100c759ad7174c9df990f45dac1581a0632c5f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:01:20 +0200 Subject: [PATCH 017/481] python312Packages.localstack: fix build --- .../python-modules/localstack/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 7bcb46fa595c..587f9e7b4440 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -4,8 +4,10 @@ fetchFromGitHub, apispec, boto3, + build, cachetools, click, + cryptography, localstack-client, localstack-ext, plux, @@ -22,7 +24,7 @@ buildPythonPackage rec { pname = "localstack"; version = "3.5.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "localstack"; @@ -31,18 +33,13 @@ buildPythonPackage rec { hash = "sha256-Sd5B4+pvUwNXfP3hsqBkUoHo06YyzUGCUHzc8f77Vx4="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "requests>=2.20.0,<2.26" "requests~=2.20" \ - --replace "cachetools~=5.0.0" "cachetools~=5.0" \ - --replace "boto3>=1.20,<1.25.0" "boto3~=1.20" - ''; - - propagatedBuildInputs = [ + dependencies = [ apispec boto3 + build cachetools click + cryptography localstack-client localstack-ext plux @@ -56,13 +53,20 @@ buildPythonPackage rec { tailer ]; + pythonRelaxDeps = [ "dill" ]; + pythonImportsCheck = [ "localstack" ]; # Test suite requires boto, which has been removed from nixpkgs # Just do minimal test, buildPythonPackage maps checkPhase # to installCheckPhase, so we can test that entrypoint point works. checkPhase = '' + runHook preCheck + + export HOME=$(mktemp -d) $out/bin/localstack --version + + runHook postCheck ''; meta = with lib; { From ec2ae3e0df54e20303276bd1a5bbccc9a55dd3f9 Mon Sep 17 00:00:00 2001 From: Honnip Date: Sun, 16 Jun 2024 23:25:41 +0900 Subject: [PATCH 018/481] nixos/firefox: add missing language packs Add `fur`, `sat`, `sc`, `skr`, `tg`. Aligned to Firefox 128 --- nixos/modules/programs/firefox.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 7e0dec57d2da..7521708fa94f 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -162,6 +162,7 @@ in "ff" "fi" "fr" + "fur" "fy-NL" "ga-IE" "gd" @@ -204,9 +205,12 @@ in "rm" "ro" "ru" + "sat" + "sc" "sco" "si" "sk" + "skr" "sl" "son" "sq" @@ -215,6 +219,7 @@ in "szl" "ta" "te" + "tg" "th" "tl" "tr" From def1da0b7f305d2afa7e9b9074c7c5c8bb068861 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 05:40:51 +0000 Subject: [PATCH 019/481] hareThirdParty.hare-ev: 0-unstable-2024-07-07 -> 0-unstable-2024-07-11 --- pkgs/development/hare-third-party/hare-ev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/hare-third-party/hare-ev/default.nix b/pkgs/development/hare-third-party/hare-ev/default.nix index bbbe79e76ff0..5d2102a04d12 100644 --- a/pkgs/development/hare-third-party/hare-ev/default.nix +++ b/pkgs/development/hare-third-party/hare-ev/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "hare-ev"; - version = "0-unstable-2024-07-07"; + version = "0-unstable-2024-07-11"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare-ev"; - rev = "aa01cdd0ba226ed9a4c5e6031e6aa7158aa05c9a"; - hash = "sha256-xq6d2+BbHk2iLg50mtqXqhkky/P9GeRAulSD7ouMnrA="; + rev = "ed023beb4b4db88e22f608aa001682ac18cad230"; + hash = "sha256-bZWVrxk3CMAHRnizRAqgT5wmRQaQ/Ua3AIAR5HZxMbE="; }; nativeCheckInputs = [ hareHook ]; From c5c92feff79f44c85b4ed00cbc6a3e1e84840d5e Mon Sep 17 00:00:00 2001 From: Jakob Klepp Date: Thu, 18 Jul 2024 14:29:06 +0200 Subject: [PATCH 020/481] nixos/oci-containers: document firewall bypass Add explanation about the security impact of the ports option. Provide a safer example. The problem is discussed in greater depth here: https://github.com/NixOS/nixpkgs/issues/111852 --- nixos/modules/virtualisation/oci-containers.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index f4fa93423179..5494b9ecf0f6 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -148,12 +148,17 @@ let somewhere within the specified `hostPort` range. Example: `1234-1236:1234/tcp` + Publishing a port bypasses the NixOS firewall. If the port is not + supposed to be shared on the network, make sure to publish the + port to localhost. + Example: `127.0.0.1:1234:1234` + Refer to the [Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details. ''; example = literalExpression '' [ - "8080:9000" + "127.0.0.1:8080:9000" ] ''; }; From ad7e8826530703b47cd679a0886bc5d675dc57e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 18:03:50 +0000 Subject: [PATCH 021/481] helm-docs: 1.13.1 -> 1.14.2 --- pkgs/applications/networking/cluster/helm-docs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index a087fb84fe6b..e60d34669b91 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.13.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - hash = "sha256-lSGgT+aWp4NgiIoCnR4TNdecEqIZVnKMmGtEingq05o="; + hash = "sha256-a7alzjh+vjJPw/g9yaYkOUvwpgiqCrtKTBkV1EuGYtk="; }; - vendorHash = "sha256-LpARmDupT+vUPqUwFnvOGKOaBQbTuTvQnWc5Q2bGBaY="; + vendorHash = "sha256-9VSjxnc804A+PTMy0ZoNWNkHAjh3/kMK0XoEfI/LgEY="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ From 7ede72fd0b1655ab7f3f239357788677e389a25a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 19:35:49 +0000 Subject: [PATCH 022/481] centrifugo: 5.4.1 -> 5.4.2 --- pkgs/by-name/ce/centrifugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index 82601a7fba63..62cc312490a2 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-rIsc+abyfhHncogxZnx7Dmvc/JRm+L4YKZOOW/Qtddg="; + hash = "sha256-rFS4oBYUtuy+buCJjS7lN3W9BINjAZ/Cxc4UXCASrDU="; }; - vendorHash = "sha256-+fZnoDH5nbzrGWrr8ayBqzJoAji6y+CYI+TvEISxPRs="; + vendorHash = "sha256-rFbYTPwuOn6VtJnPQC5eIIPcXvRTjmxrZzPdQsjRcSQ="; ldflags = [ "-s" From 1af9acb57f4c4a1d3e30c6d63855059f81563196 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 22:29:32 +0000 Subject: [PATCH 023/481] jdk22: 22.0.1-ga -> 22.0.2-ga --- pkgs/development/compilers/openjdk/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/info.json b/pkgs/development/compilers/openjdk/info.json index d4df70b8597f..d55f95f799ae 100644 --- a/pkgs/development/compilers/openjdk/info.json +++ b/pkgs/development/compilers/openjdk/info.json @@ -1,8 +1,8 @@ { "22": { - "version": "22.0.1-ga", + "version": "22.0.2-ga", "repo": "jdk22u", - "hash": "sha256-wCHgharBnvRSB3dWW8C3e80AZtxyFgP0SS5X1d4LzMc=" + "hash": "sha256-Zo1LOumkt9zTaPqbDcRL8lVJMqVle0QqzThtIz0JRNo=" }, "21": { "version": "21.0.3-ga", From b899747113ae8463e4235d47338a456ca8c24e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emin=20Ar=C4=B1can?= Date: Thu, 18 Jul 2024 18:16:13 -0500 Subject: [PATCH 024/481] colloid-icon-theme: new scheme variants --- pkgs/data/icons/colloid-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 1e14e7112955..17debd4132a4 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -13,7 +13,7 @@ let pname = "colloid-icon-theme"; in -lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" "all" ] schemeVariants +lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" ] schemeVariants lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] colorVariants stdenvNoCC.mkDerivation rec { From 588188fefce51faebe15aec1b37c68d976e067d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 08:11:27 +0000 Subject: [PATCH 025/481] renode-unstable: 1.15.1+20240627git66a08265a -> 1.15.1+20240716gita55a3d050 --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index acec8f5c9dcb..db387982336e 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.1+20240627git66a08265a"; + version = "1.15.1+20240716gita55a3d050"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-Np/+QydZ+temEOCPI4K+PHScCQBYeFPZ2pOlFLWYXmA="; + hash = "sha256-cYK/PNXy+G6Cg6oY1U13MX03d2r0hwKVMp9f3LqpTd0="; }; passthru.updateScript = From 6c3304da83fd1f6d6633aef878ffc6429778459b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 15:37:13 +0000 Subject: [PATCH 026/481] python312Packages.echo: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/echo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index b72a85ea9b03..a07f10e8a4b1 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "echo"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "glue-viz"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-0FmUA7kOFSRZXwbj8d7asujBPOjE2pFhu6TDNSGD4r0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-IKd5n8+U6+0dgV4PbLcPaormXCX4srGcXmvYSrnCt60="; }; nativeBuildInputs = [ From 8e3cf7d9b64938cca3bbc3e750dee7f8ca9e5893 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 00:11:24 +0000 Subject: [PATCH 027/481] snac2: 2.55 -> 2.56 --- pkgs/servers/snac2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index fd35bb64452d..3103a51f3ccd 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.55"; + version = "2.56"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-mhypzpdIr4XxsVsUhx2SGi3RiKpWiiIRNZm44Dl4FRs="; + hash = "sha256-/e2eUlcYvSQKrYvRAdjx6uKR7DnMipvblKZaHMr1go4="; }; buildInputs = [ curl openssl ]; From c719126205096bf7d6d80b092945a80305315e65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 01:11:28 +0000 Subject: [PATCH 028/481] kube-state-metrics: 2.12.0 -> 2.13.0 --- pkgs/by-name/ku/kube-state-metrics/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kube-state-metrics/package.nix b/pkgs/by-name/ku/kube-state-metrics/package.nix index f7e0b0110c8d..ec7c3f59c8b2 100644 --- a/pkgs/by-name/ku/kube-state-metrics/package.nix +++ b/pkgs/by-name/ku/kube-state-metrics/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kube-state-metrics"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kube-state-metrics"; rev = "v${version}"; - hash = "sha256-EBSlufgzT4zgxTO5B0/RHHJJ2GgtU3U9ypd1QjC3knE="; + hash = "sha256-7lI1RRC/Lw3OcYs3RA3caNvLYS7xEaCoxCM/ioa0goY="; }; - vendorHash = "sha256-A/oiFEWM3TOtk4V3xpehJ+5oKSyzYKZHVlp3wjykFRA="; + vendorHash = "sha256-Db7GTIC594yfp9gNn+hochpafqiRkLQIM/MTkX2S6E0="; excludedPackages = [ "./tests/e2e" From 19d042f29542b66106a5741b5fb5f74f0261919e Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 19 Jul 2024 16:46:43 -0400 Subject: [PATCH 029/481] jazzy: 0.13.5 -> 0.15.1 https://github.com/realm/jazzy/releases/tag/v0.13.6 https://github.com/realm/jazzy/releases/tag/v0.13.7 https://github.com/realm/jazzy/releases/tag/v0.14.0 https://github.com/realm/jazzy/releases/tag/v0.14.1 https://github.com/realm/jazzy/releases/tag/v0.14.2 https://github.com/realm/jazzy/releases/tag/v0.14.3 https://github.com/realm/jazzy/releases/tag/v0.14.4 https://github.com/realm/jazzy/releases/tag/v0.15.0 https://github.com/realm/jazzy/releases/tag/v0.15.1 Also fixes a build failure with clang 16. --- pkgs/development/tools/jazzy/Gemfile.lock | 86 +++++----- pkgs/development/tools/jazzy/gemset.nix | 184 +++++++++++++++------- 2 files changed, 175 insertions(+), 95 deletions(-) diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 9f6050001ccd..0392ca77724d 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -1,26 +1,31 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) - activesupport (4.2.11.3) - i18n (~> 0.7) + CFPropertyList (3.0.7) + base64 + nkf + rexml + activesupport (5.2.8.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.3) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) - claide (1.0.3) - cocoapods (1.9.3) - activesupport (>= 4.0.2, < 5) + base64 (0.2.0) + claide (1.1.0) + cocoapods (1.10.2) + addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.9.3) + cocoapods-core (= 1.10.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-stats (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) @@ -30,69 +35,78 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.14.0, < 2.0) - cocoapods-core (1.9.3) - activesupport (>= 4.0.2, < 6) + xcodeproj (>= 1.19.0, < 2.0) + cocoapods-core (1.10.2) + activesupport (> 5.0, < 6) + addressable (~> 2.6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) netrc (~> 0.11) + public_suffix typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.4.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.6.3) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-stats (1.1.0) - cocoapods-trunk (1.5.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.6) + concurrent-ruby (1.3.3) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - ffi (1.13.1) + ethon (0.16.0) + ffi (>= 1.15.0) + ffi (1.17.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jazzy (0.13.5) + jazzy (0.15.1) cocoapods (~> 1.5) mustache (~> 1.1) - open4 + open4 (~> 1.3) redcarpet (~> 3.4) - rouge (>= 2.0.6, < 4.0) + rexml (>= 3.2.7, < 4.0) + rouge (>= 2.0.6, < 5.0) sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) - json (2.3.1) + json (2.7.2) liferaft (0.0.6) - minitest (5.14.1) + mini_portile2 (2.8.7) + minitest (5.24.1) molinillo (0.6.6) mustache (1.1.1) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) + nkf (0.2.0) open4 (1.3.4) - redcarpet (3.5.0) - rouge (3.21.0) + public_suffix (6.0.0) + redcarpet (3.6.0) + rexml (3.3.2) + strscan + rouge (4.3.0) ruby-macho (1.4.0) sassc (2.4.0) ffi (~> 1.9) - sqlite3 (1.4.2) + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) + strscan (3.1.0) thread_safe (0.3.6) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.11) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.17.1) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -106,4 +120,4 @@ DEPENDENCIES jazzy BUNDLED WITH - 2.1.4 + 2.5.15 diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index 6e2b873d4fd3..1514943d1eb7 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -1,14 +1,25 @@ { activesupport = { - dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; + sha256 = "0r15sbhl4nrkh2g5ccbhmn3c2ngri71j0yfnarxkq90vdrhqqjgh"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.8.1"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; + type = "gem"; + }; + version = "2.8.7"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -16,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z94dnx0rljsfa3k24i1nc0vf1nfk3bbk89nqc6n1ax25h4fs5sw"; + sha256 = "0ly8zsgvih540xmxr098hsngv61cf119wf28q5hbvi1f7kgwvh96"; type = "gem"; }; - version = "1.27.3"; + version = "1.27.5"; }; atomos = { groups = ["default"]; @@ -31,67 +42,78 @@ }; version = "0.1.3"; }; - CFPropertyList = { + base64 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; type = "gem"; }; - version = "3.0.2"; + version = "0.2.0"; + }; + CFPropertyList = { + dependencies = ["base64" "nkf" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4"; + type = "gem"; + }; + version = "3.0.7"; }; claide = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; cocoapods = { - dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; + dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zqj1878izp34cn7552q2djs3zd4a5ylyv0af3yxbz34z0qllk60"; + sha256 = "0d0vlzjizqkw2m6am9gcnjkxy73zl74ill28v17v0s2v8fzd7nbg"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.2"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; + dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sn1561sdhq2bh35pmi9nhq1adjcgdkhxybd9pxcjs75zmqzpz13"; + sha256 = "1j1sapw5l3xc5d8mli09az1bbmfdynlx7xv8lbghvm9i1md14dl5"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.2"; }; cocoapods-deintegrate = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-downloader = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j03hxvz3m82fwgx3jayw0y2iqm7zpacn88r6nfj2arkbjxmvjwz"; + sha256 = "0jgipkiah3z6qb9ax6qac3b2m1idavd5adc319k5rjsfddpfgszh"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.3"; }; cocoapods-plugins = { dependencies = ["nap"]; @@ -103,22 +125,14 @@ version = "1.0.0"; }; cocoapods-search = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; - type = "gem"; - }; - version = "1.0.0"; - }; - cocoapods-stats = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xhdh5v94p6l612rwrk290nd2hdfx8lbaqfbkmj34md218kilqww"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.1.0"; + version = "1.0.1"; }; cocoapods-trunk = { dependencies = ["nap" "netrc"]; @@ -126,10 +140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c6028bmdwrbqcb49mr5qj1p3vcijnjqbsbzywfx1isp44j9mv5"; + sha256 = "0cgdx7z9psxxrsa13fk7qc9i6jskrwcafhrdz94avzia2y6dlnsz"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; cocoapods-try = { groups = ["default"]; @@ -154,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.1.6"; + version = "1.3.3"; }; escape = { source = { @@ -173,20 +187,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.12.0"; + version = "0.16.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.13.1"; + version = "1.17.0"; }; fourflusher = { groups = ["default"]; @@ -232,31 +246,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "0.9.5"; + version = "1.14.5"; }; jazzy = { - dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sassc" "sqlite3" "xcinvoke"]; + dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rexml" "rouge" "sassc" "sqlite3" "xcinvoke"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ysx3zq069mi1w69z0dqck9ss9iv18w8a2f6j663vqq6kn1b69dm"; + sha256 = "04gm9p7qlac46ml7fz5gd0b6f43hl3ib4w9vvxnq9k9fg9qqs88v"; type = "gem"; }; - version = "0.13.5"; + version = "0.15.1"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.3.1"; + version = "2.7.2"; }; liferaft = { source = { @@ -266,15 +280,25 @@ }; version = "0.0.6"; }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; + type = "gem"; + }; + version = "2.8.7"; + }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; type = "gem"; }; - version = "5.14.1"; + version = "5.24.1"; }; molinillo = { groups = ["default"]; @@ -322,6 +346,16 @@ }; version = "0.11.0"; }; + nkf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv"; + type = "gem"; + }; + version = "0.2.0"; + }; open4 = { source = { remotes = ["https://rubygems.org"]; @@ -330,25 +364,46 @@ }; version = "1.3.4"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; + type = "gem"; + }; + version = "6.0.0"; + }; redcarpet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; + sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.0"; + }; + rexml = { + dependencies = ["strscan"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5"; + type = "gem"; + }; + version = "3.3.2"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "3.21.0"; + version = "4.3.0"; }; ruby-macho = { groups = ["default"]; @@ -372,14 +427,25 @@ version = "2.4.0"; }; sqlite3 = { + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; type = "gem"; }; - version = "1.4.2"; + version = "1.7.3"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; }; thread_safe = { source = { @@ -395,10 +461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -406,10 +472,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "1dk1cfnhgl14l580b650qyp8m5xpqb3zg0wb251h5jkm46hzc0b5"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; xcinvoke = { dependencies = ["liferaft"]; @@ -426,9 +492,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mv5rsbgwq4vzri31w2f1474arrsr5j69rdhklrci6jnjps8dmx9"; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; type = "gem"; }; - version = "1.17.1"; + version = "1.19.0"; }; } From 1ff77ae5ac102ca6d301c2be69f6168ce6eb7b0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 17:15:17 +0000 Subject: [PATCH 030/481] proto: 0.38.0 -> 0.38.3 --- pkgs/by-name/pr/proto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 71e26e3d57b4..0e19eb417167 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.38.0"; + version = "0.38.3"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-60PLC/5aouvUy33Qw/orEv+3/3j//3frUxZdh4chlMc="; + hash = "sha256-o/du9XmiS7U5ypm6osQtVTjrJY60iLCkJ4DWCYOeIoY="; }; - cargoHash = "sha256-l6BzvJI+DimykVKYl7Gow+7f3uwfDFajmHcXKoUwcUk="; + cargoHash = "sha256-Z0XPouvv6eR9eKLQurI/UGSiRZyGUo/x1c/XbcJlO5A="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From f236dfa809494d389967e67ffc5a43dbf2a3b7a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 23:14:32 +0000 Subject: [PATCH 031/481] openpgp-ca: 0.13.1 -> 0.14.0 --- pkgs/by-name/op/openpgp-ca/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix index 0db67f6a22a2..e97087ccf596 100644 --- a/pkgs/by-name/op/openpgp-ca/package.nix +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-ca"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitLab { owner = "openpgp-ca"; repo = "openpgp-ca"; rev = "openpgp-ca/v${version}"; - hash = "sha256-6K7H/d82Ge+JQykqTXAD43wlGTQl+U9D/vA+CNz4rfM="; + hash = "sha256-71SApct2yQV3ueWDlZv7ScK1s0nWWS57cPCvoMutlLA="; }; - cargoHash = "sha256-PrbepiaQbfGEqJRIcOMR6ED3BLopZLhospTzWRUoW0A="; + cargoHash = "sha256-L0Z+Oxov0y+PipdXz8/3Y0MKYhr/lNYurphc9s0K+Dg="; nativeBuildInputs = [ pkg-config From 6210c985c3ef251502f0f995ecbf49291be55288 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 01:21:39 +0000 Subject: [PATCH 032/481] ghorg: 1.9.12 -> 1.9.13 --- pkgs/applications/version-management/ghorg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/ghorg/default.nix b/pkgs/applications/version-management/ghorg/default.nix index a3aa4218042c..528bba032b9f 100644 --- a/pkgs/applications/version-management/ghorg/default.nix +++ b/pkgs/applications/version-management/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.12"; + version = "1.9.13"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-8M8ovb3T7iSHXepG1eH3ByX+g5iVRl4/pctigQ4I0Pk="; + sha256 = "sha256-RXXDWz8sXvn0+6JFf6cHNRwg9xAGrCHGRM/M8MQpMko="; }; doCheck = false; From 3939831dad7645c330b409e961527a01c4732ff9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 06:09:56 +0000 Subject: [PATCH 033/481] notesnook: 3.0.8 -> 3.0.11 --- pkgs/applications/misc/notesnook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index ebac30c58a6c..82ade89882a1 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -2,7 +2,7 @@ let pname = "notesnook"; - version = "3.0.8"; + version = "3.0.11"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,7 +16,7 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-H25PGhCD5uqh2BHMMjb7GyftinBsRs2O5+9xNNV+5m4="; + x86_64-linux = "sha256-QnjfeN6CoLiyZvJY4mAZFJ58LxHhe/QUzpI4Fbz5Etg="; x86_64-darwin = "sha256-uT4xo4LT70jq7bHmiYu4FL8Fldppc2ai8yEZzGMzM6Q="; aarch64-darwin = "sha256-D5KIXHhzXXBOEcoOn2QKKUbVGMWhRW+L7fgxRxLpX/0="; }.${system} or throwSystem; From 50a847ea04478eef0f9b353a925be5050f67b696 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 09:03:41 +0000 Subject: [PATCH 034/481] supermariowar: 2.0-unstable-2024-06-22 -> 2023-unstable-2024-07-16 --- pkgs/by-name/su/supermariowar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix index 2da3cc58dc42..dd813563ea60 100644 --- a/pkgs/by-name/su/supermariowar/package.nix +++ b/pkgs/by-name/su/supermariowar/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "supermariowar"; - version = "2.0-unstable-2024-06-22"; + version = "2023-unstable-2024-07-16"; src = fetchFromGitHub { owner = "mmatyas"; repo = "supermariowar"; - rev = "e646679c119a3b6c93c48e505564e8d24441fe4e"; - hash = "sha256-bA/Pu47Rm1MrnJHIrRvOevI3LXj207GFcJloP94/LOA="; + rev = "0ba445f425d03a444b3814bcd5898590ef8845b9"; + hash = "sha256-4a34m1f7LRA48RZwHLa2Sv3oeTakPZ3ezFv3rEuKmqM="; fetchSubmodules = true; }; From 3892e83f95a61e3da7e264ad69c3795ec7a44b5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 12:15:11 +0000 Subject: [PATCH 035/481] pslib: 0.4.6 -> 0.4.8 --- pkgs/development/libraries/pslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index f91f55530aed..02a8fcde91ef 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "pslib"; - version = "0.4.6"; + version = "0.4.8"; src = fetchurl { name = "${pname}-snixource-${version}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0m191ckqj1kj2yvxiilqw26x4vrn7pnlc2vy636yphjxr02q8bk4"; + sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64="; }; nativeBuildInputs = [ cmake pkg-config ]; From 94e7afa70acd17b173c4b71c6294399278b8ad36 Mon Sep 17 00:00:00 2001 From: eriedaberrie Date: Tue, 2 Apr 2024 21:48:41 -0700 Subject: [PATCH 036/481] syncyomi: init at 1.1.1 --- pkgs/by-name/sy/syncyomi/package.nix | 86 ++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 pkgs/by-name/sy/syncyomi/package.nix diff --git a/pkgs/by-name/sy/syncyomi/package.nix b/pkgs/by-name/sy/syncyomi/package.nix new file mode 100644 index 000000000000..ee2e6af318fc --- /dev/null +++ b/pkgs/by-name/sy/syncyomi/package.nix @@ -0,0 +1,86 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, buildGoModule +, nodejs +, pnpm_9 +, esbuild +}: + +buildGoModule rec { + pname = "syncyomi"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "SyncYomi"; + repo = "SyncYomi"; + rev = "refs/tags/v${version}"; + hash = "sha256-90MA62Zm9ouaf+CnYsbOm/njrUui21vW/VrwKYfsCZs="; + }; + + vendorHash = "sha256-/rpT6SatIZ+GVzmVg6b8Zy32pGybprObotyvEgvdL2w="; + + web = stdenvNoCC.mkDerivation (finalAttrs: { + pname = "${pname}-web"; + inherit src version; + sourceRoot = "${finalAttrs.src.name}/web"; + + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) pname version src sourceRoot; + hash = "sha256-25Bg8sTeH/w25KdfwgZNoqBXz2d5c1QD5vGb33xpTCA="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_9.configHook + ]; + + env.ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.17.19"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }); + + buildPhase = '' + runHook preBuild + pnpm build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + }); + + preConfigure = '' + cp -r $web/* web/dist + ''; + + ldflags = [ + "-s" "-w" + "-X main.version=v${version}" + ]; + + postInstall = lib.optionalString (!stdenvNoCC.isDarwin) '' + mv $out/bin/SyncYomi $out/bin/syncyomi + ''; + + meta = { + description = "Open-source project to synchronize Tachiyomi manga reading progress and library across multiple devices"; + homepage = "https://github.com/SyncYomi/SyncYomi"; + changelog = "https://github.com/SyncYomi/SyncYomi/releases/tag/v${version}"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ eriedaberrie ]; + mainProgram = "syncyomi"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} From 79e55e325b48e86635a295b9c75edb39ce0ef504 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jul 2024 12:24:09 +0000 Subject: [PATCH 037/481] beluga: 1.1.1 -> 1.1.2 --- pkgs/applications/science/logic/beluga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index b1497e2b1dcb..d85f375f9f89 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -2,13 +2,13 @@ ocamlPackages.buildDunePackage rec { pname = "beluga"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; rev = "refs/tags/v${version}"; - hash = "sha256-l/C77czLtlLnpadVx4d9ve9jv/e11jsOgzrbXt+Zo5s="; + hash = "sha256-QUZ3mmd0gBQ+hnAeo/TbvFsETnThAdAoQyfpz2F//4g="; }; duneVersion = "3"; From 3f3074d93dc53cd590de78fe9097cf1d87da284b Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Mon, 22 Jul 2024 21:18:14 +0300 Subject: [PATCH 038/481] gr-framework: 0.73.6 -> 0.73.7 --- pkgs/by-name/gr/gr-framework/package.nix | 23 ++++++++--------- ...de-to-search-for-the-LibXml2-package.patch | 25 ------------------- 2 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch diff --git a/pkgs/by-name/gr/gr-framework/package.nix b/pkgs/by-name/gr/gr-framework/package.nix index 1bb6e2ac7393..9914ae54b4df 100644 --- a/pkgs/by-name/gr/gr-framework/package.nix +++ b/pkgs/by-name/gr/gr-framework/package.nix @@ -2,51 +2,50 @@ lib, stdenv, fetchFromGitHub, - nix-update-script, - qt5, cmake, + ninja, + qt6, cairo, ffmpeg, - freetype, ghostscript, glfw, - libjpeg, libtiff, qhull, + xercesc, xorg, zeromq, + + nix-update-script, }: stdenv.mkDerivation rec { pname = "gr-framework"; - version = "0.73.6"; + version = "0.73.7"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; - hash = "sha256-XzOII13XwxkPZhtL4USkmUmJTL7dZImx4yVYJmhcn08="; + hash = "sha256-Xd1x6RUlre/5oxq0wiVKkIAuGKgtoNY/5aa7dvmn71U="; }; - patches = [ ./use-the-module-mode-to-search-for-the-LibXml2-package.patch ]; - nativeBuildInputs = [ cmake - qt5.wrapQtAppsHook + ninja + qt6.wrapQtAppsHook ]; buildInputs = [ cairo ffmpeg - freetype ghostscript glfw - libjpeg libtiff qhull - qt5.qtbase + qt6.qtbase + xercesc xorg.libX11 xorg.libXft xorg.libXt diff --git a/pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch b/pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch deleted file mode 100644 index 2712387a2cfb..000000000000 --- a/pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 47063bf00060dd6e8ccb384770a7c04dc534dce0 Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev -Date: Wed, 19 Jun 2024 21:17:33 +0300 -Subject: [PATCH] Use the module mode to search for the `LibXml2` package. - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed36d99d..6031dc77 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -123,7 +123,7 @@ else() - # Therefore, disable the inspection of the `PATH` variable by setting `NO_SYSTEM_ENVIRONMENT_PATH` option. - # See for more details. -- find_package(LibXml2 NO_MODULE NO_SYSTEM_ENVIRONMENT_PATH) -+ find_package(LibXml2 MODULE) - endif() - - # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set --- -2.45.1 - From e28178e6e33ebbcd0f2b56c6763eed4ca582fd13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 02:43:27 +0000 Subject: [PATCH 039/481] aiac: 5.0.1 -> 5.2.1 --- pkgs/applications/networking/cluster/aiac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix index 3e3730c1a42b..ac1d51ecee3a 100644 --- a/pkgs/applications/networking/cluster/aiac/default.nix +++ b/pkgs/applications/networking/cluster/aiac/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aiac"; - version = "5.0.1"; + version = "5.2.1"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "gofireflyio"; repo = pname; rev = "v${version}"; - hash = "sha256-1kWXvmnfdx44HYjW3vHuj2oU1uMabeGcZutkpszWg7Y="; + hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw="; }; vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE="; From 92889dbc2fadcac1e929a1362915bb888ed7a8c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 06:22:45 +0000 Subject: [PATCH 040/481] heroku: 8.11.5 -> 9.0.0 --- pkgs/development/tools/heroku/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 43be538a612e..7ced9fdda509 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "8.11.5"; + version = "9.0.0"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/8.11.5/df5cd30/heroku-v8.11.5-df5cd30-linux-x64.tar.xz"; - hash = "sha256-in6VuJmoItXGL85XqN1oItGPkUmDb4n+LzxE5q4ycYc="; + url = "https://cli-assets.heroku.com/versions/9.0.0/4da724b/heroku-v9.0.0-4da724b-linux-x64.tar.xz"; + hash = "sha256-wkwQ2IAsYqKxeNBZ3ASHipLUa7wU4Z53Dx6BnNKE3H8="; }; nativeBuildInputs = [ makeWrapper ]; From d5dcf82d19a5598c40fb874a25153dbd3f234dc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 12:24:25 +0000 Subject: [PATCH 041/481] seafile-shared: 9.0.6 -> 9.0.7 --- pkgs/misc/seafile-shared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 0f9457c9aaef..e4852faeb409 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.6"; + version = "9.0.7"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-ig22Rw9VWPqOsJS1Wxy69OjdMRcxh2fOyqMHBEky/Uo="; + sha256 = "sha256-Q2jqwuGhZpASfpLfgfuZKnOrALmctURj845QhxO3o5s="; }; nativeBuildInputs = [ From 087a46f14faba47ac0032fdd96d1b46a11210a57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 12:24:37 +0000 Subject: [PATCH 042/481] seafile-client: 9.0.6 -> 9.0.7 --- pkgs/applications/networking/seafile-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 0a133bb49e5e..64705c26b59b 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "seafile-client"; - version = "9.0.6"; + version = "9.0.7"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-JjicVgDqiuIuVn7swbVekqQ+3Ly64Nd7qKu5UymTEYE="; + sha256 = "sha256-Q/Dimm4oJH6mh0mCbVhkqJuRI9wytGmeBGNjMWiPil4="; }; nativeBuildInputs = [ From 0a398a909050e46631426f7feed4cb95dffe84d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 15:17:32 +0000 Subject: [PATCH 043/481] praat: 6.4.13 -> 6.4.14 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index fb27f769f897..119983971be3 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.13"; + version = "6.4.14"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-rvaW4ifXZNAmON+2OZR2JLGPzaTEzk2miKeFHQ7Bp6M="; + hash = "sha256-AY/OSoCWlWSjtLcve16nL72HidPlJqJgAOvUubMqvj0="; }; nativeBuildInputs = [ From c032450a0ce9ef63601cf360e72c679b65adf871 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 18:13:12 +0000 Subject: [PATCH 044/481] cirrus-cli: 0.120.3 -> 0.121.0 --- .../tools/continuous-integration/cirrus-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 3f584030603c..e6a18cfc8744 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.120.3"; + version = "0.121.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-xuNX2/OjgB2gIqK0wEj2s0867YBKXaz8fvDLJ/pd8U8="; + hash = "sha256-ec7HUYeBgoAtTxHIlW3dgC38z15pplWL/RhcZyxmIsE="; }; vendorHash = "sha256-R5H48idKHTTECEffpQIZgj9xMlHgHCL5OFbe3ZAda/o="; From 67e62119072682e85be0efc0b050930d38b2815e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 18:56:32 +0000 Subject: [PATCH 045/481] caf: 1.0.0 -> 1.0.1 --- pkgs/development/libraries/caf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 500b868edc07..854032d56157 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-woyl6HcUGOB3WWiNVMrmrpDAePFTzNtqK9V4UOzDb50="; + hash = "sha256-ANtqGFctgOAynDiZS9tmWRASVpB2RqRTG7JSXZIDmP8="; }; nativeBuildInputs = [ cmake ]; From ff60f2ca07e5007933e1bf2921520d2d76d607c0 Mon Sep 17 00:00:00 2001 From: Magnus Bergmark Date: Tue, 23 Jul 2024 23:32:09 +0200 Subject: [PATCH 046/481] maintainers: add Mange. --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index af21a01d2d92..7047511ec81b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12349,6 +12349,13 @@ githubId = 115060; name = "Marek Maksimczyk"; }; + Mange = { + name = "Magnus Bergmark"; + email = "me@mange.dev"; + github = "Mange"; + githubId = 1599; + keys = [ { fingerprint = "2EA6 F4AA 110A 1BF2 2275 19A9 0443 C69F 6F02 2CDE"; } ]; + }; mangoiv = { email = "contact@mangoiv.com"; github = "mangoiv"; From ed308b0d06429761119a78d19a4b719147bb8844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 00:41:18 +0000 Subject: [PATCH 047/481] ocamlPackages.ringo: 1.0.0 -> 1.1.0 --- pkgs/development/ocaml-modules/ringo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix index 7597a3b078b0..bdc9e07c0411 100644 --- a/pkgs/development/ocaml-modules/ringo/default.nix +++ b/pkgs/development/ocaml-modules/ringo/default.nix @@ -2,12 +2,12 @@ buildDunePackage rec { pname = "ringo"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "ringo"; rev = "v${version}"; - hash = "sha256-9HW3M27BxrEPbF8cMHwzP8FmJduUInpQQAE2672LOuU="; + hash = "sha256-8dThhY7TIjd0lLdCt6kxr0yhgVGDyN6ZMSx0Skfbcwk="; }; minimalOCamlVersion = "4.08"; From 1432699caab578b84d2d6b9b508a9bc7bc76b798 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 16:34:40 +0000 Subject: [PATCH 048/481] ut: 2.0.1 -> 2.1.0 --- pkgs/by-name/ut/ut/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ut/ut/package.nix b/pkgs/by-name/ut/ut/package.nix index 3b4a7429d902..961db913d755 100644 --- a/pkgs/by-name/ut/ut/package.nix +++ b/pkgs/by-name/ut/ut/package.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ut"; - version = "2.0.1"; + version = "2.1.0"; cmakeFlags = [ "-DBOOST_UT_ALLOW_CPM_USE=OFF" @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "boost-ext"; repo = "ut"; rev = "v${finalAttrs.version}"; - hash = "sha256-4OZvDcUtw6x/E9yLRQukfn6PskxtVBrsLPP48yo/lN0="; + hash = "sha256-pO6tNliAbX1GxYdD6Y+koFUzcvPFrx7s6B0mM6soQM0="; }; nativeBuildInputs = [ From 9d67a1f61e06fe425e9ab8d23c0dc43838d5eb72 Mon Sep 17 00:00:00 2001 From: Magnus Bergmark Date: Tue, 23 Jul 2024 23:49:20 +0200 Subject: [PATCH 049/481] rofi-emoji: Split into v4 and v3 versions https://github.com/Mange/rofi-emoji/releases/tag/v4.0.0 rofi-emoji now has two branches, one for the stable release of Rofi and another for the unstable unreleased version of Rofi. A lot of Rofi forks are based on this unstable branch, which causes some issues for users. Having the latest release available should be helpful for those users. The default named `rofi-emoji` version is version 3, which builds against the current version of the `rofi` pkg. The other version is exposed as `rofi-emoji-wayland` and is built with version 4 against the `rofi-wayland` fork. Other changes: - Add Mange as maintainer. - Update 3.4.0 to 3.4.1. - Stop requiring xsel. - Only require xclip with X11 support enabled. - Only require wl-clipboard with Wayland support enabled. --- pkgs/applications/misc/rofi-emoji/default.nix | 89 +++++++++---------- .../applications/misc/rofi-emoji/versions.nix | 18 ++++ pkgs/top-level/all-packages.nix | 7 +- 3 files changed, 67 insertions(+), 47 deletions(-) create mode 100644 pkgs/applications/misc/rofi-emoji/versions.nix diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 71d7ee69b1dc..39004f04945e 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -15,61 +15,58 @@ , rofi-unwrapped , wl-clipboard , xclip -, xsel , xdotool , wtype }: -stdenv.mkDerivation rec { - pname = "rofi-emoji"; - version = "3.4.0"; +import ./versions.nix ({ version, hash, patches}: + stdenv.mkDerivation rec { + pname = "rofi-emoji"; + inherit version; - src = fetchFromGitHub { - owner = "Mange"; - repo = pname; - rev = "v${version}"; - hash = "sha256-tF3yAKRUix+if+45rxg5vq83Pu33TQ6oUKWPIs/l4X0="; - }; + src = fetchFromGitHub { + owner = "Mange"; + repo = "rofi-emoji"; + rev = "v${version}"; + inherit hash; + }; - patches = [ - # Look for plugin-related files in $out/lib/rofi - ./0001-Patch-plugindir-to-output.patch - ]; + inherit patches; - postPatch = '' - patchShebangs clipboard-adapter.sh - ''; + postPatch = '' + patchShebangs clipboard-adapter.sh + ''; - postFixup = '' - chmod +x $out/share/rofi-emoji/clipboard-adapter.sh - wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \ - --prefix PATH ":" ${lib.makeBinPath ([ libnotify wl-clipboard xclip xsel ] - ++ lib.optionals waylandSupport [ wtype ] - ++ lib.optionals x11Support [ xdotool ])} - ''; + postFixup = '' + chmod +x $out/share/rofi-emoji/clipboard-adapter.sh + wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \ + --prefix PATH ":" ${lib.makeBinPath ([ libnotify ] + ++ lib.optionals waylandSupport [ wl-clipboard wtype ] + ++ lib.optionals x11Support [ xclip xdotool ])} + ''; - nativeBuildInputs = [ - autoreconfHook - pkg-config - makeWrapper - ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + makeWrapper + ]; - buildInputs = [ - cairo - glib - libnotify - rofi-unwrapped - wl-clipboard - xclip - xsel - ]; + buildInputs = [ + cairo + glib + libnotify + rofi-unwrapped + ] + ++ lib.optionals waylandSupport [ wl-clipboard wtype ] + ++ lib.optionals x11Support [ xclip ]; - meta = with lib; { - description = "Emoji selector plugin for Rofi"; - homepage = "https://github.com/Mange/rofi-emoji"; - license = licenses.mit; - maintainers = with maintainers; [ cole-h ]; - platforms = platforms.linux; - }; -} + meta = with lib; { + description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})"; + homepage = "https://github.com/Mange/rofi-emoji"; + license = licenses.mit; + maintainers = with maintainers; [ cole-h Mange ]; + platforms = platforms.linux; + }; + } +) diff --git a/pkgs/applications/misc/rofi-emoji/versions.nix b/pkgs/applications/misc/rofi-emoji/versions.nix new file mode 100644 index 000000000000..20b79d584634 --- /dev/null +++ b/pkgs/applications/misc/rofi-emoji/versions.nix @@ -0,0 +1,18 @@ +generic: { + v4 = generic { + version = "4.0.0"; + hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo="; + patches = [ + # Look for plugin-related files in $out/lib/rofi + ./0001-Patch-plugindir-to-output.patch + ]; + }; + v3 = generic { + version = "3.4.1"; + hash = "sha256-ZHhgYytPB14zj2MS8kChRD+LTqXzHRrz7YIikuQD6i0="; + patches = [ + # Look for plugin-related files in $out/lib/rofi + ./0001-Patch-plugindir-to-output.patch + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f6b69f82eaf..63737a263c36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32469,7 +32469,12 @@ with pkgs; rofi-calc = callPackage ../applications/science/math/rofi-calc { }; - rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; + rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3; + rofi-emoji-wayland = ( + callPackage ../applications/misc/rofi-emoji { + rofi-unwrapped = rofi-wayland-unwrapped; + } + ).v4; rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { }; From 7739b0cb1e866ca66803be11053a4cb9c004498d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 23:38:27 +0000 Subject: [PATCH 050/481] linuxkit: 1.3.0 -> 1.4.0 --- pkgs/development/tools/misc/linuxkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 7ed18a3056d0..0f4ed45996ca 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "linuxkit"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "sha256-FK8aJGVIVu7nd6VwMlgs9daqr9rgz81OczbcHUGW89w="; + sha256 = "sha256-MUZMBqbwudvzZ5uoiBIm54HS1CwqHyTbFkHMKSIvvYs="; }; vendorHash = null; From 000336e4b7929475e1bb140c82e198b99f2fdf38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 02:56:53 +0000 Subject: [PATCH 051/481] umpire: 2024.02.1 -> 2024.07.0 --- pkgs/by-name/um/umpire/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix index a56b6f9c5f23..075084affdd1 100644 --- a/pkgs/by-name/um/umpire/package.nix +++ b/pkgs/by-name/um/umpire/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "umpire"; - version = "2024.02.1"; + version = "2024.07.0"; src = fetchFromGitHub { owner = "LLNL"; repo = "umpire"; rev = "v${version}"; - hash = "sha256-cIUGlRNdbddxcC0Lj0co945RlHcPrDLo+bZIsUB9im4="; + hash = "sha256-T3f5zFaDri7v09/LNJE7v45Nosx9QQjTptnuFREk6PM="; fetchSubmodules = true; }; From 679d037ea7673b747ea466aeb1026a9d56d90fad Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 24 Jul 2024 21:45:11 -0700 Subject: [PATCH 052/481] busybox: fix building with llvm --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965fa97f3885..71c00d25ba33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26534,7 +26534,12 @@ with pkgs; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; - busybox = callPackage ../os-specific/linux/busybox { }; + busybox = callPackage ../os-specific/linux/busybox { + # Fixes libunwind from being dynamically linked to a static binary. + stdenv = if (stdenv.targetPlatform.useLLVM or false) then + overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx + else stdenv; + }; busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { # musl roadmap has RISC-V support projected for 1.1.20 busybox = if !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isLoongArch64 && stdenv.hostPlatform.libc != "bionic" From 0fbbce440f5fb67442b28a6d70f0374d32f4d905 Mon Sep 17 00:00:00 2001 From: CnTeng Date: Thu, 25 Jul 2024 11:13:09 +0800 Subject: [PATCH 053/481] maintainers: add CnTeng --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cba9fce1d529..8ac0321d202d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3830,6 +3830,12 @@ githubId = 718298; name = "Michael Livshin"; }; + CnTeng = { + name = "CnTeng"; + email = "me@snakepi.xyz"; + github = "CnTeng"; + githubId = 56501688; + }; CobaltCause = { name = "Charles Hall"; email = "charles@computer.surgery"; From 90addb6b7f0bf0c25ddf0d73fe24fdd2b9dbca84 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 22 Jul 2024 08:11:40 +0000 Subject: [PATCH 054/481] mysql-shell-innovation: 9.0.0 -> 9.0.1 --- pkgs/development/tools/mysql-shell/innovation.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index aecfc3f06a0c..32fd0746360f 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -34,8 +34,8 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; - mysqlShellVersion = "9.0.0"; - mysqlServerVersion = "9.0.0"; + mysqlShellVersion = "9.0.1"; + mysqlServerVersion = "9.0.1"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell-innovation"; @@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-Eadqo0BGFcacgv/FKL4GnzPWwXvjsCaz01YYFBAUCy0="; + hash = "sha256-GPpl8epq6nHkGP4FSFUtmijeaOK4vDupU2WZ60WaZgY="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-0b+QUVp6D1a8ed1HG7u+s4PZ8rGfM6uCOcpq/T8FPjs="; + hash = "sha256-F77W+cY1X29p4DIA1JOxJ6jAKT+8Qz4LkHh91MASlE0="; }) ]; From 8383d1dddd33f078c7156459f83bca46a1999279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 12:42:29 +0000 Subject: [PATCH 055/481] kitex: 0.10.1 -> 0.10.2 --- pkgs/by-name/ki/kitex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index a2d88c0cfb23..8008802849bd 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kitex"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; rev = "v${version}"; - hash = "sha256-eiwOivulPBYEK7Pmztmb2dgUytPT0hZW5BiCpovUZWw="; + hash = "sha256-TvWFbjmKIvX26KV3JZRXcd7jF823tdTr5pCP/N66nIc="; }; - vendorHash = "sha256-4tOi1BENGNdqo3xG7PnKbIUb/QsUFhm0wDcRYrMGC0M="; + vendorHash = "sha256-nscMcJGFZ1YPPynTV+Mp8tXndtlIcszDZm36zMbNBYs="; subPackages = [ "tool/cmd/kitex" ]; From 3dc43c3821d1410d6431981c40282c7af9dc906f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 15:04:43 +0000 Subject: [PATCH 056/481] python312Packages.neuronpy: 8.2.4 -> 8.2.6 --- pkgs/applications/science/biology/neuron/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index ef79fb11a824..e54d3c9ba7a1 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "neuron"; - version = "8.2.4"; + version = "8.2.6"; # format is for pythonModule conversion format = "other"; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals useMpi [ python3.pkgs.mpi4py ] ++ optionals useRx3d [ - python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.4 + python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.6 python3.pkgs.numpy ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "nrn"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-KsULc+LHoWmrkGYebpoUot6DhStKidbLQf5a3S+pi4s="; + hash = "sha256-xASBpsF8rIzrb5G+4Qi6rvWC2wqL7nAGlSeMsBAI6WM="; }; meta = with lib; { From e05ca1fd73ba29e787dc893fa28667953bb68387 Mon Sep 17 00:00:00 2001 From: CnTeng Date: Thu, 25 Jul 2024 11:15:16 +0800 Subject: [PATCH 057/481] kulala-fmt: init at 1.1.0 --- pkgs/by-name/ku/kulala-fmt/package.nix | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ku/kulala-fmt/package.nix diff --git a/pkgs/by-name/ku/kulala-fmt/package.nix b/pkgs/by-name/ku/kulala-fmt/package.nix new file mode 100644 index 000000000000..ed8bfabc8c6e --- /dev/null +++ b/pkgs/by-name/ku/kulala-fmt/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "kulala-fmt"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "mistweaverco"; + repo = "kulala-fmt"; + rev = "v${version}"; + hash = "sha256-Fxxc8dJMiL7OVoovOt58vVaUloRjJX5hc8xSlzkwVc8="; + }; + + vendorHash = "sha256-uA29P6bcZNfxWsTfzsADBIqYgyfVX8dY8y70ZJKieas="; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X github.com/mistweaverco/kulala-fmt/cmd/kulalafmt.VERSION=${version}" + ]; + + meta = { + description = "Opinionated .http and .rest files linter and formatter"; + homepage = "https://github.com/mistweaverco/kulala-fmt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ CnTeng ]; + mainProgram = "kulala-fmt"; + platforms = lib.platforms.all; + }; +} From 96742945ce538502447064a62d0b1689d62b5c52 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 26 Jul 2024 12:18:17 +0700 Subject: [PATCH 058/481] looking-glass-client: switch to finalAttrs --- .../virtualization/looking-glass-client/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 62e65aec3ad8..bfc8d2177ce9 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -47,14 +47,14 @@ let icon = "lg-logo"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "looking-glass-client"; version = "B7-rc1"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU="; fetchSubmodules = true; }; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!pipewireSupport) [ "-DENABLE_PIPEWIRE=no" ]; postUnpack = '' - echo ${src.rev} > source/VERSION + echo ${finalAttrs.src.rev} > source/VERSION export sourceRoot="source/client" ''; @@ -105,4 +105,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ alexbakker babbaj j-brn ]; platforms = [ "x86_64-linux" ]; }; -} +}) From 37af97ea73d30fe38b3a17126cd7f2d7de83860d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 08:59:04 +0200 Subject: [PATCH 059/481] libfakekey: 0.1 -> 0.3 --- pkgs/development/libraries/libfakekey/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 3e53273f37b8..bd05a528d5a3 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,15 +1,18 @@ -{ lib, stdenv, fetchurl, libX11, libXi, libXtst, pkg-config, xorgproto }: +{ lib, stdenv, fetchgit, automake, autoconf, libtool, libX11, libXi, libXtst, pkg-config, xorgproto }: stdenv.mkDerivation rec { pname = "libfakekey"; - version = "0.1"; + version = "0.3"; - src = fetchurl { - url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${pname}-${version}.tar.gz"; - sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; + src = fetchgit { + url = "https://git.yoctoproject.org/libfakekey"; + rev = "refs/tags/${version}"; + hash = "sha256-QNJlxZ9uNwNgFWm9qRJdPfusx7dXHZajjFH7wDhpgcs="; }; - nativeBuildInputs = [ pkg-config ]; + preConfigure = "./autogen.sh"; + + nativeBuildInputs = [ automake autoconf pkg-config libtool ]; buildInputs = [ libX11 libXi libXtst xorgproto ]; NIX_LDFLAGS = "-lX11"; From 43696936e0254a88c87512218b7173405f96cf88 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 09:01:51 +0200 Subject: [PATCH 060/481] libfakekey: format to nixfmt-rfc-style --- .../libraries/libfakekey/default.nix | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index bd05a528d5a3..008611594b46 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchgit, automake, autoconf, libtool, libX11, libXi, libXtst, pkg-config, xorgproto }: +{ + lib, + stdenv, + fetchgit, + automake, + autoconf, + libtool, + libX11, + libXi, + libXtst, + pkg-config, + xorgproto, +}: stdenv.mkDerivation rec { pname = "libfakekey"; @@ -12,8 +24,20 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - nativeBuildInputs = [ automake autoconf pkg-config libtool ]; - buildInputs = [ libX11 libXi libXtst xorgproto ]; + nativeBuildInputs = [ + automake + autoconf + pkg-config + libtool + ]; + + buildInputs = [ + libX11 + libXi + libXtst + xorgproto + ]; + NIX_LDFLAGS = "-lX11"; meta = with lib; { From 5786c01e945b454c3a14088ec2927e4d2daf389b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 07:34:38 +0000 Subject: [PATCH 061/481] prqlc: 0.12.2 -> 0.13.0 --- pkgs/development/tools/database/prqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index f929704d3dd4..2eac6f4a2073 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-nD3B4R2eBX52wekBrBT3jiIYdE/p6xgnHrvDFFofl/s="; + hash = "sha256-XW0LnBt4gSuLQ8AjNTh6Rsd11x/dh45CQe818EZKRRs="; }; - cargoHash = "sha256-Rhvl9rqtJyEpZZYUaN+ih6KXgEVKZCyovf34l883bZM="; + cargoHash = "sha256-BecxuAOW+znKNe0s+UDPiqJ84BZU1P+f16Q53I4eXkI="; nativeBuildInputs = [ pkg-config From e632d1937bc3119e2d52525734fab6cb1ffc6010 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 26 Jul 2024 09:41:43 +0200 Subject: [PATCH 062/481] liblscp: 0.9.4 -> 1.0.0 --- .../development/libraries/liblscp/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 3364b89c2b7e..97c48cfa2ca2 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -1,17 +1,30 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config }: +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, +}: stdenv.mkDerivation rec { pname = "liblscp"; - version = "0.9.4"; + version = "1.0.0"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.gz"; - sha256 = "sha256-8+3qHgIv32wfNHHggXID1W8M7pTqji4bHNGob3DTkho="; + sha256 = "sha256-ZaPfB3Veg1YCBHieoK9fFqL0tB4PiNsY81oJmn2rd/I="; }; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + postPatch = '' + # fix prefix to only appear once + substituteInPlace CMakeLists.txt \ + --replace-fail '"''${CONFIG_PREFIX}/' '"' + ''; - preConfigure = "make -f Makefile.git"; + nativeBuildInputs = [ + cmake + pkg-config + ]; enableParallelBuilding = true; From 3080daa5562c9bff274086eeb416a35039dffa32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 10:40:01 +0000 Subject: [PATCH 063/481] kor: 0.5.2 -> 0.5.3 --- pkgs/by-name/ko/kor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index b5bc0d1608cf..100ef9c3f5c3 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kor"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-iwulXSS6nRwoQUPkQMkBbgJM0ityrGx1T+1s1la/lnM="; + hash = "sha256-AvywOQnDRzus2yexr+T85i0ztDStEJgYYMI+tr+Q9ZE="; }; - vendorHash = "sha256-9aZy1i0VrDRySt5A5aQHBXa0mPgD+rsyeqQrd6snWKc="; + vendorHash = "sha256-rlDaQPR9sReAX4gAlbDGAsA1ei9Fo2sXoU9cbBCexfc="; preCheck = '' HOME=$(mktemp -d) From 5c71c9d6b920b7c446f79b22afabc1d20a0816ca Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 26 Jul 2024 15:35:47 +0200 Subject: [PATCH 064/481] reuse: install man page and docs --- .../python-modules/reuse/default.nix | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index 38424a22b927..277933b3c358 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -3,6 +3,11 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + sphinxHook, + furo, + myst-parser, + pbr, + sphinxcontrib-apidoc, # dependencies attrs, @@ -30,7 +35,20 @@ buildPythonPackage rec { hash = "sha256-oKtQBT8tuAk4S/Sygp4qxLk4ADWDTG0MbVaL5O2qsuA="; }; - build-system = [ poetry-core ]; + outputs = [ + "out" + "doc" + "man" + ]; + + build-system = [ + poetry-core + sphinxHook + furo + myst-parser + pbr + sphinxcontrib-apidoc + ]; dependencies = [ attrs @@ -42,13 +60,22 @@ buildPythonPackage rec { tomlkit ]; - nativeCheckInputs = [ pytestCheckHook freezegun ]; + nativeCheckInputs = [ + pytestCheckHook + freezegun + ]; disabledTestPaths = [ # pytest wants to execute the actual source files for some reason, which fails with ImportPathMismatchError() "src/reuse" ]; + sphinxBuilders = [ + "html" + "man" + ]; + sphinxRoot = "docs"; + pythonImportsCheck = [ "reuse" ]; meta = with lib; { From 181c0c1cef231de02f6236686af25937def10b8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 18:00:06 +0000 Subject: [PATCH 065/481] ombi: 4.43.5 -> 4.44.1 --- pkgs/servers/ombi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 2fb76c1fc947..6e6ece8ea7cb 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-4343S9fxNmoZhbfq/ZAfI2wF7ZwIw7IyyyZUsga48Zo="; - arm64-linux_hash = "sha256-XnR/uT73luKSpYr6ieZyu0mjOy23XGs5UVDke0IU9PQ="; - x64-osx_hash = "sha256-4EoMZm++T4K2zwPw8G4J44RV/HcssAdzmKjQFqBXbwY="; + x64-linux_hash = "sha256-wyGvTXsXSsfTrlWVBaqbeDhj5s6w31+Ixi0sxsHcOjA="; + arm64-linux_hash = "sha256-iqgyCNY62FBIyjcHXDk1zZY0RzFhUA5IQ8EDzAonKRE="; + x64-osx_hash = "sha256-h9qKe1GL2DSBAFhtztS254ILMCeIZqlCXyO0AvSA5Zo="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.43.5"; + version = "4.44.1"; sourceRoot = "."; From 849eb6fe97e50d397c931c3e02976535035e539a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 18:19:09 +0000 Subject: [PATCH 066/481] beeper: 3.107.2 -> 3.108.3 --- .../networking/instant-messengers/beeper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 94e456867c47..b9ce525a9cbb 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -10,10 +10,10 @@ }: let pname = "beeper"; - version = "3.107.2"; + version = "3.108.3"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.107.2-build-240624c0qmp116e-x86_64.AppImage"; - hash = "sha256-DFzPPVw8OCM7K6COQcC68ZntEZiqBW58IpiD4rpgguc="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.108.3-build-2407188w36frwla-x86_64.AppImage"; + hash = "sha256-mlbw5K7+xZqz05FWKgKnro5SiVG+uSTI7muErAt8PM0="; }; appimage = appimageTools.wrapType2 { inherit version pname src; From 9694e917b9a9102bd8a92ea0de174aa5bbf1a410 Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Fri, 26 Jul 2024 20:53:14 +0200 Subject: [PATCH 067/481] cobang: build with Python 3.11 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a64931c538f..c8619d7c35e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6901,7 +6901,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - cobang = python3Packages.callPackage ../applications/misc/cobang { + cobang = python311Packages.callPackage ../applications/misc/cobang { gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; From 39e1b97d33c7a1fd76850ab6767783828e4a1ac7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 20:32:36 +0000 Subject: [PATCH 068/481] powershell: 7.4.3 -> 7.4.4 --- pkgs/shells/powershell/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 715f33bbbf81..2dd075d4aab9 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.4.3"; + version = "7.4.4"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -84,19 +84,19 @@ stdenv.mkDerivation rec { sources = { aarch64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; - hash = "sha256-n1A17psyDWY/BtwvmQn3SjYqhX/C5xZJnq83aA3mUJk="; + hash = "sha256-guRxvkxaUjVj1XxmIlM4Rm9DKxRujd0EjLmzVXBgPZw="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-TuSjvi2aJz2jtwm4CRP99M4dhxzerTCdyOOI6FC8CN0="; + hash = "sha256-NNjn0S3xY0GfymYC5UZCHBqrz2yPi7RALdTgOxpMRDc="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-bMOVJ8TT8Rh79rD+vSJP/gxjNHXQE39qASvLAc9P4D8="; + hash = "sha256-4vlRwZFjGfBZtdJs4Jek+Kwhwecf4W8x/UmX/yaiviQ="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-XPzCKK/T/85TbsRUGrr+l8Ypr81tyFyaIHEolLv2Wts="; + hash = "sha256-SUNSAMQ/5v+D8+YvmQm0Bi7YF6MdBpf7V2EepPrKYzs="; }; }; tests.version = testers.testVersion { From 88a40d78309f19e18354b3f988b7fab309a60c7a Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 13:49:27 -0700 Subject: [PATCH 069/481] graphite2: fix compiling with llvm --- pkgs/development/libraries/silgraphite/graphite2.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 60a4af6d0a73..7f4b73c79378 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,5 +1,6 @@ { lib , stdenv +, llvmPackages , fetchurl , pkg-config , freetype @@ -20,7 +21,11 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ freetype ]; + buildInputs = [ freetype ] + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) + (llvmPackages.compiler-rt.override { + doFakeLibgcc = true; + }); patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; postPatch = '' From 05113f61f031f04d404a4f6d982c75b1ab1c64ae Mon Sep 17 00:00:00 2001 From: DCsunset Date: Thu, 25 Jul 2024 20:47:56 -0400 Subject: [PATCH 070/481] nixos/stirling-pdf: init module --- nixos/modules/module-list.nix | 1 + .../services/web-apps/stirling-pdf.nix | 110 ++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 nixos/modules/services/web-apps/stirling-pdf.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e028704c5d0f..289b71c7717c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1468,6 +1468,7 @@ ./services/web-apps/slskd.nix ./services/web-apps/snipe-it.nix ./services/web-apps/sogo.nix + ./services/web-apps/stirling-pdf.nix ./services/web-apps/trilium.nix ./services/web-apps/tt-rss.nix ./services/web-apps/vikunja.nix diff --git a/nixos/modules/services/web-apps/stirling-pdf.nix b/nixos/modules/services/web-apps/stirling-pdf.nix new file mode 100644 index 000000000000..cd8638aff14d --- /dev/null +++ b/nixos/modules/services/web-apps/stirling-pdf.nix @@ -0,0 +1,110 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.stirling-pdf; +in +{ + options.services.stirling-pdf = { + enable = lib.mkEnableOption "the stirling-pdf service"; + + package = lib.mkPackageOption pkgs "stirling-pdf" { }; + + environment = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + ] + ); + default = { }; + example = { + SERVER_PORT = 8080; + INSTALL_BOOK_AND_ADVANCED_HTML_OPS = "true"; + }; + description = '' + Environment variables for the stirling-pdf app. + See https://github.com/Stirling-Tools/Stirling-PDF#customisation for available options. + ''; + }; + + environmentFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + Files containing additional environment variables to pass to Stirling PDF. + Secrets should be added in environmentFiles instead of environment. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.stirling-pdf = { + environment = lib.mapAttrs (_: toString) cfg.environment; + + # following https://github.com/Stirling-Tools/Stirling-PDF#locally + path = with pkgs; [ + unpaper + libreoffice + ocrmypdf + poppler_utils + unoconv + opencv + pngquant + tesseract + python3Packages.weasyprint + calibre + ]; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + BindReadOnlyPaths = [ "${pkgs.tesseract}/share/tessdata:/usr/share/tessdata" ]; + CacheDirectory = "stirling-pdf"; + Environment = [ "HOME=%S/stirling-pdf" ]; + EnvironmentFile = cfg.environmentFiles; + ExecStart = lib.getExe cfg.package; + RuntimeDirectory = "stirling-pdf"; + StateDirectory = "stirling-pdf"; + SuccessExitStatus = 143; + User = "stirling-pdf"; + WorkingDirectory = "/var/lib/stirling-pdf"; + + # Hardening + CapabilityBoundingSet = ""; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources @clock @setuid @chown" + ]; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ DCsunset ]; +} From 3ca692c54468825f32d031d076cdf4bd4cf7aa5a Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 15:42:50 -0700 Subject: [PATCH 071/481] xorg.libXt: fix cpp usage under llvm --- pkgs/servers/x11/xorg/overrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f1e63de72bd5..31ee5d6f1cea 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -255,7 +255,8 @@ self: super: sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure ''; configureFlags = attrs.configureFlags or [] - ++ malloc0ReturnsNullCrossFlag; + ++ malloc0ReturnsNullCrossFlag + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libSM ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; From b7009522ed5af5dcb7b4e298543b9744de4528b1 Mon Sep 17 00:00:00 2001 From: oleina Date: Fri, 26 Jul 2024 17:25:03 -0700 Subject: [PATCH 072/481] maintainers: add oleina --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f92e6a3b8007..fe0a880abbd1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15043,6 +15043,12 @@ githubId = 848535; name = "Oleg Lebedev"; }; + oleina = { + email = "antholeinik@gmail.com"; + github = "antholeole"; + githubId = 48811365; + name = "Anthony Oleinik"; + }; olejorgenb = { email = "olejorgenb@yahoo.no"; github = "olejorgenb"; From e4da18a6923e3a332448d96fc03a78feff3b4492 Mon Sep 17 00:00:00 2001 From: oleina Date: Fri, 19 Jul 2024 10:23:36 -0700 Subject: [PATCH 073/481] kakoune: create a directory for bins that kakoune needs --- pkgs/applications/editors/kakoune/wrapper.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix index 451507885ce0..c3507576f28d 100644 --- a/pkgs/applications/editors/kakoune/wrapper.nix +++ b/pkgs/applications/editors/kakoune/wrapper.nix @@ -14,10 +14,17 @@ in paths = [ kakoune ] ++ requestedPlugins; postBuild = '' + # create a directory for bins that kakoune needs + # access to, without polluting the users path by adding + # that binary nested with this symlinkJoin. + mkdir -p $out/share/kak/bin + # location of kak binary is used to find ../share/kak/autoload, # unless explicitly overriden with KAKOUNE_RUNTIME rm "$out/bin/kak" - makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" --set KAKOUNE_RUNTIME "$out/share/kak" + makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" \ + --set KAKOUNE_RUNTIME "$out/share/kak" \ + --set PATH "$PATH:$out/share/kak/bin" # currently kakoune ignores doc files if they are symlinks, so workaround by # copying doc files over, so they become regular files... From 183218bf50c37f7c5469cc31da1856df53f0d97f Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 19:45:21 -0700 Subject: [PATCH 074/481] pythonPackages.mako: disable test_future_import test under llvm --- .../python-modules/mako/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 2e31d43b92b7..5e58f90b58d8 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, pythonOlder, @@ -49,15 +50,18 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - disabledTests = lib.optionals isPyPy [ - # https://github.com/sqlalchemy/mako/issues/315 - "test_alternating_file_names" - # https://github.com/sqlalchemy/mako/issues/238 - "test_file_success" - "test_stdin_success" - # fails on pypy2.7 - "test_bytestring_passthru" - ]; + disabledTests = + lib.optionals isPyPy [ + # https://github.com/sqlalchemy/mako/issues/315 + "test_alternating_file_names" + # https://github.com/sqlalchemy/mako/issues/238 + "test_file_success" + "test_stdin_success" + # fails on pypy2.7 + "test_bytestring_passthru" + ] + # https://github.com/sqlalchemy/mako/issues/408 + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "test_future_import"; meta = with lib; { description = "Super-fast templating language"; From 68bbcef275d61cf7ea7eee6375ba0b3fab8557cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 06:52:44 +0000 Subject: [PATCH 075/481] libplctag: 2.6.0 -> 2.6.1 --- pkgs/development/libraries/libplctag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index 1e0fa3160e5a..fffac0b95037 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-+lsRYKA1FIXQXv0nfDNCAqIbqPunrzlpSC5FoF3VIsg="; + sha256 = "sha256-ZiqHkjpcR5OHJRiTVqlrJwST7vtPPG51trFthea2qlA="; }; nativeBuildInputs = [ cmake ]; From 38653c5be27143fcff1dd7297b63269121c0fd6e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 26 Jul 2024 21:24:10 +0200 Subject: [PATCH 076/481] eg25-manager: init at 0.4.6 --- pkgs/by-name/eg/eg25-manager/package.nix | 64 ++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 pkgs/by-name/eg/eg25-manager/package.nix diff --git a/pkgs/by-name/eg/eg25-manager/package.nix b/pkgs/by-name/eg/eg25-manager/package.nix new file mode 100644 index 000000000000..320771bafe88 --- /dev/null +++ b/pkgs/by-name/eg/eg25-manager/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitLab, + gnugrep, + meson, + ninja, + pkg-config, + scdoc, + curl, + glib, + libgpiod_1, + libgudev, + libusb1, + modemmanager, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "eg25-manager"; + version = "0.4.6"; + + src = fetchFromGitLab { + owner = "mobian1"; + repo = "eg25-manager"; + rev = finalAttrs.version; + hash = "sha256-2JsdwK1ZOr7ljNHyuUMzVCpl+HV0C5sA5LAOkmELqag="; + }; + + postPatch = '' + substituteInPlace 'udev/80-modem-eg25.rules' \ + --replace-fail '/bin/grep' '${lib.getExe gnugrep}' + ''; + + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ + glib # Contains gdbus-codegen program + meson + ninja + pkg-config + scdoc + ]; + + buildInputs = [ + curl + glib + libgpiod_1 # Tracking issue for compatibility with libgpiod 2.0: https://gitlab.com/mobian1/eg25-manager/-/issues/45 + libgudev + libusb1 + modemmanager + ]; + + strictDeps = true; + + meta = { + description = "Manager daemon for the Quectel EG25 mobile broadband modem found on the Pine64 PinePhone and PinePhone Pro"; + homepage = "https://gitlab.com/mobian1/eg25-manager"; + changelog = "https://gitlab.com/mobian1/eg25-manager/-/tags/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + mainProgram = "eg25-manager"; + maintainers = with lib.maintainers; [ Luflosi ]; + platforms = lib.platforms.linux; + }; +}) From a61d4728e8903284688909db392b53a0d75b27ab Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 27 Jul 2024 10:41:49 +0200 Subject: [PATCH 077/481] nixos/eg25-manager: init --- .../modules/hardware/network/eg25-manager.nix | 27 +++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 nixos/modules/hardware/network/eg25-manager.nix diff --git a/nixos/modules/hardware/network/eg25-manager.nix b/nixos/modules/hardware/network/eg25-manager.nix new file mode 100644 index 000000000000..485c1da68f0a --- /dev/null +++ b/nixos/modules/hardware/network/eg25-manager.nix @@ -0,0 +1,27 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) mkEnableOption mkIf mkPackageOption; + cfg = config.services.eg25-manager; +in +{ + options.services.eg25-manager = { + enable = mkEnableOption "Quectel EG25 modem manager service"; + + package = mkPackageOption pkgs "eg25-manager" { }; + }; + config = mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + systemd.services.eg25-manager.wantedBy = [ "multi-user.target" ]; + }; + + meta = { + maintainers = with lib.maintainers; [ Luflosi ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f97a6b47512c..106800608be9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -81,6 +81,7 @@ ./hardware/mcelog.nix ./hardware/network/ath-user-regd.nix ./hardware/network/b43.nix + ./hardware/network/eg25-manager.nix ./hardware/network/intel-2200bg.nix ./hardware/new-lg4ff.nix ./hardware/nitrokey.nix From 28da83bb52c46cd661f3b0d4e6e4afb0968955f6 Mon Sep 17 00:00:00 2001 From: bwkam Date: Sun, 12 May 2024 00:50:57 +0300 Subject: [PATCH 078/481] maintainers: add bwkam --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 864367a22444..288d57452567 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3031,6 +3031,12 @@ githubId = 25644444; name = "Ben C"; }; + bwkam = { + email = "beshoykamel391@gmail.com"; + github = "bwkam"; + githubId = 91009118; + name = "Beshoy Kamel"; + }; bwlang = { email = "brad@langhorst.com"; github = "bwlang"; From e640bd83b7b8a00e380169726c168279f6af7b1c Mon Sep 17 00:00:00 2001 From: bwkam Date: Sun, 12 May 2024 00:48:20 +0300 Subject: [PATCH 079/481] python311Packages.pwinput: init at 1.3.0 --- .../python-modules/pwinput/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pwinput/default.nix diff --git a/pkgs/development/python-modules/pwinput/default.nix b/pkgs/development/python-modules/pwinput/default.nix new file mode 100644 index 000000000000..66105db31a07 --- /dev/null +++ b/pkgs/development/python-modules/pwinput/default.nix @@ -0,0 +1,35 @@ +{ + buildPythonPackage, + fetchPypi, + setuptools, + lib, + pythonOlder, +}: +buildPythonPackage rec { + pname = "pwinput"; + version = "1.0.3"; + + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit version; + pname = "pwinput"; + hash = "sha256-yhqL0G4ohy11Hb1BMthjcSfCW0COo6NJN3MUpUkUJvM="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "pwinput" ]; + + # Requires graphical environment to use pyautogui + doCheck = false; + + meta = { + description = "Python module that masks password input"; + homepage = "https://github.com/asweigart/pwinput"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bwkam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53e7cd1eaa10..ad497402b6a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9996,6 +9996,8 @@ self: super: with self; { pyaprilaire = callPackage ../development/python-modules/pyaprilaire { }; + pwinput = callPackage ../development/python-modules/pwinput { }; + pybars3 = callPackage ../development/python-modules/pybars3 { }; pymeta3 = callPackage ../development/python-modules/pymeta3 { }; From fa466badd86e776cbd8e042d85cbfeeccf7e8869 Mon Sep 17 00:00:00 2001 From: bwkam Date: Sun, 12 May 2024 23:14:44 +0300 Subject: [PATCH 080/481] zotify: init at 0.6.13 --- pkgs/by-name/zo/zotify/package.nix | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/zo/zotify/package.nix diff --git a/pkgs/by-name/zo/zotify/package.nix b/pkgs/by-name/zo/zotify/package.nix new file mode 100644 index 000000000000..d5250b780a42 --- /dev/null +++ b/pkgs/by-name/zo/zotify/package.nix @@ -0,0 +1,47 @@ +{ + fetchFromGitHub, + python3Packages, + lib, +}: +python3Packages.buildPythonApplication rec { + pname = "zotify"; + version = "0.6.13"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "zotify-dev"; + repo = "zotify"; + # repository has no version tags + # https://github.com/zotify-dev/zotify/issues/124 + rev = "5da27d32a1f522e80a3129c61f939b1934a0824a"; + hash = "sha256-KA+Q4sk+riaFTybRQ3aO5lgPg4ECZE6G+By+x2uP/VM="; + }; + + build-system = [ python3Packages.setuptools ]; + + nativeBuildInputs = [ python3Packages.pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "protobuf" ]; + + dependencies = with python3Packages; [ + ffmpy + music-tag + pillow + tabulate + tqdm + librespot + pwinput + protobuf + ]; + + pythonImportsCheck = [ "zotify" ]; + + meta = { + description = "Fast and customizable music and podcast downloader"; + homepage = "https://github.com/zotify-dev/zotify"; + license = lib.licenses.zlib; + mainProgram = "zotify"; + maintainers = with lib.maintainers; [ bwkam ]; + }; +} From ac10b9b20cb97c4b0af0ce24dc9ae16bc5dac23d Mon Sep 17 00:00:00 2001 From: Manuel Sanchez Pinar Date: Sat, 27 Jul 2024 12:14:50 +0200 Subject: [PATCH 081/481] silverbullet: 0.8.2 -> 0.8.4 --- pkgs/by-name/si/silverbullet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/silverbullet/package.nix b/pkgs/by-name/si/silverbullet/package.nix index dd0c3a310641..e2697e4bc70b 100644 --- a/pkgs/by-name/si/silverbullet/package.nix +++ b/pkgs/by-name/si/silverbullet/package.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "silverbullet"; - version = "0.8.2"; + version = "0.8.4"; src = fetchurl { url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet.js"; - hash = "sha256-Y2WhxgiLJLMqwUK8KuNbuGbKfz5XOfD4Z1zxFqrAI1U="; + hash = "sha256-lekn5WzOqPqWDos/h62WuQQrlDCM2NBOr3Qlm13o8PY="; }; dontUnpack = true; From 1f88956b959196af4de00276153fe6a88fba72bf Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Sat, 27 Jul 2024 15:28:31 +0200 Subject: [PATCH 082/481] nixos/kmscon: fix cfgfile missing trailing newline Currently, the `kmscon.conf` file that is generated is missing a trailing newline. This breaks `kmscon`, since its parser assumes well-formedness. I noticed this while trying to specify a font, whose spec ended up on the last line, but without the trailing newline, `kmscon` would not honor it. --- nixos/modules/services/ttys/kmscon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 6b05886756fe..d274b508300f 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -105,7 +105,7 @@ in { )); render = optionals cfg.hwRender [ "drm" "hwaccel" ]; fonts = optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}"; - in lib.concatStringsSep "\n" (xkb ++ render ++ fonts); + in lib.concatLines (xkb ++ render ++ fonts); hardware.graphics.enable = mkIf cfg.hwRender true; From aea44d2f19311078531268063ba559e578c94e5e Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Sat, 27 Jul 2024 18:46:40 +0200 Subject: [PATCH 083/481] canon-cups-ufr2: 5.70 -> 5.90 --- pkgs/misc/cups/drivers/canon/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 8614bdda2ab2..afee42090329 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -13,11 +13,9 @@ , gdk-pixbuf , pango , cairo -, coreutils , atk , pkg-config , libxml2 -, runtimeShell , libredirect , ghostscript , pkgs @@ -32,13 +30,15 @@ let ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: lib.makeLibraryPath buildInputs; - version = "5.70"; - dl = "8/0100007658/33"; + version = "5.90"; + dl = "8/0100007658/40"; + suffix1 = "m17n"; + suffix2 = "03"; versionNoDots = builtins.replaceStrings [ "." ] [ "" ] version; src_canon = fetchurl { - url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-m17n-11.tar.gz"; - hash = "sha256-d5VHlPpUPAr3RWVdQRdn42YLuVekOw1IaMFLVt1Iu7o="; + url = "http://gdlp01.c-wss.com/gds/${dl}/linux-UFRII-drv-v${versionNoDots}-${suffix1}-${suffix2}.tar.gz"; + hash = "sha256-HvuRQYqkHRCwfajSJPridDcADq7VkYwBEo4qr9W5mqA="; }; buildInputs = [ cups zlib jbigkit glib gtk3 libxml2 gdk-pixbuf pango cairo atk ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postUnpack = '' ( cd $sourceRoot - tar -xf Sources/cnrdrvcups-lb-${version}-1.11.tar.xz + tar -xf Sources/cnrdrvcups-lb-${version}-1.${suffix2}.tar.xz sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh From f2134034408cbd2c7dfda87881d1c1f2e7f33796 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sat, 27 Jul 2024 15:27:33 -0400 Subject: [PATCH 084/481] rofi-bluetooth: add bc to binPath --- pkgs/applications/misc/rofi-bluetooth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix index 31f9103a7628..4eb757422ae7 100644 --- a/pkgs/applications/misc/rofi-bluetooth/default.nix +++ b/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , makeWrapper +, bc , bluez }: @@ -25,7 +26,7 @@ stdenv.mkDerivation { install -D --target-directory=$out/bin/ ./rofi-bluetooth wrapProgram $out/bin/rofi-bluetooth \ - --prefix PATH ":" ${lib.makeBinPath [ bluez ] } + --prefix PATH ":" ${lib.makeBinPath [ bc bluez ] } runHook postInstall ''; From 5d1917eb29e6a17e23d472c8efd931b8153e8d8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 20:03:56 +0000 Subject: [PATCH 085/481] hcloud: 1.44.2 -> 1.46.0 --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 2cf429e6a09d..66dfe5e70e83 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.44.2"; + version = "1.46.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ZslnJr5VJ6eHjBm1azaANGj9hHXKo+sRJXmW4xjRMhg="; + hash = "sha256-xW0M4ppbW6yD5+JpJZnDVf2mPiBzNFotP1IPTbnJoC4="; }; - vendorHash = "sha256-pDBuuHuG2Xk1R3BP1Ds2uY5I7brXWg1ULKQgmuuQVP4="; + vendorHash = "sha256-XocfpUmq/w/gqhCaT4Y33uQaggx3Bm16QuG/bGdxmg4="; ldflags = [ "-s" From cb71a7512a4f7687b6b9cb7f4d2f684ed845071d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 21:11:40 +0000 Subject: [PATCH 086/481] obs-studio-plugins.obs-vertical-canvas: 1.4.5 -> 1.4.7 --- .../video/obs-studio/plugins/obs-vertical-canvas.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 5f47c666078c..42dc432da095 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-4BmTp/PrR01H9IrKNX9ZpK4kLaiNG/G9rTMf9dsoV0s="; + sha256 = "sha256-JF/ZI0bJjHMoI4hpGPuMGDHMrd7tw0Kvwm/VhACLUfo="; }; nativeBuildInputs = [ cmake ]; From e193983e08a32be793bde5bfd4a5b99a8ae57161 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 21:24:29 +0000 Subject: [PATCH 087/481] nats-server: 2.10.17 -> 2.10.18 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index fe14c2d1bb71..700a0aa66381 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.17"; + version = "2.10.18"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-JX5uV4273BzO0tmdagEDlJ8eyaFBlpdOS6F1rz9IrF4="; + hash = "sha256-xoCeP/6qKNeqsqVPKfybdwVs50QPBS82zBGxwOXrVGU="; }; - vendorHash = "sha256-JAj4lF/5cy9SDFb0X08d2kFUVwdUJ53EYeEOlJ71z2k="; + vendorHash = "sha256-6Dgk/F0gZlULpEZpWvJndHdp7AyggClOb3FrwotSjRs="; doCheck = false; From 5140316b10b51ee75ff9321dad8feccb68de4c1f Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Sat, 27 Jul 2024 18:24:32 -0500 Subject: [PATCH 088/481] octavePackages.fuzzy-logic-toolkit: 0.4.6 -> 0.6.0 Also change upstream to GitHub, fetching from there. The update-octave-packages script should now catch this package for r-ryantm. --- .../octave-modules/fuzzy-logic-toolkit/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix index 154fa4feee30..05f15cfb1519 100644 --- a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix +++ b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix @@ -1,19 +1,21 @@ { buildOctavePackage , lib -, fetchurl +, fetchFromGitHub }: buildOctavePackage rec { pname = "fuzzy-logic-toolkit"; - version = "0.4.6"; + version = "0.6.0"; - src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "126x0wjjqmwwgynsgjfdh5rlnww5bsl5hxq1xib15i58mrglh5cd"; + src = fetchFromGitHub { + owner = "lmarkowsky"; + repo = "fuzzy-logic-toolkit"; + rev = "refs/tags/${version}"; + sha256 = "sha256-veU+3DPFJ2IeGw5PkpxGO8Oo9qEyR890hs4IAzbfxls="; }; meta = with lib; { - homepage = "https://octave.sourceforge.io/fuzzy-logic-toolkit/index.html"; + homepage = "https://github.com/lmarkowsky/fuzzy-logic-toolkit"; license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Mostly MATLAB-compatible fuzzy logic toolkit for Octave"; From ae580cbeb5876bdaf059261291fc64c1e8976060 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 23:46:05 +0000 Subject: [PATCH 089/481] eigenlayer: 0.8.2 -> 0.9.2 --- pkgs/by-name/ei/eigenlayer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix index 2d1d6b341d23..03d524a0d8a9 100644 --- a/pkgs/by-name/ei/eigenlayer/package.nix +++ b/pkgs/by-name/ei/eigenlayer/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "eigenlayer"; - version = "0.8.2"; + version = "0.9.2"; src = fetchFromGitHub { owner = "Layr-Labs"; repo = "eigenlayer-cli"; rev = "v${version}"; - hash = "sha256-VC2qUHdFulOCYuAb8vHxc+9GJV/3iiKO1hJS/7gj278="; + hash = "sha256-KdSCXvzUCEw5BTvKOejxUP+KXKXCpXvtvFmZ2JmihK4="; }; - vendorHash = "sha256-+VKjsHFqWVqOxzC49GToxymD5AyI0j1ZDXQW2YnJysw="; + vendorHash = "sha256-uC6HMIf+wbHx2/Ico1UOj+S27xtVe1mCrcBy1CacIVs="; ldflags = ["-s" "-w"]; subPackages = ["cmd/eigenlayer"]; From 53e8bc05bf18d315f1f91b9cf2cebbeff5727571 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 23:56:39 +0000 Subject: [PATCH 090/481] supabase-cli: 1.187.2 -> 1.187.8 --- pkgs/development/tools/supabase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index ffc00a15c16e..339bdef2277b 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.187.2"; + version = "1.187.8"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-zc38w09+DvCJMlXMjWvSekrhck8BkWL46RfvQHGpE9c="; + hash = "sha256-zwh+Hb1CwCz+/e9NyJfP+dojB21xKdYsjFISPm8NBGQ="; }; - vendorHash = "sha256-87G0Smjt+/+f0IjloKySgRpIaIyHI5DG89uNuP0sb9U="; + vendorHash = "sha256-+TQJgHOITKn9sFf8B86WHshITHh29EoDv8BLosrUPtA="; ldflags = [ "-s" From 7308c0da1ff125d7be2b1956b41c890fae80efc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 00:42:18 +0000 Subject: [PATCH 091/481] protonup-qt: 2.9.2 -> 2.10.2 --- pkgs/applications/misc/protonup-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index c6c2df56f228..f5c47507893a 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -1,10 +1,10 @@ { appimageTools, fetchurl, lib }: let pname = "protonup-qt"; - version = "2.9.2"; + version = "2.10.2"; src = fetchurl { url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-d1UjyhU7BezOoQZBnmrk96gD0MbYST0XR+PWVYmvGFQ="; + hash = "sha256-WWLAA5FryvqwgEQysnE1w2k9Wq4y7yNJ4Drojg1SKYg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 7bc9b3b5040e03eaa70080c42f1795fbc0483781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 28 Jul 2024 12:20:14 +1000 Subject: [PATCH 092/481] plandex: init at 1.1.1 --- pkgs/by-name/pl/plandex/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/pl/plandex/package.nix diff --git a/pkgs/by-name/pl/plandex/package.nix b/pkgs/by-name/pl/plandex/package.nix new file mode 100644 index 000000000000..e0652aa8470f --- /dev/null +++ b/pkgs/by-name/pl/plandex/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "plandex"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "plandex-ai"; + repo = "plandex"; + rev = "cli/v${version}"; + hash = "sha256-q3DBkYmZxgrdlEUdGgFCf5IR17lKmYp7U5BD/4GXxjo="; + }; + + sourceRoot = "${src.name}/app/cli"; + + vendorHash = "sha256-aFfgXGRnsqS7Ik5geQ6yXL+8X0BfNhHGzF7GKIDC4iE="; + + meta = { + mainProgram = "plandex"; + description = "AI driven development in your terminal. Designed for large, real-world tasks. The sli part"; + homepage = "https://plandex.ai/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ viraptor ]; + }; +} From 081d6924b1b3c91942e73d531eea5852cd8c6bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 28 Jul 2024 12:20:33 +1000 Subject: [PATCH 093/481] plandex-server: init at 1.1.1 --- pkgs/by-name/pl/plandex-server/package.nix | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/pl/plandex-server/package.nix diff --git a/pkgs/by-name/pl/plandex-server/package.nix b/pkgs/by-name/pl/plandex-server/package.nix new file mode 100644 index 000000000000..a1d0c846eb58 --- /dev/null +++ b/pkgs/by-name/pl/plandex-server/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, +}: +buildGoModule rec { + pname = "plandex-server"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "plandex-ai"; + repo = "plandex"; + rev = "server/v${version}"; + hash = "sha256-RVvgnQtb/asOjVpSZ3WndimsJ6foERMWS/YD20sghVE="; + }; + + postPatch = '' + substituteInPlace db/db.go \ + --replace-fail "file://migrations" "file://$out/migrations" + ''; + + postInstall = '' + cp -r migrations $out/migrations + ''; + + nativeCheckInputs = [ git ]; + + sourceRoot = "${src.name}/app/server"; + + vendorHash = "sha256-uarTWteOoAjzEHSnbZo+fEPELerpuL7UNA5pdGP5CMY="; + + meta = { + mainProgram = "plandex-server"; + description = "AI driven development in your terminal. Designed for large, real-world tasks. The server part"; + homepage = "https://plandex.ai/"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ viraptor ]; + }; +} From f6ab84649e027ae042a2d836feaf005cea083d03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 03:21:26 +0000 Subject: [PATCH 094/481] simple-dftd3: 1.0.0 -> 1.1.0 --- .../libraries/science/chemistry/simple-dftd3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index eb8fa56455e4..08f303581c99 100644 --- a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -15,13 +15,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "simple-dftd3"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "dftd3"; repo = pname; rev = "v${version}"; - hash = "sha256-dfXiKKCGJ69aExSKpVC3Bp//COy256R9PDyxCNmDsfo="; + hash = "sha256-XeLf5v/GraDGcTsVIEBnS4AL8tMeO11YTuPHlNt5Ap8="; }; nativeBuildInputs = [ gfortran meson ninja pkg-config ]; From 9c0712b0805de202697980b8afc0062e8387aa09 Mon Sep 17 00:00:00 2001 From: r3n3gad3p3arl <20760527+r3n3gad3p3arl@users.noreply.github.com> Date: Sun, 28 Jul 2024 01:19:40 -0500 Subject: [PATCH 095/481] openutau: 0.1.327 -> 0.1.529 --- pkgs/applications/audio/openutau/default.nix | 4 +- pkgs/applications/audio/openutau/deps.nix | 481 ++++++++++--------- 2 files changed, 243 insertions(+), 242 deletions(-) diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index 289991a94431..d167cf7200b6 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "OpenUtau"; - version = "0.1.327"; + version = "0.1.529"; src = fetchFromGitHub { owner = "stakira"; repo = "OpenUtau"; rev = "build/${version}"; - hash = "sha256-Bss32Fk4yBEFqaIxT2dfdvWXz09sO6akiitDQBXoSvY="; + hash = "sha256-HE0KxPKU7tYZbYiCL8sm6I/NZiX0MJktt+5d6qB1A2E="; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/audio/openutau/deps.nix b/pkgs/applications/audio/openutau/deps.nix index 5783ae18916b..1994e4157ef7 100644 --- a/pkgs/applications/audio/openutau/deps.nix +++ b/pkgs/applications/audio/openutau/deps.nix @@ -2,244 +2,245 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; sha256 = "1anby58bs94gf338vmn6vvwxw0kcz6y8yap57vgh8dgm9vysl0i5"; }) - (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.4"; sha256 = "1hs29qvbhm5qdhys0j3d89c37qfalx1pcpxl3hh9adz11wc0nb3b"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) - (fetchNuGet { pname = "BunLabs.NAudio.Flac"; version = "2.0.1"; sha256 = "1ps7fs451ydsaz5g4j7bhcfawp8fys6vcah3rsrl36g7ni0dwf3v"; }) - (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) - (fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; sha256 = "12n5bcg1i91daqgnl7q6d55phbkv1srkrvk2k7k8vxpyv231yb6v"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "6.0.0"; sha256 = "12j34vrkmph8lspbafnqmfnj2qvysz1jcrks2khw798s6dwv0j90"; }) - (fetchNuGet { pname = "DotNet.Bundle"; version = "0.9.13"; sha256 = "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) - (fetchNuGet { pname = "Fody"; version = "6.6.3"; sha256 = "02qhz4l2qqzsjzhv0jyb0bp8dckpjfg6w6pss5cng98g92zxkma6"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) - (fetchNuGet { pname = "K4os.Hash.xxHash"; version = "1.0.8"; sha256 = "0vz1f81z4rh7a576fdzbc6wmj7p4gaca1rch3anvh1s5qd7xdd10"; }) - (fetchNuGet { pname = "Melanchall.DryWetMidi"; version = "6.1.4"; sha256 = "1m0n6in27cpasmshw261az1n9y7rq4vp7z80gv7zpg8wqichqnqv"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) - (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.1"; sha256 = "0xwfph92p92d8hgrdiaka4cazqsjpg4ywfxfx6qbk3939f29kzl0"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; }) - (fetchNuGet { pname = "Microsoft.ML.OnnxRuntime"; version = "1.15.0"; sha256 = "1wjafpn0fgxxyl5kw427ypc8c2gwha286sf96mv3fivdk3qyysxw"; }) - (fetchNuGet { pname = "Microsoft.ML.OnnxRuntime.Managed"; version = "1.15.0"; sha256 = "06hnsx0a81gbz5zr4qqij2c518wqdn3hg784zvkj0jlkwi5z2hr8"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "NaCl.Net"; version = "0.1.13"; sha256 = "0n92rinhbhxvdrk7dhxj6vd7c4dv76ks8djqvyrc41bbzj85qbv7"; }) - (fetchNuGet { pname = "NAudio.Core"; version = "2.1.0"; sha256 = "1pxd2qmqxsia1spdylxvv8ik5r614yvkmki438ihmhvvs2mxsmvi"; }) - (fetchNuGet { pname = "NAudio.Midi"; version = "2.1.0"; sha256 = "1llki3c83qg1lf7bsbz94m2blrq1dmpwhkffqp9vj8q8w5fbjdkj"; }) - (fetchNuGet { pname = "NAudio.Vorbis"; version = "1.5.0"; sha256 = "1b3inmmvcsbfnvcnsg6wnhbcqxyz3x2qdkggcginfwabahfl8zhm"; }) - (fetchNuGet { pname = "NetMQ"; version = "4.0.1.12"; sha256 = "0zx0m26cbpp105lnwhaynl73sg7n2gni5744vnrk198iwd114zrv"; }) - (fetchNuGet { pname = "NetSparkleUpdater.SparkleUpdater"; version = "2.2.3"; sha256 = "13vmf176f2z71xf5inp440bbxnpg40mk44f1jdh8vip6g1rg72nc"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "NLayer"; version = "1.14.0"; sha256 = "17srybcp3zlh31hlhpy2xd9lrka7i93842m2wf364fkgiqa4nssb"; }) - (fetchNuGet { pname = "NLayer.NAudioSupport"; version = "1.3.0"; sha256 = "0n2zk8r6sm3623j8a7rzb226i9mfr63vhf6718lyncmmsfjasmm4"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "NumSharp"; version = "0.30.0"; sha256 = "0r12i48q8gn5nxkxs3kwqcyhbd2xxzrazxg4y9l5m4gvm64zjg7d"; }) - (fetchNuGet { pname = "NVorbis"; version = "0.10.4"; sha256 = "0l4f3vhqc6ly7s8mszwarszgirz6ywx1rjsr1jx0fdlsjl02x6p9"; }) - (fetchNuGet { pname = "NWaves"; version = "0.9.6"; sha256 = "16mxnc3hiaf38z3knsw54wkf9pw18yg63mzxqa4ccixf05ni3zhd"; }) - (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) - (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) - (fetchNuGet { pname = "ReactiveUI.Fody"; version = "18.3.1"; sha256 = "16xr69ls822azqv81wi13lbqgnff4i1lg61frx2s11mfa04jy1zz"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; }) - (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) - (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) - (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; sha256 = "0fag8hr2v9bswrsjka311lhbr1a43yzcc36j4fadz0f0kl2hby7h"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Packaging"; version = "7.0.0"; sha256 = "16fgj2ab5ci217shmfsi6c0rnmkh90h6vyb60503nhpmh7y8di13"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.9.0"; sha256 = "117vxa0pfgg6xfdxfpza4296ay7sqiaynyvfbsai43yrkh0lmch1"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.7.1"; sha256 = "10yh3q2i71gcw7c0dfz9qxql2vlvnqjav1hyf1q9rpbvdbgsabrs"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "5.0.0"; sha256 = "1nmzm3d1hymc992qhbzb1ngx9pd7ww00581b2ici25d9m7n99g6h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "5.0.0"; sha256 = "1xs1lagxr5blc0dfm6xv1nawcz552lq332x3j2a7sizqfarlk384"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.9.0"; sha256 = "1lzl69ar18fn4iqya2ymm9kdv54d4mi0hcdnyvyxjq3bnhnb22qf"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.0"; sha256 = "00yamg3b111blkjvyckxl5nxsxs2n9iccp7z1x0c2j96czgf60pz"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; sha256 = "1i6yinxvbwdk5g5z9y8l4a5hj2gw3h9ijlz2f1c1ngyprnwz2ivf"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "5.0.0"; sha256 = "0q776jpacfjmps4sc6gjvqj89w1ynj41hb0lvqmfl3j221lsfdbz"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) - (fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; sha256 = "0giks1ww539m4r5kzdyzkq0cvfi5k50va9idjz93rclgljl96gpl"; }) - (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; sha256 = "11yjyvyz922z1ygl8gxmdym3918df12nl7xxry4pdjpl8is33qic"; }) - (fetchNuGet { pname = "Vortice.DXGI"; version = "2.4.2"; sha256 = "17vsnm9ca6nqk3f1dfpfvd6i6fp8x8v41bn65rchrzwcv1zzi6pz"; }) - (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.4.25"; sha256 = "0vl6g087disxyzskvkbnwym74s47lkza0ly3nk4y0y88zibcggrj"; }) - (fetchNuGet { pname = "WanaKana-net"; version = "1.0.0"; sha256 = "197qklph8hzrihalpi0kx4n9sf94xnhywzscisnlsxybxxdjz79z"; }) - (fetchNuGet { pname = "xunit"; version = "2.6.2"; sha256 = "0g5j0xwrv9cwrx91cjb9gas3wnkcwwk8krhdzsv50vlyp71pqqgz"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "1.6.0"; sha256 = "1nwrz0mxk2hk2rwwabgr0a4wa3j22qwm94xvrzci39l58hmzxpbi"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.6.2"; sha256 = "1nxg9m8qhh05i9linap7a8bdhxnr7x2pg7piw8hh76cshx0402ql"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.6.2"; sha256 = "0q0kzjdb0hxq4bajl11pvnwl1dp47b2adqx47j30bi2llj21ihj6"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.2"; sha256 = "1a27ng02piwjr3ggff4mg0r92b6rabd1339clnxzqxwcyf620q2c"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.2"; sha256 = "1lhhlrq6lzd4w61x78dhxjz1453lnipjgph8sc52izgwq9d5xp1n"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.4"; sha256 = "0mp3z8m5l4q09lr17142hff6p05zl189cwz3iavfqk8dpspyjgvd"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "13.1.0"; sha256 = "1mqgg0m1mr8vmcz24miagmf1s2b4mmm5mbsf1p0d7cippficiiaz"; }) + (fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; hash = "sha256-JQKq/U71NQTfPuUqj7z5bALe+d7G1o3GcI8kvVDxy6o="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; hash = "sha256-YEqAwBRAhvhN5eT8GqOA8XsSwEF4ccwTMBWxBlIHLUo="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; hash = "sha256-Jp0j/58RF9Qooc7ATtq80FtX3TVLhi54JfgrbKdiDes="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; hash = "sha256-wlig5frBAO1DPH9GX0h8MZQq3U4F4K16EliC6N0NbII="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; hash = "sha256-fg7IV0dp7YIYOjBB/P5ky0u59k2hn2bBtCk0IjqmMoA="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; hash = "sha256-SkoODlaNJjTxrHaUUKJIY2QqJReYZ2L+Vvk7p7amvrc="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; hash = "sha256-2CjeOeLJxh3GO25wLchylzI1/uGJCHwjgKGcFZrRb+k="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; hash = "sha256-wHSJqh5rlhuvumnVkixdNS275M8kTZpP9p0srIfJ3oE="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.4"; hash = "sha256-aywLGA/hN5UgHLRfdkOnyuEzWEJtSKA9bLhUuDZOQsM="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; hash = "sha256-13qXDjlWElmwQ0sb00+ny9gOgKuDOHKvALuQB6EZxCQ="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; hash = "sha256-1XfPTcAaNj1926uYkvo7P62++ds5M2gHvkv1hRzBVfs="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; hash = "sha256-iuLlNuPjFvpITQY8DmLyGP+qfkOfiFs7q+SlamKP7Q8="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; hash = "sha256-PXuQB/3EKiOQ3id+KNQpvm+oGgWNGuheYTIr7CJazOY="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; hash = "sha256-ArhpMXygItqt1MZ8aW/2pV6Y0YoVzai73i+VD9edMh4="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; hash = "sha256-zWdkQyTW096IlPzqWEiG2ArkbiY67xs1Zo1zNhruBnc="; }) + (fetchNuGet { pname = "BunLabs.NAudio.Flac"; version = "2.0.1"; hash = "sha256-ezjeQLTnmUGzzgMqto32Dl2uHIPrSPLKV7r5UIh2R98="; }) + (fetchNuGet { pname = "Concentus"; version = "1.1.7"; hash = "sha256-gAIsbANG/G38kG/TQRA5brlApapdC3+xrhSuzAkhv3g="; }) + (fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; hash = "sha256-2ywfhtj+9o3mmWLuPLMOey54S2kGH2ofVi2kGB5bxYo="; }) + (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; hash = "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo="; }) + (fetchNuGet { pname = "DotNet.Bundle"; version = "0.9.13"; hash = "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys="; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) + (fetchNuGet { pname = "Fody"; version = "6.6.3"; hash = "sha256-RtXZv0gPpWdZ0foabp6Td7KG7gLLS7Dhl/pjLCj5EAs="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "Ignore"; version = "0.1.50"; hash = "sha256-Wmjn2ZbfDrIvmLkvIUOZtaBqx9BPXvIyF5eesnlK7mk="; }) + (fetchNuGet { pname = "K4os.Hash.xxHash"; version = "1.0.8"; hash = "sha256-ILTWT8NFB7itGpDloJh65B5ZuWHrN2dOUQdm8gNy4W8="; }) + (fetchNuGet { pname = "Melanchall.DryWetMidi"; version = "7.0.2"; hash = "sha256-89uIWKqBRvuC0GOx1CnpVYmZl7BLyIlor5TvArna1gg="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; hash = "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI="; }) + (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.1"; hash = "sha256-gP6ZhEsjjbmw6a477sm7UuOvGFFTxZYfRE2kKxK8jnc="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; hash = "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; hash = "sha256-tAjiU3w0hdPAGUitszxZ6jtEilRn977MY7N5eZMx0x0="; }) + (fetchNuGet { pname = "Microsoft.ML.OnnxRuntime"; version = "1.15.0"; hash = "sha256-vGvv8ZhtRzd2Nclpg4SC/AmG2PVHED4L9b0/B+x1SvI="; }) + (fetchNuGet { pname = "Microsoft.ML.OnnxRuntime.Managed"; version = "1.15.0"; hash = "sha256-KEPxS+STSiDn/gSdB4dtmKNQmJARY5J/+esFpEDXFho="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; hash = "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; hash = "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; hash = "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; hash = "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "NaCl.Net"; version = "0.1.13"; hash = "sha256-Zy9ckPxrBcKy31g2pKc5uxF22jayw3ZmbrvDBW3MIlk="; }) + (fetchNuGet { pname = "NAudio.Core"; version = "2.2.1"; hash = "sha256-eUZF2/0w5IgGY9UtnZIk1VwwH6VCKP9iPJXVcseIc0c="; }) + (fetchNuGet { pname = "NAudio.Vorbis"; version = "1.5.0"; hash = "sha256-FX5EHVRLcWfjY+/NhkUf33fMFrTcPG3Ztm5ptmu1caw="; }) + (fetchNuGet { pname = "NetMQ"; version = "4.0.1.13"; hash = "sha256-ICm61C9HlUQZe5KcIuzFO+hGmzULtouPIiUtfp+9x80="; }) + (fetchNuGet { pname = "NetSparkleUpdater.SparkleUpdater"; version = "2.2.3"; hash = "sha256-zIrzcnjmxo1gk8ERMisg79q+FiDk2lhcD+cLZ05wdY8="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "NLayer"; version = "1.15.0"; hash = "sha256-B6TM5ZBDPwV09Ck6KGgq2+7YFBW43te5XN72bSEP70I="; }) + (fetchNuGet { pname = "NLayer.NAudioSupport"; version = "1.4.0"; hash = "sha256-7wurHkfzH7mgTMkcAlwyxTz3x3gkPbdCyHSCXo5J+Pc="; }) + (fetchNuGet { pname = "NumSharp"; version = "0.30.0"; hash = "sha256-7Tz5ian7kVpo8uT1r/LvXbQFPcN8Dt1nt8U+hBGJImQ="; }) + (fetchNuGet { pname = "NVorbis"; version = "0.10.4"; hash = "sha256-6ZouAJWaNge6DFnLHDr35uf4vs6Kf12RPp4ahuEejlA="; }) + (fetchNuGet { pname = "NWaves"; version = "0.9.6"; hash = "sha256-Df4RbQGuR8aIwv3XYZ5Hgd/kJieFazvHR8OpCAezvZo="; }) + (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; hash = "sha256-30IBYsy7zYtEHDZGw6K9asFq2dXbW+CrBMpMCEdkERs="; }) + (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; hash = "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) + (fetchNuGet { pname = "ReactiveUI.Fody"; version = "18.3.1"; hash = "sha256-/wcvCVCuhqBFzy6YR0MkztmHFx0h8oA2/koIpGkyuZs="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Serilog"; version = "3.1.1"; hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.1"; hash = "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.36.0"; hash = "sha256-8FIcC5b7A5gNqIwxBlolBuxilmSHCDpObpQ+MuGdkZg="; }) + (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; hash = "sha256-CB4681QJaYoL3MCFn4SwgCWxtFf7T/oZQQ6+pLT5oIg="; }) + (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; hash = "sha256-xoQQrf8RIeNwx4aZjXDECd2ROZCj3SFk8q+eJ64cu9I="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; hash = "sha256-8PgFBZ3Agd+UI9IMxr4fRIW8IA1hqCl15nqlLTJETzk="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; hash = "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Packaging"; version = "7.0.0"; hash = "sha256-I8SG/IH1QjtAAWb5bSBIcFabATNRuwr1CSKyspSQz5k="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.9.0"; hash = "sha256-AbJKAZzZDxKVXm5761XE+nhlkiDqX9eb6+Y9d4Hq+4Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.7.1"; hash = "sha256-Oi+l32p73ZxwcB6GrSS2m25BccfpuwbY4eyFEwUe0IM="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; hash = "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; hash = "sha256-pORThFo85P8TrmfZCCPIXysVPcV2nW8hRlO6z4jVJps="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; hash = "sha256-kq/tvYQSa24mKSvikFK2fKUAnexSL4PO4LkPppqtYkE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "5.0.0"; hash = "sha256-0LyU7KmpFRFZFCugAgDnp93Unw3rL4hFSqx6GNqov9o="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "5.0.0"; hash = "sha256-BI1Js3L4R32UkKOLMTAVpXzGlQ27m+oaYHSV3J+iQfc="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.9.0"; hash = "sha256-DguxLLRrYNn99rYxCGIljZTdZqrVC+VxJNahkFUy9NM="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.0"; hash = "sha256-/wLj3mcmScFAD/9cxmKyQnfdbaF9Mr/lpCuEsMarygM="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "5.0.0"; hash = "sha256-fzWnaRBCDuoq3hQsGIi0PvCEJN7yGaaJvlU6pq4052A="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; hash = "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4="; }) + (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; hash = "sha256-LOIxdET0ynaJz70fakVwDYU0qm+1P0SfD1+I9P320oc="; }) + (fetchNuGet { pname = "Vortice.DXGI"; version = "2.4.2"; hash = "sha256-/5r4f9iM/wxZLsauQDbq6DoTTdvuuhbcmNgaxVK1ep8="; }) + (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.4.25"; hash = "sha256-Mr/HVvwIeeDJtMNToP6kh2hyqud2zT31913HdhB4hm4="; }) + (fetchNuGet { pname = "WanaKana-net"; version = "1.0.0"; hash = "sha256-P50vW+/Ld02tjkx/7qHtJDmdLOkTxEsVjPlDBC+d+KQ="; }) + (fetchNuGet { pname = "xunit"; version = "2.7.1"; hash = "sha256-cf9vLYPIOvBGiUoUept+1NJfuhpSSdCFQSr6+XFde6E="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.12.0"; hash = "sha256-ZqbNShkNckXsZTght1ZlzkJyfd/e8oPtjSMDsJwqGuo="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.7.1"; hash = "sha256-RisnpE0ov99xyrxFywIctzzVnxwXb/HEp9E0dOAq4Ns="; }) + (fetchNuGet { pname = "xunit.core"; version = "2.7.1"; hash = "sha256-3+w1MZ/USIUqQbnyQT4ocgYfghpSoxawZN3E5EhtJ9M="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.1"; hash = "sha256-6AUG4c+cKswwoR2RMz+rrBjhdkIlGiRNxfLPkqKY8gI="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.1"; hash = "sha256-3LEbfaJ2Uu/PWQW4NGONPr5SxZwy3Sj5yCWO6gy7IOk="; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.8"; hash = "sha256-71EXxeR3yiZTAWCVnjIx9o4Lme6MVY04KXch9qZETQU="; }) + (fetchNuGet { pname = "YamlDotNet"; version = "15.1.2"; hash = "sha256-yrvQG/QMIEMOMCv4mtrzWJ5zdFSYEsSRHlkqzSShzts="; }) + (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.7.4"; hash = "sha256-z39r5ekafRbZAsKbOtAlL7ymW5SLosb0NUlStqvPBwE="; }) ] From 8690f8722d23a388d96c15fe6d76472d9a954db2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 09:04:55 +0000 Subject: [PATCH 096/481] awscli2: 2.17.13 -> 2.17.18 --- pkgs/by-name/aw/awscli2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 4ba5c6cfc162..e8f6aec95d2a 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -59,14 +59,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.17.13"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.17.18"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-hnD+2NE7gqbe99UQmRlHoPGdWZj0o2Buvk3kRR15tgI="; + hash = "sha256-HxFtMFeGR6XAMsP5LM0tvJ/ECWVpveIhWRTKvf8uYA0="; }; postPatch = '' From 7347ab1697705fac2a8e67c9f58e8dd1fe3da62d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 09:27:39 +0000 Subject: [PATCH 097/481] handheld-daemon: 3.2.1 -> 3.3.3 --- pkgs/by-name/ha/handheld-daemon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index a25f42e5ade6..56aa51393cd3 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -8,14 +8,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.2.1"; + version = "3.3.3"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; rev = "refs/tags/v${version}"; - hash = "sha256-oRmaF9ciULhN6Rvig34Ibtn4w7fcb/ulRXcApQ+QLWs="; + hash = "sha256-n7UtzI4wYVMldDl7FcK9hhIOTl9jkvATGFjR+pV545U="; }; propagatedBuildInputs = with python3.pkgs; [ From 87b7b17351a65527520a5451575b32a7e327b237 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 11:33:02 +0000 Subject: [PATCH 098/481] tellico: 3.5.3 -> 3.5.5 --- pkgs/applications/misc/tellico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index b990f0ddb0d2..824f7b1356f9 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.5.3"; + version = "3.5.5"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-hg2sfBEh3jjVwMFmkgu9nXuXARsPqvlxzxX7kjSI/JU="; + hash = "sha256-0I4oDMLYWomAF+wpPeA1NQk4nnhUV1RT6IYKJdOUcas="; }; nativeBuildInputs = [ From bc0f09212c8c9f067a66c7e16a94beae1cb9d2ba Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 28 Jul 2024 13:30:45 +0200 Subject: [PATCH 099/481] python312Packages.lib4sbom: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/lib4sbom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index e444e10bbe00..6cdbefeb65da 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.7.1"; + version = "0.7.2"; format = "setuptools"; src = fetchFromGitHub { owner = "anthonyharrison"; repo = pname; rev = "v${version}"; - hash = "sha256-UQZZYTRDbUqSH6F8hjhp9L70025cRO3zXQ8Aoznotg4="; + hash = "sha256-sjfOCG1E5Of+HPcfRsBwEKmGkhUOIkAARWja81FL2PY="; }; dependencies = [ From e7182ec60cfd0dbca8f6c78d4f10d7cfbed01db6 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 28 Jul 2024 13:32:05 +0200 Subject: [PATCH 100/481] cve-bin-tool: fix dependencies * requests is no longer transitively provided * toml is not required for python 3.11+ --- pkgs/tools/security/cve-bin-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix index b269cd362f2b..e2b36b4edf96 100644 --- a/pkgs/tools/security/cve-bin-tool/default.nix +++ b/pkgs/tools/security/cve-bin-tool/default.nix @@ -19,10 +19,10 @@ , pytestCheckHook , python-gnupg , pyyaml +, requests , rich , rpmfile , setuptools -, toml , xmlschema , zstandard , reportlab @@ -64,10 +64,10 @@ buildPythonApplication rec { plotly python-gnupg pyyaml + requests rich rpmfile setuptools - toml xmlschema zstandard ]; From c4b2816ead7d64be922a2418638a9fef35f9f2a2 Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 28 Jul 2024 13:52:09 +0200 Subject: [PATCH 101/481] cve-bin-tool: format with `nixfmt-rfc-style` --- pkgs/tools/security/cve-bin-tool/default.nix | 77 +++++++++----------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix index e2b36b4edf96..65d38a29d1f6 100644 --- a/pkgs/tools/security/cve-bin-tool/default.nix +++ b/pkgs/tools/security/cve-bin-tool/default.nix @@ -1,34 +1,35 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub +{ + lib, + buildPythonApplication, + fetchFromGitHub, # aiohttp[speedups] -, aiodns -, aiohttp -, beautifulsoup4 -, brotlipy -, cvss -, distro -, filetype -, google-cloud-sdk -, jinja2 -, jsonschema -, lib4sbom -, packageurl-python -, packaging -, plotly -, pytestCheckHook -, python-gnupg -, pyyaml -, requests -, rich -, rpmfile -, setuptools -, xmlschema -, zstandard -, reportlab -, pip -, testers -, cve-bin-tool + aiodns, + aiohttp, + beautifulsoup4, + brotlipy, + cvss, + distro, + filetype, + google-cloud-sdk, + jinja2, + jsonschema, + lib4sbom, + packageurl-python, + packaging, + plotly, + pytestCheckHook, + python-gnupg, + pyyaml, + requests, + rich, + rpmfile, + setuptools, + xmlschema, + zstandard, + reportlab, + pip, + testers, + cve-bin-tool, }: buildPythonApplication rec { @@ -73,22 +74,14 @@ buildPythonApplication rec { ]; optional-dependencies = { - pdf = [ - reportlab - ]; + pdf = [ reportlab ]; }; - propagatedBuildInputs = [ - pip - ]; + propagatedBuildInputs = [ pip ]; - nativeCheckInputs = [ - pytestCheckHook - ] ++ lib.flatten (lib.attrValues optional-dependencies); + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - pythonImportsCheck = [ - "cve_bin_tool" - ]; + pythonImportsCheck = [ "cve_bin_tool" ]; passthru.tests.version = testers.testVersion { package = cve-bin-tool; }; From 0b29d6297692145fe5e8e7232c9e54ba0b167e44 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 28 Jul 2024 15:50:06 +0300 Subject: [PATCH 102/481] nuclear: move to by-name --- .../nuclear/default.nix => by-name/nu/nuclear/package.nix} | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{applications/audio/nuclear/default.nix => by-name/nu/nuclear/package.nix} (99%) diff --git a/pkgs/applications/audio/nuclear/default.nix b/pkgs/by-name/nu/nuclear/package.nix similarity index 99% rename from pkgs/applications/audio/nuclear/default.nix rename to pkgs/by-name/nu/nuclear/package.nix index 2d6a4384e747..787904e3d338 100644 --- a/pkgs/applications/audio/nuclear/default.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -32,3 +32,4 @@ appimageTools.wrapType2 { mainProgram = "nuclear"; }; } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9ce5f68c609..4f8eabb6f22d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28484,8 +28484,6 @@ with pkgs; ''; }; - nuclear = callPackage ../applications/audio/nuclear { }; - nuclei = callPackage ../tools/security/nuclei { }; nullmailer = callPackage ../servers/mail/nullmailer { From 31ab3c256482bf26015bdb7755a109b8a513d069 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 28 Jul 2024 15:52:22 +0300 Subject: [PATCH 103/481] nuclear; nixfmt; modernize derivation --- pkgs/by-name/nu/nuclear/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix index 787904e3d338..de4c46624221 100644 --- a/pkgs/by-name/nu/nuclear/package.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -1,6 +1,7 @@ -{ appimageTools -, lib -, fetchurl +{ + appimageTools, + lib, + fetchurl, }: let pname = "nuclear"; @@ -19,17 +20,16 @@ appimageTools.wrapType2 { extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; - meta = with lib; { + meta = { description = "Streaming music player that finds free music for you"; homepage = "https://nuclear.js.org/"; - license = licenses.agpl3Plus; - maintainers = [ maintainers.NotAShelf ]; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.NotAShelf ]; platforms = [ "x86_64-linux" ]; mainProgram = "nuclear"; }; } - From fec2cc372738796daf9ccc3e2ce9acc06c2fefd4 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sun, 28 Jul 2024 01:09:25 +0200 Subject: [PATCH 104/481] maintainer-list: add pinage404 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index faeca5bde79d..a0f70a36a8f7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15953,6 +15953,12 @@ githubId = 34967; name = "Julius de Bruijn"; }; + pinage404 = { + email = "pinage404+nixpkgs@gmail.com"; + github = "pinage404"; + githubId = 6325757; + name = "pinage404"; + }; pineapplehunter = { email = "peshogo+nixpkgs@gmail.com"; github = "pineapplehunter"; From 69eecebabf5bdcade02774934892e363261af2ab Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 28 Jul 2024 16:13:48 +0300 Subject: [PATCH 105/481] nuclear: 0.6.30 -> 0.6.31 --- pkgs/by-name/nu/nuclear/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix index de4c46624221..1ed6df2779c0 100644 --- a/pkgs/by-name/nu/nuclear/package.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -5,11 +5,15 @@ }: let pname = "nuclear"; - version = "0.6.30"; + version = "0.6.31"; src = fetchurl { - url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; - hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; + # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in + # the package name. We also hardcode the host arch in the release name, but should upstream + # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose + # source URL accordingly. + url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; + hash = "sha256-ezho69fDP4OiLpC8KNKc8OIZ++TX4GUinFB6o8MLx3I="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 8d0814b1102a36201ba36b349ad1a82600a7116b Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sun, 28 Jul 2024 14:57:17 +0200 Subject: [PATCH 106/481] masklint: init at 0.3.0 --- pkgs/by-name/ma/masklint/package.nix | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/ma/masklint/package.nix diff --git a/pkgs/by-name/ma/masklint/package.nix b/pkgs/by-name/ma/masklint/package.nix new file mode 100644 index 000000000000..2d039fb27dbd --- /dev/null +++ b/pkgs/by-name/ma/masklint/package.nix @@ -0,0 +1,30 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +let + version = "0.3.0"; +in +rustPlatform.buildRustPackage { + pname = "masklint"; + inherit version; + + src = fetchFromGitHub { + owner = "brumhard"; + repo = "masklint"; + rev = "v${version}"; + hash = "sha256-Dku2pDUCblopHtoj6viUqHVpVH5GDApp+QLjor38j7g="; + }; + + cargoHash = "sha256-dbcz66t9fLhFjFkDMQ6VJmKa/lI/x2J7sHbguamA4Pw="; + + meta = { + description = "Lint your mask targets"; + homepage = "https://github.com/brumhard/masklint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pinage404 ]; + mainProgram = "masklint"; + }; +} From a4eb4b0a62df92e4845c6256d61023966c0802a0 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 28 Jul 2024 15:03:14 +0100 Subject: [PATCH 107/481] bino3d: remove LTO workaround This is unnecessary now that #19098 is fixed. --- pkgs/applications/video/bino3d/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index 180fa2fcf0d5..e0ebccac96b8 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -37,12 +37,6 @@ stdenv.mkDerivation (finalAttrs: { # The optional QVR dependency is not currently packaged. ]; - # LTO is currently broken on macOS. - # https://github.com/NixOS/nixpkgs/issues/19098 - cmakeFlags = lib.optionals stdenv.isDarwin [ - (lib.cmakeBool "CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE" false) - ]; - meta = { description = "Video player with a focus on 3D and Virtual Reality"; homepage = "https://bino3d.org/"; From 15fd5fb7e94dabe9335b50fa7e353352bfd0dbec Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 28 Jul 2024 15:56:38 +0000 Subject: [PATCH 108/481] hiredis: fix cross compilation --- pkgs/development/libraries/hiredis/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index fe9442b7d80d..68c2dc209514 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "hiredis"; version = "1.2.0"; - nativeBuildInputs = [openssl]; src = fetchFromGitHub { owner = "redis"; @@ -12,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZxUITm3OcbERcvaNqGQU46bEfV+jN6safPalG0TVfBg="; }; + buildInputs = [ + openssl + ]; + PREFIX = "\${out}"; USE_SSL = 1; From ca86dd2db2404dd570c56a91f3fb50dba089b920 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 28 Jul 2024 12:23:29 -0500 Subject: [PATCH 109/481] glasskube: 0.13.0 -> 0.14.0 --- pkgs/by-name/gl/glasskube/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index cf403a760dd6..4fb25c51d9be 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.13.0"; + version = "0.14.0"; gitSrc = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-1FzqgZYZQOqaXNQcWTyBmTV0ynxMPQx5ywwR2/8aREg="; + hash = "sha256-k2PjdPPRPOZBr5AUGR25LJVN4/4jWaeTEX2ILLA3o10="; }; web-bundle = buildNpmPackage rec { inherit version; @@ -20,7 +20,7 @@ let src = gitSrc; - npmDepsHash = "sha256-Zly7Ljml3BCHwNSYsGUbVeJGna63Z9j+ebCkjoYyRtc="; + npmDepsHash = "sha256-0PzjOOdKkKjKUsi+uWYkGAyEXynMNq2OODH/sX2SsWQ="; dontNpmInstall = true; @@ -40,7 +40,7 @@ in buildGoModule rec { src = gitSrc; - vendorHash = "sha256-lRaBv+VsSMVjHu092lXe7n2RnDEO/74Sp0R6jC9f1b0="; + vendorHash = "sha256-030lHyj3kkcz56S75l2wM3sVxTch7j9sKqUlkebStFo="; CGO_ENABLED = 0; From 1d4821cd659b72a58e094d3040835f0dff6ce273 Mon Sep 17 00:00:00 2001 From: oleina Date: Fri, 26 Jul 2024 17:56:26 -0700 Subject: [PATCH 110/481] kakounePlugins.hop-kak: init at 0.2.0 --- .../editors/kakoune/plugins/overrides.nix | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index ebdcac8e4dae..e444ea0bf30d 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -2,6 +2,7 @@ , buildKakounePluginFrom2Nix , kakoune-lsp, parinfer-rust, rep , fzf, git, guile, kakoune-unwrapped, lua5_3, plan9port +, rustPlatform }: self: super: { @@ -131,6 +132,41 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} ''; }); + hop-kak = rustPlatform.buildRustPackage rec { + pname = "hop-kak"; + version = "0.2.0"; + + src = fetchgit { + url = "https://git.sr.ht/~hadronized/hop.kak"; + rev = "7314ec64809a69e0044ba7ec57a18b43e3b5f005"; + sha256 = "stmGZQU0tp+5xxrexKMzwSwHj5F/F4HzDO9BorNWC3w="; + + # this package uses git to put the commit hash in the + # help dialog, so leave the .git folder so the command + # succeeds. + leaveDotGit = true; + }; + + nativeBuildInputs = [ + git + ]; + + cargoHash = "sha256-EjSj/+BysGwJBxK6Ccg2+pXHdB2Lg3dxIURRsSVTHVY="; + + postInstall = '' + mkdir -p $out/share/kak/bin + mv $out/bin/hop-kak $out/share/kak/bin/ + ''; + + meta = with lib; { + description = "hinting brought to Kakoune selections"; + homepage = "https://git.sr.ht/~hadronized/hop.kak/"; + license = licenses.bsd3; + maintainers = with maintainers; [ oleina ]; + platforms = platforms.all; + }; + }; + quickscope-kak = buildKakounePluginFrom2Nix rec { pname = "quickscope-kak"; version = "1.0.0"; From 3a58ef5743d1e418d851e15c9b05aa5222a48a5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jul 2024 04:20:51 +0000 Subject: [PATCH 111/481] opencc: 1.1.7 -> 1.1.8 --- pkgs/tools/text/opencc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index bc4630b87178..5806a8ab4faf 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opencc"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "BYVoid"; repo = "OpenCC"; rev = "ver.${version}"; - sha256 = "sha256-N7nazA0xoQ2ewOGDiJg1vBBYMdF1/qiCfNjG5CFFbuk="; + sha256 = "sha256-JKudwA2C7gHihjPnsqPq5i7X8TvG8yQYZEG5f/xu3yo="; }; nativeBuildInputs = From dcaa4a1cede5d72642f543db874307f6d2afadff Mon Sep 17 00:00:00 2001 From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:43:19 +0200 Subject: [PATCH 112/481] virtualbox: 7.0.18 -> 7.0.20 --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- pkgs/applications/virtualization/virtualbox/extpack.nix | 2 +- .../virtualization/virtualbox/guest-additions-iso/default.nix | 2 +- .../virtualization/virtualbox/guest-additions/builder.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 244d1237152e..9173e9474052 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -29,8 +29,8 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.0.18"; - virtualboxSha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"; + virtualboxVersion = "7.0.20"; + virtualboxSha256 = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02"; kvmPatchVersion = "20240617"; kvmPatchHash = "sha256-bOcM9xA1SXB1uTwljpw2vevVeSdHa3omCRon/8DoAUk="; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 089ab4856c0d..c234c079b4c8 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "cab1abad478679fc34a0c5cb4a6d3566edc20e3c54cbed39c8e895d8cfad3ee2"; + let value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 9529c980475d..f59dcc25f4c2 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -5,7 +5,7 @@ let in fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "4469bab0f59c62312b0a1b67dcf9c07a8a971afad339fa2c3eb80e209e099ef9"; + sha256 = "4c7523fa6d17436e3b7788f62956674270572cfefa340d03111b85f8517d5981"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 11ae56d0a353..00d0d555c60a 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "VirtualBox-GuestAdditions-builder-${kernel.version}"; - version = "7.0.18"; + version = "7.0.20"; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${finalAttrs.version}/VirtualBox-${finalAttrs.version}.tar.bz2"; - sha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"; + sha256 = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02"; }; env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; From 1b89337dab565c79eba966512a2c8dafc98e1197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 21:42:56 +0000 Subject: [PATCH 113/481] python312Packages.single-source: 0.3.0 -> 0.4.0 --- .../python-modules/single-source/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/single-source/default.nix b/pkgs/development/python-modules/single-source/default.nix index 894ad9e1da42..c0b10ee60b15 100644 --- a/pkgs/development/python-modules/single-source/default.nix +++ b/pkgs/development/python-modules/single-source/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, poetry-core, + toml, pytest-mock, pytestCheckHook, pythonOlder, @@ -11,23 +11,22 @@ buildPythonPackage rec { pname = "single-source"; - version = "0.3.0"; - format = "pyproject"; + version = "0.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rabbit72"; repo = "single-source"; rev = "refs/tags/v${version}"; - hash = "sha256-bhfMRIeJUd5JhN2tPww7fdbmHQ7ypcsZrYSa55v0+W8="; + hash = "sha256-4l9ochlscQoWJVkYN8Iq2DsiU7qoOf7nUFYgBOebK/g="; }; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ importlib-metadata ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ + toml pytest-mock pytestCheckHook ]; From a96197f98ee1bc035476164fcfef536f5f1be852 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 29 Jul 2024 15:53:33 -0400 Subject: [PATCH 114/481] python312Packages.single-source: add nickcao to maintainers --- pkgs/development/python-modules/single-source/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/single-source/default.nix b/pkgs/development/python-modules/single-source/default.nix index c0b10ee60b15..809493dc0a30 100644 --- a/pkgs/development/python-modules/single-source/default.nix +++ b/pkgs/development/python-modules/single-source/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "single_source" ]; - meta = with lib; { + meta = { description = "Access to the project version in Python code for PEP 621-style projects"; homepage = "https://github.com/rabbit72/single-source"; changelog = "https://github.com/rabbit72/single-source/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 623e8888013d774958bd643f4730e99b47858516 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 29 Jul 2024 15:58:37 -0400 Subject: [PATCH 115/481] tell-me-your-secrets: modernize --- .../security/tell-me-your-secrets/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/security/tell-me-your-secrets/default.nix b/pkgs/tools/security/tell-me-your-secrets/default.nix index 30bd9d48fd23..8e38138d8a0c 100644 --- a/pkgs/tools/security/tell-me-your-secrets/default.nix +++ b/pkgs/tools/security/tell-me-your-secrets/default.nix @@ -1,9 +1,10 @@ -{ lib -, python3 -, fetchFromGitHub +{ + lib, + python3Packages, + fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "tell-me-your-secrets"; version = "2.4.2"; pyproject = true; @@ -16,35 +17,29 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ - "gitignore-parser" "pandas" + "single-source" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3Packages; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ gitignore-parser pandas pyyaml single-source ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - pythonImportsCheck = [ - "tell_me_your_secrets" - ]; + pythonImportsCheck = [ "tell_me_your_secrets" ]; - meta = with lib; { + meta = { description = "Tools to find secrets from various signatures"; mainProgram = "tell-me-your-secrets"; homepage = "https://github.com/valayDave/tell-me-your-secrets"; changelog = "https://github.com/valayDave/tell-me-your-secrets/blob/${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 89be977c5836405727e5219324cfb410ff4b5f55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jul 2024 22:34:23 +0000 Subject: [PATCH 116/481] dbcsr: 2.6.0 -> 2.7.0 --- pkgs/development/libraries/science/math/dbcsr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/development/libraries/science/math/dbcsr/default.nix index 2c576a190026..a99f673700c4 100644 --- a/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "dbcsr"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "cp2k"; repo = "dbcsr"; rev = "v${version}"; - hash = "sha256-+xSxfrzsxBdb424F/3mIETleEPoETxU0LB0OBJrR7gw="; + hash = "sha256-QEO7f27DLsCvKXgFJnneHs1kO+5V9xiURpbQuGg1P0M="; }; postPatch = '' From 66a700525cf5c6bdc35f5266273733adec4f1c0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Jul 2024 00:45:11 +0000 Subject: [PATCH 117/481] kubectl-cnpg: 1.23.2 -> 1.23.3 --- .../networking/cluster/kubectl-cnpg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 6aae2f808969..5fd38f78ae60 100644 --- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-/h2hvyjC/rHOkyZbt0kYn0TcQeXutU4rxYBD7Mh948Q="; + hash = "sha256-78XvVPWhsvu7shbU2fJ+/7NnGxUXLLOeR28OPkUUw2A="; }; - vendorHash = "sha256-MY4yU0UpN3V3RxsFWqxZOsZZA1kma3NNTHE9e/gquno="; + vendorHash = "sha256-Y5HmoxMLs2rvpLycH5bMd9awHrNeIOkwn7m53hCAWug="; subPackages = [ "cmd/kubectl-cnpg" ]; From 25fe9c17b87309946761ef52b68670801a141ae1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Jul 2024 03:13:19 +0000 Subject: [PATCH 118/481] zsh-abbr: 5.8.0 -> 5.8.2 --- pkgs/shells/zsh/zsh-abbr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-abbr/default.nix b/pkgs/shells/zsh/zsh-abbr/default.nix index 795410a8329f..842c6d975b92 100644 --- a/pkgs/shells/zsh/zsh-abbr/default.nix +++ b/pkgs/shells/zsh/zsh-abbr/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "zsh-abbr"; - version = "5.8.0"; + version = "5.8.2"; src = fetchFromGitHub { owner = "olets"; repo = "zsh-abbr"; rev = "v${version}"; - hash = "sha256-bsacP1f1daSYfgMvXduWQ64JJXnrFiLYURENKSMA9LM="; + hash = "sha256-K3LOTnTS8XD6RsPi0c3VqYbO3Ep99iaA4BXRcKK2dgE="; }; strictDeps = true; From 2f9ad760d2e5c4ebd6b4924de897b6bd8f3c95ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Jul 2024 06:31:02 +0000 Subject: [PATCH 119/481] mill: 0.11.9 -> 0.11.10 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 2878fcb20d57..8b84d8e42ad2 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.11.9"; + version = "0.11.10"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly"; - hash = "sha256-PjwqQziWOKCO9G1Cw3SiOvdgnc01cBzgyRlOiTA8u4A="; + hash = "sha256-/IVWeTUu3piV80SfbqeSG6tnRUDTpAyoBcbeCVelUpc="; }; nativeBuildInputs = [ makeWrapper ]; From b1352ca7d7d38b95287c164e0d12f04745e98e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 30 Jul 2024 13:05:32 +0100 Subject: [PATCH 120/481] polkadot: 1.14.0 -> stable2407 https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-stable2407 --- .../blockchains/polkadot/Cargo.lock | 2116 +++++++---------- .../blockchains/polkadot/default.nix | 11 +- 2 files changed, 797 insertions(+), 1330 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 93c3dfc93805..c00775bafdf0 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -549,20 +549,6 @@ dependencies = [ "hashbrown 0.13.2", ] -[[package]] -name = "ark-scale" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "parity-scale-codec", - "scale-info", -] - [[package]] name = "ark-scale" version = "0.0.12" @@ -577,21 +563,6 @@ dependencies = [ "scale-info", ] -[[package]] -name = "ark-secret-scalar" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "ark-transcript", - "digest 0.10.7", - "getrandom_or_panic", - "zeroize", -] - [[package]] name = "ark-serialize" version = "0.3.0" @@ -646,19 +617,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "ark-transcript" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "digest 0.10.7", - "rand_core", - "sha3", -] - [[package]] name = "array-bytes" version = "6.2.2" @@ -787,7 +745,7 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "asset-hub-rococo-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-rococo-runtime", "cumulus-primitives-core", @@ -805,7 +763,6 @@ name = "asset-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", - "asset-hub-rococo-runtime", "asset-test-utils", "cumulus-pallet-parachain-system", "emulated-integration-tests-common", @@ -819,9 +776,7 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", - "penpal-runtime", "polkadot-runtime-common", - "rococo-runtime", "rococo-runtime-constants", "rococo-system-emulated-network", "sp-runtime", @@ -831,7 +786,7 @@ dependencies = [ [[package]] name = "asset-hub-rococo-runtime" -version = "0.11.0" +version = "0.21.0" dependencies = [ "asset-test-utils", "assets-common", @@ -899,8 +854,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "sp-weights", @@ -915,7 +869,7 @@ dependencies = [ [[package]] name = "asset-hub-westend-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-westend-runtime", "cumulus-primitives-core", @@ -933,7 +887,6 @@ name = "asset-hub-westend-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", - "asset-hub-westend-runtime", "asset-test-utils", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", @@ -951,21 +904,19 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", - "penpal-runtime", "polkadot-runtime-common", "sp-core", "sp-keyring", "sp-runtime", "staging-xcm", "staging-xcm-executor", - "westend-runtime", "westend-system-emulated-network", "xcm-runtime-apis", ] [[package]] name = "asset-hub-westend-runtime" -version = "0.15.0" +version = "0.25.0" dependencies = [ "asset-test-utils", "assets-common", @@ -1032,8 +983,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -1048,7 +998,7 @@ dependencies = [ [[package]] name = "asset-test-utils" -version = "7.0.0" +version = "17.0.0" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", @@ -1068,7 +1018,6 @@ dependencies = [ "parity-scale-codec", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -1078,7 +1027,7 @@ dependencies = [ [[package]] name = "assets-common" -version = "0.7.0" +version = "0.17.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1091,7 +1040,6 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1216,7 +1164,7 @@ checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ "event-listener 5.2.0", "event-listener-strategy", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -1270,7 +1218,7 @@ dependencies = [ "log", "memchr", "once_cell", - "pin-project-lite 0.2.12", + "pin-project-lite", "pin-utils", "slab", "wasm-bindgen-futures", @@ -1284,7 +1232,7 @@ checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -1325,7 +1273,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -1406,29 +1354,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "bandersnatch_vrfs" -version = "0.0.4" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-bls12-381", - "ark-ec", - "ark-ed-on-bls12-381-bandersnatch", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "dleq_vrf", - "fflonk", - "merlin", - "rand_chacha", - "rand_core", - "ring 0.1.0", - "sha2 0.10.8", - "sp-ark-bls12-381", - "sp-ark-ed-on-bls12-381-bandersnatch", - "zeroize", -] - [[package]] name = "base-x" version = "0.2.11" @@ -1485,7 +1410,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" -version = "13.0.0" +version = "15.0.0" dependencies = [ "array-bytes", "env_logger 0.11.3", @@ -1721,7 +1646,7 @@ dependencies = [ [[package]] name = "bp-asset-hub-rococo" -version = "0.4.0" +version = "0.13.0" dependencies = [ "bp-xcm-bridge-hub-router", "frame-support", @@ -1731,7 +1656,7 @@ dependencies = [ [[package]] name = "bp-asset-hub-westend" -version = "0.3.0" +version = "0.12.0" dependencies = [ "bp-xcm-bridge-hub-router", "frame-support", @@ -1753,12 +1678,12 @@ dependencies = [ "serde", "sp-consensus-beefy", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-cumulus" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -1767,12 +1692,12 @@ dependencies = [ "frame-system", "polkadot-primitives", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-kusama" -version = "0.6.0" +version = "0.16.0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", @@ -1780,12 +1705,12 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-polkadot" -version = "0.6.0" +version = "0.16.0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", @@ -1793,12 +1718,12 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-rococo" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", @@ -1806,12 +1731,12 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-westend" -version = "0.3.0" +version = "0.13.0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", @@ -1819,12 +1744,12 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-header-chain" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-runtime", "bp-test-utils", @@ -1838,24 +1763,24 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-kusama" -version = "0.5.0" +version = "0.15.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-messages" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-runtime", @@ -1866,12 +1791,12 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-parachains" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", @@ -1882,24 +1807,24 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-polkadot" -version = "0.5.0" +version = "0.15.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-polkadot-bulletin" -version = "0.4.0" +version = "0.14.0" dependencies = [ "bp-header-chain", "bp-messages", @@ -1911,12 +1836,12 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-polkadot-core" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-messages", "bp-runtime", @@ -1929,12 +1854,12 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-relayers" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-messages", "bp-runtime", @@ -1944,24 +1869,24 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-rococo" -version = "0.6.0" +version = "0.16.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-runtime" -version = "0.7.0" +version = "0.17.0" dependencies = [ "frame-support", "frame-system", @@ -1977,14 +1902,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", + "sp-std", "sp-trie", "trie-db", ] [[package]] name = "bp-test-utils" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-parachains", @@ -1997,32 +1922,32 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-trie", ] [[package]] name = "bp-westend" -version = "0.3.0" +version = "0.13.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-xcm-bridge-hub" -version = "0.2.0" +version = "0.3.0" dependencies = [ - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-xcm-bridge-hub-router" -version = "0.6.0" +version = "0.14.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -2032,7 +1957,7 @@ dependencies = [ [[package]] name = "bridge-hub-common" -version = "0.1.0" +version = "0.9.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2042,13 +1967,12 @@ dependencies = [ "snowbridge-core", "sp-core", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", ] [[package]] name = "bridge-hub-rococo-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "bridge-hub-common", "bridge-hub-rococo-runtime", @@ -2063,8 +1987,6 @@ dependencies = [ name = "bridge-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ - "asset-hub-rococo-runtime", - "bridge-hub-rococo-runtime", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", "frame-support", @@ -2094,7 +2016,7 @@ dependencies = [ [[package]] name = "bridge-hub-rococo-runtime" -version = "0.5.0" +version = "0.15.0" dependencies = [ "bp-asset-hub-rococo", "bp-asset-hub-westend", @@ -2178,8 +2100,8 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -2194,7 +2116,7 @@ dependencies = [ [[package]] name = "bridge-hub-test-utils" -version = "0.7.0" +version = "0.17.0" dependencies = [ "asset-test-utils", "bp-header-chain", @@ -2224,8 +2146,7 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2233,7 +2154,7 @@ dependencies = [ [[package]] name = "bridge-hub-westend-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "bridge-hub-common", "bridge-hub-westend-runtime", @@ -2248,10 +2169,10 @@ dependencies = [ name = "bridge-hub-westend-integration-tests" version = "1.0.0" dependencies = [ - "bridge-hub-westend-runtime", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", "frame-support", + "hex-literal", "pallet-asset-conversion", "pallet-assets", "pallet-balances", @@ -2267,7 +2188,7 @@ dependencies = [ [[package]] name = "bridge-hub-westend-runtime" -version = "0.2.0" +version = "0.12.0" dependencies = [ "bp-asset-hub-rococo", "bp-asset-hub-westend", @@ -2337,8 +2258,8 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -2354,7 +2275,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-messages", @@ -2367,7 +2288,6 @@ dependencies = [ "bp-xcm-bridge-hub-router", "frame-support", "frame-system", - "hash-db", "log", "pallet-balances", "pallet-bridge-grandpa", @@ -2378,11 +2298,9 @@ dependencies = [ "pallet-utility", "parity-scale-codec", "scale-info", - "sp-api", - "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-trie", "staging-xcm", "staging-xcm-builder", @@ -2608,7 +2526,7 @@ dependencies = [ [[package]] name = "chain-spec-guide-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "docify", "pallet-balances", @@ -2627,7 +2545,6 @@ dependencies = [ "sp-genesis-builder", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", "staging-chain-spec-builder", "substrate-wasm-builder", ] @@ -2876,7 +2793,7 @@ dependencies = [ [[package]] name = "collectives-westend-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "collectives-westend-runtime", "cumulus-primitives-core", @@ -2892,8 +2809,6 @@ name = "collectives-westend-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", - "asset-hub-westend-runtime", - "collectives-westend-runtime", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", @@ -2912,14 +2827,13 @@ dependencies = [ "staging-xcm", "staging-xcm-executor", "testnet-parachains-constants", - "westend-runtime", "westend-runtime-constants", "westend-system-emulated-network", ] [[package]] name = "collectives-westend-runtime" -version = "3.0.0" +version = "13.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -2980,8 +2894,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -3066,22 +2979,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "common" -version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "fflonk", - "getrandom_or_panic", - "merlin", - "rand_chacha", -] - [[package]] name = "common-path" version = "1.0.0" @@ -3187,7 +3084,7 @@ checksum = "f272d0c4cf831b4fa80ee529c7707f76585986e910e1fbce1d7921970bc1a241" [[package]] name = "contracts-rococo-runtime" -version = "0.8.0" +version = "0.18.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -3237,8 +3134,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -3283,7 +3179,7 @@ dependencies = [ [[package]] name = "coretime-rococo-runtime" -version = "0.1.0" +version = "0.11.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -3296,6 +3192,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -3334,8 +3231,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -3349,7 +3245,7 @@ dependencies = [ [[package]] name = "coretime-westend-runtime" -version = "0.1.0" +version = "0.11.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -3362,6 +3258,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -3398,8 +3295,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -3712,7 +3608,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" -version = "0.7.0" +version = "0.17.0" dependencies = [ "clap 4.5.3", "parity-scale-codec", @@ -3728,7 +3624,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -3752,13 +3648,13 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "tracing", ] [[package]] name = "cumulus-client-consensus-aura" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-client-collator", @@ -3781,6 +3677,7 @@ dependencies = [ "sc-consensus-babe", "sc-consensus-slots", "sc-telemetry", + "sc-utils", "schnellru", "sp-api", "sp-application-crypto", @@ -3795,12 +3692,13 @@ dependencies = [ "sp-state-machine", "sp-timestamp", "substrate-prometheus-endpoint", + "tokio", "tracing", ] [[package]] name = "cumulus-client-consensus-common" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -3824,7 +3722,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "sp-version", "substrate-prometheus-endpoint", @@ -3833,7 +3731,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-proposer" -version = "0.7.0" +version = "0.15.0" dependencies = [ "anyhow", "async-trait", @@ -3847,7 +3745,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -3869,7 +3767,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -3906,7 +3804,7 @@ dependencies = [ [[package]] name = "cumulus-client-parachain-inherent" -version = "0.1.0" +version = "0.11.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -3915,21 +3813,19 @@ dependencies = [ "cumulus-test-relay-sproof-builder", "parity-scale-codec", "sc-client-api", - "scale-info", "sp-api", "sp-crypto-hashing", "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-trie", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" -version = "0.7.0" +version = "0.17.0" dependencies = [ "assert_matches", "async-trait", @@ -3956,7 +3852,7 @@ dependencies = [ "sp-consensus", "sp-maybe-compressed-blob", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", "substrate-test-utils", "tokio", @@ -3965,7 +3861,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" -version = "0.7.0" +version = "0.17.0" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -4001,7 +3897,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-pallet-parachain-system", "frame-support", @@ -4013,12 +3909,11 @@ dependencies = [ "sp-application-crypto", "sp-consensus-aura", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "cumulus-pallet-dmp-queue" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -4030,14 +3925,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", ] [[package]] name = "cumulus-pallet-parachain-system" -version = "0.7.0" +version = "0.16.0" dependencies = [ "assert_matches", "bytes", @@ -4068,14 +3962,14 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-inherents", "sp-io", "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "sp-trie", "sp-version", "staging-xcm", @@ -4096,7 +3990,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" -version = "9.0.0" +version = "18.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -4104,12 +3998,11 @@ dependencies = [ "pallet-session", "parity-scale-codec", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "cumulus-pallet-solo-to-para" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-pallet-parachain-system", "frame-support", @@ -4119,12 +4012,11 @@ dependencies = [ "polkadot-primitives", "scale-info", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "cumulus-pallet-xcm" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -4133,13 +4025,12 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" -version = "0.7.0" +version = "0.16.0" dependencies = [ "bounded-collections", "bp-xcm-bridge-hub-router", @@ -4158,7 +4049,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -4166,7 +4056,7 @@ dependencies = [ [[package]] name = "cumulus-ping" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-pallet-xcm", "cumulus-primitives-core", @@ -4175,13 +4065,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", ] [[package]] name = "cumulus-primitives-aura" -version = "0.7.0" +version = "0.15.0" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -4189,12 +4078,11 @@ dependencies = [ "sp-api", "sp-consensus-aura", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "cumulus-primitives-core" -version = "0.7.0" +version = "0.15.0" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -4203,14 +4091,13 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0", "sp-trie", "staging-xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" -version = "0.7.0" +version = "0.15.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4220,25 +4107,24 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", "sp-trie", ] [[package]] name = "cumulus-primitives-proof-size-hostfunction" -version = "0.2.0" +version = "0.10.0" dependencies = [ "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-state-machine", "sp-trie", ] [[package]] name = "cumulus-primitives-storage-weight-reclaim" -version = "1.0.0" +version = "7.0.0" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-proof-size-hostfunction", @@ -4251,25 +4137,23 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-trie", ] [[package]] name = "cumulus-primitives-timestamp" -version = "0.7.0" +version = "0.15.0" dependencies = [ "cumulus-primitives-core", "futures", "parity-scale-codec", "sp-inherents", - "sp-std 14.0.0", "sp-timestamp", ] [[package]] name = "cumulus-primitives-utility" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -4280,7 +4164,6 @@ dependencies = [ "polkadot-runtime-parachains", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -4288,7 +4171,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4316,7 +4199,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4334,7 +4217,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" -version = "0.7.0" +version = "0.17.0" dependencies = [ "array-bytes", "async-trait", @@ -4342,15 +4225,8 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", - "parking_lot 0.12.3", - "polkadot-availability-recovery", - "polkadot-collator-protocol", "polkadot-core-primitives", "polkadot-network-bridge", - "polkadot-node-collation-generation", - "polkadot-node-core-chain-api", - "polkadot-node-core-prospective-parachains", - "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-subsystem-util", "polkadot-overseer", @@ -4375,7 +4251,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4402,7 +4278,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-version", "thiserror", "tokio", @@ -4450,14 +4326,13 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" -version = "0.7.0" +version = "0.15.0" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", "sp-trie", ] @@ -4496,7 +4371,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -4544,7 +4418,6 @@ dependencies = [ "polkadot-test-service", "portpicker", "rand", - "rococo-parachain-runtime", "sc-basic-authorship", "sc-block-builder", "sc-chain-spec", @@ -4569,14 +4442,13 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-consensus-grandpa", "sp-core", "sp-io", "sp-keyring", "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-client", "substrate-test-utils", "tempfile", @@ -4803,17 +4675,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive-syn-parse" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" -dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 1.0.109", -] - [[package]] name = "derive-syn-parse" version = "0.2.0" @@ -4950,22 +4811,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" -[[package]] -name = "dleq_vrf" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-scale 0.0.12", - "ark-secret-scalar", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "ark-transcript", - "arrayvec 0.7.4", - "zeroize", -] - [[package]] name = "dlmalloc" version = "0.2.4" @@ -4997,7 +4842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse 0.2.0", + "derive-syn-parse", "once_cell", "proc-macro2 1.0.82", "quote 1.0.35", @@ -5142,7 +4987,7 @@ dependencies = [ [[package]] name = "emulated-integration-tests-common" -version = "3.0.0" +version = "13.0.0" dependencies = [ "asset-test-utils", "bp-messages", @@ -5410,7 +5255,7 @@ checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -5420,7 +5265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.2.0", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -5434,12 +5279,14 @@ dependencies = [ [[package]] name = "expander" -version = "2.0.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" +checksum = "e2c470c71d91ecbd179935b24170459e926382eaaa86b590b78814e180d8a8e2" dependencies = [ "blake2 0.10.6", + "file-guard", "fs-err", + "prettyplease 0.2.12", "proc-macro2 1.0.82", "quote 1.0.35", "syn 2.0.61", @@ -5553,25 +5400,22 @@ dependencies = [ "subtle 2.5.0", ] -[[package]] -name = "fflonk" -version = "0.1.0" -source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "merlin", -] - [[package]] name = "fiat-crypto" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +[[package]] +name = "file-guard" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21ef72acf95ec3d7dbf61275be556299490a245f017cf084bd23b4f68cf9407c" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "file-per-thread-logger" version = "0.1.6" @@ -5698,16 +5542,16 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" -version = "12.0.0" +version = "13.0.0" dependencies = [ "parity-scale-codec", ] [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -5740,7 +5584,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "frame-support", @@ -5759,15 +5603,14 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-runtime-interface", + "sp-storage", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" -version = "32.0.0" +version = "42.0.0" dependencies = [ "Inflector", "array-bytes", @@ -5800,23 +5643,23 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-database", - "sp-externalities 0.25.0", + "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-trie", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "thiserror", "thousands", ] [[package]] name = "frame-benchmarking-pallet-pov" -version = "18.0.0" +version = "27.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -5825,12 +5668,11 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "frame-election-provider-solution-type" -version = "13.0.0" +version = "14.0.1" dependencies = [ "frame-election-provider-support", "frame-support", @@ -5846,7 +5688,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -5859,12 +5701,11 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "frame-election-solution-type-fuzzer" -version = "2.0.0-alpha.5" +version = "2.0.0" dependencies = [ "clap 4.5.3", "frame-election-provider-solution-type", @@ -5881,7 +5722,7 @@ dependencies = [ [[package]] name = "frame-executive" -version = "28.0.0" +version = "37.0.0" dependencies = [ "aquamarine", "array-bytes", @@ -5897,8 +5738,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", ] @@ -5916,7 +5756,7 @@ dependencies = [ [[package]] name = "frame-metadata-hash-extension" -version = "0.1.0" +version = "0.5.0" dependencies = [ "array-bytes", "docify", @@ -5929,7 +5769,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "substrate-test-runtime-client", "substrate-wasm-builder", @@ -5937,7 +5777,7 @@ dependencies = [ [[package]] name = "frame-omni-bencher" -version = "0.1.0" +version = "0.6.0" dependencies = [ "clap 4.5.3", "cumulus-primitives-proof-size-hostfunction", @@ -5951,7 +5791,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" -version = "0.35.0" +version = "0.45.0" dependencies = [ "futures", "indicatif", @@ -5964,7 +5804,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "spinners", "substrate-rpc-client", "tokio", @@ -5973,7 +5813,7 @@ dependencies = [ [[package]] name = "frame-support" -version = "28.0.0" +version = "37.0.0" dependencies = [ "aquamarine", "array-bytes", @@ -6000,7 +5840,7 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-crypto-hashing-proc-macro", - "sp-debug-derive 14.0.0", + "sp-debug-derive", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -6008,9 +5848,9 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std 14.0.0", + "sp-std", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-weights", "static_assertions", "tt-call", @@ -6018,11 +5858,11 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "23.0.0" +version = "30.0.2" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse 0.2.0", + "derive-syn-parse", "expander", "frame-support-procedural-tools", "itertools 0.11.0", @@ -6037,7 +5877,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "10.0.0" +version = "13.0.0" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", @@ -6048,7 +5888,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "11.0.0" +version = "12.0.0" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -6077,7 +5917,6 @@ dependencies = [ "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", "sp-version", "static_assertions", "trybuild", @@ -6085,7 +5924,7 @@ dependencies = [ [[package]] name = "frame-support-test-compile-pass" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-support", "frame-system", @@ -6098,7 +5937,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-support", "frame-system", @@ -6119,7 +5958,7 @@ dependencies = [ [[package]] name = "frame-system" -version = "28.0.0" +version = "37.0.0" dependencies = [ "cfg-if", "criterion", @@ -6130,10 +5969,10 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-version", "sp-weights", "substrate-test-runtime-client", @@ -6141,7 +5980,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -6149,16 +5988,15 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-version", ] [[package]] name = "frame-system-rpc-runtime-api" -version = "26.0.0" +version = "34.0.0" dependencies = [ "docify", "parity-scale-codec", @@ -6167,13 +6005,12 @@ dependencies = [ [[package]] name = "frame-try-runtime" -version = "0.34.0" +version = "0.43.0" dependencies = [ "frame-support", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -6284,7 +6121,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.12", + "pin-project-lite", "waker-fn", ] @@ -6295,7 +6132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "futures-core", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -6350,7 +6187,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.12", + "pin-project-lite", "pin-utils", "slab", ] @@ -6366,7 +6203,7 @@ dependencies = [ [[package]] name = "generate-bags" -version = "28.0.0" +version = "37.0.0" dependencies = [ "chrono", "frame-election-provider-support", @@ -6479,7 +6316,7 @@ dependencies = [ [[package]] name = "glutton-westend-runtime" -version = "3.0.0" +version = "13.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -6511,8 +6348,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -6809,7 +6645,7 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http 0.2.9", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -6832,7 +6668,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.0", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -6855,9 +6691,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -6869,8 +6705,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.12", - "socket2 0.4.9", + "pin-project-lite", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -6892,7 +6728,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.12", + "pin-project-lite", "smallvec", "tokio", "want", @@ -6900,13 +6736,13 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.9", - "hyper 0.14.27", + "hyper 0.14.29", "log", "rustls 0.21.7", "rustls-native-certs 0.6.3", @@ -6944,7 +6780,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "hyper 1.3.1", - "pin-project-lite 0.2.12", + "pin-project-lite", "socket2 0.5.7", "tokio", "tower", @@ -6996,6 +6832,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if-addrs" version = "0.10.2" @@ -7036,7 +6882,7 @@ dependencies = [ "bytes", "futures", "http 0.2.9", - "hyper 0.14.27", + "hyper 0.14.29", "log", "rand", "tokio", @@ -7553,7 +7399,7 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" [[package]] name = "kitchensink-runtime" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "log", "node-primitives", @@ -8113,9 +7959,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3facf0691bab65f571bc97c6c65ffa836248ca631d631b7691ac91deb7fceb5f" +checksum = "004ee9c4a4631435169aee6aad2f62e3984dc031c43b6d29731e8e82a016c538" dependencies = [ "either", "futures", @@ -8124,9 +7970,10 @@ dependencies = [ "libp2p-identity", "log", "parking_lot 0.12.3", - "quicksink", + "pin-project-lite", "rw-stream-sink", - "soketto 0.7.1", + "soketto 0.8.0", + "thiserror", "url", "webpki-roots 0.25.2", ] @@ -8448,9 +8295,9 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" +checksum = "cc33f9f0351468d26fbc53d9ce00a096c8522ecb42f19b50f34f2c422f76d21d" dependencies = [ "macro_magic_core", "macro_magic_macros", @@ -8460,12 +8307,12 @@ dependencies = [ [[package]] name = "macro_magic_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" +checksum = "1687dc887e42f352865a393acae7cf79d98fab6351cde1f58e9e057da89bf150" dependencies = [ "const-random", - "derive-syn-parse 0.1.5", + "derive-syn-parse", "macro_magic_core_macros", "proc-macro2 1.0.82", "quote 1.0.35", @@ -8474,9 +8321,9 @@ dependencies = [ [[package]] name = "macro_magic_core_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" +checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -8485,9 +8332,9 @@ dependencies = [ [[package]] name = "macro_magic_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" +checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869" dependencies = [ "macro_magic_core", "quote 1.0.35", @@ -8506,15 +8353,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "matchers" version = "0.1.0" @@ -8633,7 +8471,6 @@ dependencies = [ "async-std", "async-trait", "bp-messages", - "env_logger 0.11.3", "finality-relay", "futures", "hex", @@ -8669,7 +8506,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minimal-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "docify", "minimal-template-node", @@ -8682,7 +8519,7 @@ dependencies = [ [[package]] name = "minimal-template-node" -version = "0.0.0" +version = "0.1.0" dependencies = [ "clap 4.5.3", "docify", @@ -8718,7 +8555,7 @@ dependencies = [ [[package]] name = "minimal-template-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "pallet-balances", "pallet-minimal-template", @@ -8781,7 +8618,7 @@ dependencies = [ [[package]] name = "mmr-gadget" -version = "29.0.0" +version = "39.0.0" dependencies = [ "futures", "log", @@ -8797,14 +8634,14 @@ dependencies = [ "sp-core", "sp-mmr-primitives", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime-client", "tokio", ] [[package]] name = "mmr-rpc" -version = "28.0.0" +version = "37.0.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9174,7 +9011,7 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] name = "node-bench" -version = "0.9.0-dev" +version = "0.9.0" dependencies = [ "array-bytes", "clap 4.5.3", @@ -9203,7 +9040,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "tempfile", ] @@ -9218,7 +9055,7 @@ dependencies = [ [[package]] name = "node-rpc" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -9277,7 +9114,7 @@ dependencies = [ [[package]] name = "node-testing" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "frame-metadata-hash-extension", "frame-system", @@ -9621,9 +9458,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orchestra" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92829eef0328a3d1cd22a02c0e51deb92a5362df3e7d21a4e9bdc38934694e66" +checksum = "41f6bbacc8c189a3f2e45e0fd0436e5d97f194db888e721bdbc3973e7dbed4c2" dependencies = [ "async-trait", "dyn-clonable", @@ -9638,9 +9475,9 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1344346d5af32c95bbddea91b18a88cc83eac394192d20ef2fc4c40a74332355" +checksum = "f7b1d40dd8f367db3c65bec8d3dd47d4a604ee8874480738f93191bddab4e0e0" dependencies = [ "expander", "indexmap 2.2.3", @@ -9681,7 +9518,7 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pallet-alliance" -version = "27.0.0" +version = "36.0.0" dependencies = [ "array-bytes", "frame-benchmarking", @@ -9697,12 +9534,11 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-asset-conversion" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9718,12 +9554,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-asset-conversion-ops" -version = "0.1.0" +version = "0.5.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9739,12 +9574,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-asset-conversion-tx-payment" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-support", "frame-system", @@ -9757,13 +9591,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", ] [[package]] name = "pallet-asset-rate" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9774,12 +9607,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-asset-tx-payment" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9795,13 +9627,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", ] [[package]] name = "pallet-assets" -version = "29.1.0" +version = "39.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9814,12 +9645,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-assets-freezer" -version = "0.1.0" +version = "0.4.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9836,7 +9667,7 @@ dependencies = [ [[package]] name = "pallet-atomic-swap" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -9846,12 +9677,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-aura" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-support", "frame-system", @@ -9864,12 +9694,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-authority-discovery" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -9881,12 +9710,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-authorship" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -9896,12 +9724,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-babe" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -9924,12 +9751,11 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-bags-list" -version = "27.0.0" +version = "36.0.0" dependencies = [ "aquamarine", "docify", @@ -9944,13 +9770,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-bags-list-fuzzer" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-election-provider-support", "honggfuzz", @@ -9960,7 +9785,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -9971,14 +9796,14 @@ dependencies = [ "pallet-staking", "sp-core", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-storage", + "sp-tracing", ] [[package]] name = "pallet-balances" -version = "28.0.0" +version = "38.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -9992,12 +9817,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-beefy" -version = "28.0.0" +version = "38.0.0" dependencies = [ "frame-election-provider-support", "frame-support", @@ -10020,12 +9844,11 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std 14.0.0", ] [[package]] name = "pallet-beefy-mmr" -version = "28.0.0" +version = "38.0.0" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -10045,12 +9868,11 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std 14.0.0", ] [[package]] name = "pallet-bounties" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10063,7 +9885,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10087,17 +9908,16 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-bridge-grandpa" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-runtime", "bp-test-utils", - "finality-grandpa", "frame-benchmarking", "frame-support", "frame-system", @@ -10108,14 +9928,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-trie", + "sp-std", ] [[package]] name = "pallet-bridge-messages" -version = "0.7.0" +version = "0.17.0" dependencies = [ + "bp-header-chain", "bp-messages", "bp-runtime", "bp-test-utils", @@ -10123,18 +9943,20 @@ dependencies = [ "frame-support", "frame-system", "log", - "num-traits", "pallet-balances", + "pallet-bridge-grandpa", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", + "sp-trie", ] [[package]] name = "pallet-bridge-parachains" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-parachains", @@ -10151,13 +9973,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-trie", + "sp-std", ] [[package]] name = "pallet-bridge-relayers" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-messages", "bp-relayers", @@ -10173,12 +9994,12 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-broker" -version = "0.6.0" +version = "0.16.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -10193,13 +10014,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-child-bounties" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10213,12 +10033,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-collator-selection" -version = "9.0.0" +version = "18.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10237,13 +10056,12 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-collective" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10254,12 +10072,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-collective-content" -version = "0.6.0" +version = "0.15.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10269,12 +10086,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-contracts" -version = "27.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "assert_matches", @@ -10309,8 +10125,8 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "wasm-instrument", @@ -10334,7 +10150,7 @@ dependencies = [ [[package]] name = "pallet-contracts-mock-network" -version = "3.0.0" +version = "13.0.0" dependencies = [ "assert_matches", "frame-support", @@ -10362,8 +10178,7 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -10372,7 +10187,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" -version = "18.0.0" +version = "23.0.1" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -10381,7 +10196,7 @@ dependencies = [ [[package]] name = "pallet-contracts-uapi" -version = "5.0.0" +version = "12.0.0" dependencies = [ "bitflags 1.3.2", "parity-scale-codec", @@ -10392,7 +10207,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" -version = "28.0.0" +version = "37.0.0" dependencies = [ "assert_matches", "frame-benchmarking", @@ -10406,12 +10221,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-core-fellowship" -version = "12.0.0" +version = "21.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10424,7 +10238,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10438,12 +10251,11 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-delegated-staking" -version = "1.0.0" +version = "4.0.0" dependencies = [ "frame-election-provider-support", "frame-support", @@ -10459,14 +10271,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-utils", ] [[package]] name = "pallet-democracy" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10481,12 +10292,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-dev-mode" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-support", "frame-system", @@ -10497,7 +10307,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10523,13 +10332,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", ] [[package]] name = "pallet-election-provider-multi-phase" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -10547,14 +10356,13 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "strum 0.26.2", ] [[package]] name = "pallet-election-provider-support-benchmarking" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -10562,12 +10370,11 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-elections-phragmen" -version = "29.0.0" +version = "38.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10581,14 +10388,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-utils", ] [[package]] name = "pallet-example-basic" -version = "27.0.0" +version = "34.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10600,12 +10406,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-example-frame-crate" -version = "0.0.1" +version = "0.1.0" dependencies = [ "parity-scale-codec", "polkadot-sdk-frame", @@ -10614,7 +10419,7 @@ dependencies = [ [[package]] name = "pallet-example-kitchensink" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10626,7 +10431,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10657,12 +10461,11 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-example-single-block-migrations" -version = "0.0.1" +version = "0.1.0" dependencies = [ "docify", "frame-executive", @@ -10676,7 +10479,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-version", ] @@ -10692,7 +10494,6 @@ dependencies = [ "scale-info", "sp-core", "sp-io", - "sp-std 14.0.0", ] [[package]] @@ -10708,12 +10509,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-examples" -version = "4.0.0-dev" +version = "7.0.0" dependencies = [ "pallet-default-config-example", "pallet-dev-mode", @@ -10728,7 +10528,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" -version = "27.0.0" +version = "36.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -10746,14 +10546,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-utils", ] [[package]] name = "pallet-glutton" -version = "14.0.0" +version = "23.0.0" dependencies = [ "blake2 0.10.6", "frame-benchmarking", @@ -10767,12 +10566,11 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-grandpa" -version = "28.0.0" +version = "37.0.0" dependencies = [ "finality-grandpa", "frame-benchmarking", @@ -10797,12 +10595,11 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-identity" -version = "29.0.0" +version = "37.0.0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -10816,12 +10613,11 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-im-online" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10836,12 +10632,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-indices" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10853,12 +10648,11 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-insecure-randomness-collective-flip" -version = "16.0.0" +version = "25.0.0" dependencies = [ "frame-support", "frame-system", @@ -10868,12 +10662,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-lottery" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10885,12 +10678,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-membership" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10901,12 +10693,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-message-queue" -version = "31.0.0" +version = "40.0.0" dependencies = [ "environmental", "frame-benchmarking", @@ -10923,14 +10714,13 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-weights", ] [[package]] name = "pallet-migrations" -version = "1.0.0" +version = "7.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -10947,14 +10737,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", ] [[package]] name = "pallet-minimal-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "parity-scale-codec", "polkadot-sdk-frame", @@ -10963,7 +10752,7 @@ dependencies = [ [[package]] name = "pallet-mixnet" -version = "0.4.0" +version = "0.13.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10977,12 +10766,11 @@ dependencies = [ "sp-io", "sp-mixnet", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-mmr" -version = "27.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "env_logger 0.11.3", @@ -10997,12 +10785,11 @@ dependencies = [ "sp-io", "sp-mmr-primitives", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-multisig" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11013,12 +10800,11 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-nft-fractionalization" -version = "10.0.0" +version = "20.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11032,12 +10818,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-nfts" -version = "22.0.0" +version = "31.0.0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -11051,22 +10837,20 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-nfts-runtime-api" -version = "14.0.0" +version = "23.0.0" dependencies = [ "pallet-nfts", "parity-scale-codec", "sp-api", - "sp-std 14.0.0", ] [[package]] name = "pallet-nis" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11078,12 +10862,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-node-authorization" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -11093,12 +10876,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-nomination-pools" -version = "25.0.0" +version = "34.0.0" dependencies = [ "frame-support", "frame-system", @@ -11110,13 +10892,12 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-benchmarking" -version = "26.0.0" +version = "35.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -11134,9 +10915,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-staking", - "sp-std 14.0.0", ] [[package]] @@ -11151,17 +10931,16 @@ dependencies = [ "rand", "sp-io", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-runtime-api" -version = "23.0.0" +version = "32.0.0" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", "sp-api", - "sp-std 14.0.0", ] [[package]] @@ -11185,8 +10964,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", ] [[package]] @@ -11209,13 +10988,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", ] [[package]] name = "pallet-offences" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-support", "frame-system", @@ -11228,12 +11007,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-offences-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -11255,12 +11033,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-paged-list" -version = "0.6.0" +version = "0.15.0" dependencies = [ "docify", "frame-benchmarking", @@ -11272,7 +11049,6 @@ dependencies = [ "sp-io", "sp-metadata-ir", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -11288,7 +11064,7 @@ dependencies = [ [[package]] name = "pallet-parachain-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11302,7 +11078,7 @@ dependencies = [ [[package]] name = "pallet-parameters" -version = "0.1.0" +version = "0.8.0" dependencies = [ "docify", "frame-benchmarking", @@ -11317,12 +11093,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-preimage" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11334,12 +11109,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-proxy" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11351,12 +11125,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-ranked-collective" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11369,12 +11142,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-recovery" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11385,12 +11157,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-referenda" -version = "28.0.0" +version = "37.0.0" dependencies = [ "assert_matches", "frame-benchmarking", @@ -11407,12 +11178,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-remark" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11423,12 +11193,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-root-offences" -version = "25.0.0" +version = "34.0.0" dependencies = [ "frame-election-provider-support", "frame-support", @@ -11444,12 +11213,12 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-root-testing" -version = "4.0.0" +version = "13.0.0" dependencies = [ "frame-support", "frame-system", @@ -11458,12 +11227,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-safe-mode" -version = "9.0.0" +version = "18.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11478,12 +11246,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-salary" -version = "13.0.0" +version = "22.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11496,31 +11263,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", -] - -[[package]] -name = "pallet-sassafras" -version = "0.3.5-dev" -dependencies = [ - "array-bytes", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-consensus-sassafras", - "sp-core", - "sp-crypto-hashing", - "sp-io", - "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-scheduler" -version = "29.0.0" +version = "38.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11533,14 +11280,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-weights", "substrate-test-utils", ] [[package]] name = "pallet-scored-pool" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -11550,12 +11296,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-session" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -11570,13 +11315,12 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std 14.0.0", "sp-trie", ] [[package]] name = "pallet-session-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -11594,24 +11338,22 @@ dependencies = [ "sp-io", "sp-runtime", "sp-session", - "sp-std 14.0.0", ] [[package]] name = "pallet-skip-feeless-payment" -version = "3.0.0" +version = "12.0.0" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-society" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11627,12 +11369,11 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-staking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -11655,14 +11396,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-utils", ] [[package]] name = "pallet-staking-reward-curve" -version = "11.0.0" +version = "12.0.0" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", @@ -11673,7 +11413,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" -version = "19.0.0" +version = "22.0.0" dependencies = [ "log", "sp-arithmetic", @@ -11681,7 +11421,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" -version = "14.0.0" +version = "22.0.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -11690,7 +11430,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" -version = "29.0.0" +version = "39.0.0" dependencies = [ "frame-benchmarking", "frame-remote-externalities", @@ -11705,8 +11445,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-state-trie-migration-rpc", "thousands", "tokio", @@ -11715,7 +11454,7 @@ dependencies = [ [[package]] name = "pallet-statement" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-support", "frame-system", @@ -11728,12 +11467,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-statement-store", - "sp-std 14.0.0", ] [[package]] name = "pallet-sudo" -version = "28.0.0" +version = "37.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11744,12 +11482,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11763,7 +11500,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "27.0.0" +version = "36.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11776,14 +11513,13 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-tips" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11797,13 +11533,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", ] [[package]] name = "pallet-transaction-payment" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -11815,12 +11550,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-transaction-payment-rpc" -version = "30.0.0" +version = "40.0.0" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -11835,7 +11569,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "28.0.0" +version = "37.0.0" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -11846,7 +11580,7 @@ dependencies = [ [[package]] name = "pallet-transaction-storage" -version = "27.0.0" +version = "36.0.0" dependencies = [ "array-bytes", "frame-benchmarking", @@ -11861,13 +11595,12 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-transaction-storage-proof", ] [[package]] name = "pallet-treasury" -version = "27.0.0" +version = "36.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11882,12 +11615,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-tx-pause" -version = "9.0.0" +version = "18.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11901,12 +11633,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-uniques" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11918,12 +11649,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-utility" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11937,12 +11668,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-vesting" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11954,12 +11684,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-whitelist" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11972,12 +11701,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-xcm" -version = "7.0.0" +version = "16.0.0" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -11994,7 +11722,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -12003,7 +11730,7 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -12018,8 +11745,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -12027,7 +11753,7 @@ dependencies = [ [[package]] name = "pallet-xcm-bridge-hub" -version = "0.2.0" +version = "0.12.0" dependencies = [ "bp-header-chain", "bp-messages", @@ -12044,7 +11770,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -12052,7 +11778,7 @@ dependencies = [ [[package]] name = "pallet-xcm-bridge-hub-router" -version = "0.5.0" +version = "0.14.0" dependencies = [ "bp-xcm-bridge-hub-router", "frame-benchmarking", @@ -12064,14 +11790,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", ] [[package]] name = "parachain-template-node" -version = "0.0.0" +version = "0.1.0" dependencies = [ "clap 4.5.3", "color-print", @@ -12130,7 +11856,7 @@ dependencies = [ [[package]] name = "parachain-template-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -12179,7 +11905,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -12191,7 +11916,7 @@ dependencies = [ [[package]] name = "parachains-common" -version = "7.0.0" +version = "17.0.0" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-utility", @@ -12212,7 +11937,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-executor", @@ -12236,7 +11960,7 @@ dependencies = [ [[package]] name = "parachains-runtimes-test-utils" -version = "7.0.0" +version = "16.0.0" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", @@ -12257,8 +11981,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-parachain-info", "staging-xcm", "staging-xcm-executor", @@ -12470,7 +12193,7 @@ dependencies = [ [[package]] name = "penpal-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "cumulus-primitives-core", "emulated-integration-tests-common", @@ -12483,7 +12206,7 @@ dependencies = [ [[package]] name = "penpal-runtime" -version = "0.14.0" +version = "0.24.0" dependencies = [ "assets-common", "cumulus-pallet-aura-ext", @@ -12531,8 +12254,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -12568,9 +12290,7 @@ dependencies = [ "pallet-message-queue", "parachains-common", "parity-scale-codec", - "people-rococo-runtime", "polkadot-runtime-common", - "rococo-runtime", "rococo-runtime-constants", "rococo-system-emulated-network", "sp-runtime", @@ -12580,7 +12300,7 @@ dependencies = [ [[package]] name = "people-rococo-runtime" -version = "0.1.0" +version = "0.11.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -12631,8 +12351,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -12669,19 +12388,17 @@ dependencies = [ "pallet-message-queue", "parachains-common", "parity-scale-codec", - "people-westend-runtime", "polkadot-runtime-common", "sp-runtime", "staging-xcm", "staging-xcm-executor", - "westend-runtime", "westend-runtime-constants", "westend-system-emulated-network", ] [[package]] name = "people-westend-runtime" -version = "0.1.0" +version = "0.11.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -12731,8 +12448,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -12747,9 +12463,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" @@ -12827,15 +12543,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -12895,7 +12605,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "6.0.0" +version = "16.0.0" dependencies = [ "assert_cmd", "color-eyre", @@ -12916,7 +12626,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -12945,7 +12655,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "always-assert", "assert_matches", @@ -12972,7 +12682,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "derive_more", @@ -12996,14 +12706,14 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-availability-recovery" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13028,7 +12738,7 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keyring", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tokio", "tracing-gum", @@ -13046,7 +12756,7 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "7.0.0" +version = "17.0.0" dependencies = [ "cfg-if", "clap 4.5.3", @@ -13075,7 +12785,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -13106,18 +12816,17 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "7.0.0" +version = "15.0.0" dependencies = [ "parity-scale-codec", "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "polkadot-dispute-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-channel", @@ -13143,14 +12852,14 @@ dependencies = [ "sp-application-crypto", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-erasure-coding" -version = "7.0.0" +version = "15.0.0" dependencies = [ "criterion", "parity-scale-codec", @@ -13165,7 +12874,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13190,13 +12899,13 @@ dependencies = [ "sp-crypto-hashing", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "7.0.0" +version = "17.0.0" dependencies = [ "always-assert", "assert_matches", @@ -13225,7 +12934,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "futures", @@ -13247,7 +12956,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13292,7 +13001,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -13322,7 +13031,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -13343,14 +13052,14 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "7.0.0" +version = "17.0.0" dependencies = [ "futures", "polkadot-node-subsystem", @@ -13366,7 +13075,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13391,7 +13100,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "7.0.0" +version = "17.0.0" dependencies = [ "futures", "maplit", @@ -13411,7 +13120,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "futures", @@ -13432,7 +13141,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "fatality", @@ -13453,14 +13162,14 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-trait", "futures", @@ -13476,7 +13185,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-prospective-parachains" -version = "6.0.0" +version = "16.0.0" dependencies = [ "assert_matches", "bitvec", @@ -13502,7 +13211,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "7.0.0" +version = "17.0.0" dependencies = [ "bitvec", "fatality", @@ -13524,7 +13233,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "7.0.0" +version = "17.0.0" dependencies = [ "always-assert", "array-bytes", @@ -13567,7 +13276,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "7.0.0" +version = "17.0.0" dependencies = [ "futures", "futures-timer", @@ -13590,7 +13299,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-common" -version = "7.0.0" +version = "15.0.0" dependencies = [ "assert_matches", "cpu-time", @@ -13607,9 +13316,9 @@ dependencies = [ "seccompiler", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", - "sp-tracing 16.0.0", + "sp-tracing", "tempfile", "thiserror", "tracing-gum", @@ -13617,7 +13326,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-execute-worker" -version = "7.0.0" +version = "15.0.0" dependencies = [ "cfg-if", "cpu-time", @@ -13632,7 +13341,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-prepare-worker" -version = "7.0.0" +version = "15.0.0" dependencies = [ "blake3", "cfg-if", @@ -13655,7 +13364,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-trait", "futures", @@ -13676,7 +13385,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "7.0.0" +version = "17.0.0" dependencies = [ "lazy_static", "log", @@ -13694,13 +13403,15 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_cmd", "bs58 0.5.0", "futures", "futures-timer", - "hyper 0.14.27", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "log", "parity-scale-codec", "polkadot-primitives", @@ -13720,7 +13431,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-channel", "async-trait", @@ -13746,7 +13457,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "7.0.0" +version = "15.0.0" dependencies = [ "bitvec", "bounded-vec", @@ -13769,7 +13480,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "7.0.0" +version = "17.0.0" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -13799,7 +13510,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-trait", "bitvec", @@ -13828,7 +13539,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13872,7 +13583,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13898,7 +13609,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.14.0" +version = "5.0.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13923,6 +13634,7 @@ dependencies = [ "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "docify", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", @@ -13977,9 +13689,9 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", + "sp-std", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -13995,7 +13707,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-primitives" -version = "6.0.0" +version = "14.0.0" dependencies = [ "bounded-collections", "derive_more", @@ -14005,13 +13717,12 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0", "sp-weights", ] [[package]] name = "polkadot-primitives" -version = "7.0.0" +version = "15.0.0" dependencies = [ "bitvec", "hex-literal", @@ -14032,12 +13743,11 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "polkadot-primitives-test-helpers" -version = "1.0.0" +version = "0.1.0" dependencies = [ "polkadot-primitives", "rand", @@ -14049,7 +13759,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "7.0.0" +version = "17.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -14083,7 +13793,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "7.0.0" +version = "16.0.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -14130,7 +13840,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -14139,19 +13848,18 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "7.0.0" +version = "16.0.0" dependencies = [ "bs58 0.5.0", "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "polkadot-runtime-parachains" -version = "7.0.0" +version = "16.0.0" dependencies = [ "assert_matches", "bitflags 1.3.2", @@ -14200,8 +13908,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-executor", "static_assertions", @@ -14210,7 +13917,7 @@ dependencies = [ [[package]] name = "polkadot-sdk" -version = "0.1.0" +version = "0.5.0" dependencies = [ "asset-test-utils", "assets-common", @@ -14532,12 +14239,12 @@ dependencies = [ "sp-core", "sp-core-hashing", "sp-core-hashing-proc-macro", - "sp-crypto-ec-utils 0.10.0", + "sp-crypto-ec-utils", "sp-crypto-hashing", "sp-crypto-hashing-proc-macro", "sp-database", - "sp-debug-derive 14.0.0", - "sp-externalities 0.25.0", + "sp-debug-derive", + "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -14552,22 +14259,22 @@ dependencies = [ "sp-panic-handler", "sp-rpc", "sp-runtime", - "sp-runtime-interface 24.0.0", - "sp-runtime-interface-proc-macro 17.0.0", + "sp-runtime-interface", + "sp-runtime-interface-proc-macro", "sp-session", "sp-staking", "sp-state-machine", "sp-statement-store", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-std", + "sp-storage", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", "sp-version", "sp-version-proc-macro", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "sp-weights", "staging-chain-spec-builder", "staging-node-inspect", @@ -14597,7 +14304,7 @@ dependencies = [ [[package]] name = "polkadot-sdk-docs" -version = "0.0.1" +version = "0.1.0" dependencies = [ "chain-spec-guide-runtime", "cumulus-client-service", @@ -14612,6 +14319,8 @@ dependencies = [ "frame-system", "kitchensink-runtime", "minimal-template-runtime", + "pallet-asset-conversion-tx-payment", + "pallet-asset-tx-payment", "pallet-assets", "pallet-aura", "pallet-authorship", @@ -14630,6 +14339,7 @@ dependencies = [ "pallet-proxy", "pallet-referenda", "pallet-scheduler", + "pallet-skip-feeless-payment", "pallet-timestamp", "pallet-transaction-payment", "pallet-uniques", @@ -14663,9 +14373,9 @@ dependencies = [ "sp-keyring", "sp-offchain", "sp-runtime", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-runtime-interface", + "sp-std", + "sp-tracing", "sp-version", "staging-chain-spec-builder", "staging-node-cli", @@ -14678,7 +14388,7 @@ dependencies = [ [[package]] name = "polkadot-sdk-frame" -version = "0.1.0" +version = "0.6.0" dependencies = [ "docify", "frame-benchmarking", @@ -14703,15 +14413,14 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", ] [[package]] name = "polkadot-service" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -14822,7 +14531,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-timestamp", "sp-transaction-pool", "sp-version", @@ -14839,7 +14548,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "arrayvec 0.7.4", "assert_matches", @@ -14867,14 +14576,14 @@ dependencies = [ "sp-keyring", "sp-keystore", "sp-staking", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-statement-table" -version = "7.0.0" +version = "15.0.0" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -15063,7 +14772,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", "sp-transaction-pool", "sp-trie", "sp-version", @@ -15129,7 +14837,7 @@ dependencies = [ [[package]] name = "polkadot-voter-bags" -version = "7.0.0" +version = "17.0.0" dependencies = [ "clap 4.5.3", "generate-bags", @@ -15232,7 +14940,7 @@ dependencies = [ "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.12", + "pin-project-lite", "windows-sys 0.48.0", ] @@ -15244,7 +14952,7 @@ checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" dependencies = [ "cfg-if", "concurrent-queue", - "pin-project-lite 0.2.12", + "pin-project-lite", "rustix 0.38.21", "tracing", "windows-sys 0.52.0", @@ -15813,17 +15521,6 @@ dependencies = [ "rand", ] -[[package]] -name = "quicksink" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858" -dependencies = [ - "futures-core", - "futures-sink", - "pin-project-lite 0.1.12", -] - [[package]] name = "quinn" version = "0.9.4" @@ -15831,7 +15528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ "bytes", - "pin-project-lite 0.2.12", + "pin-project-lite", "quinn-proto 0.9.6", "quinn-udp 0.3.2", "rustc-hash", @@ -15850,7 +15547,7 @@ checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "futures-io", - "pin-project-lite 0.2.12", + "pin-project-lite", "quinn-proto 0.10.6", "quinn-udp 0.4.1", "rustc-hash", @@ -16233,13 +15930,10 @@ dependencies = [ "bp-runtime", "finality-relay", "frame-support", - "frame-system", "futures", "jsonrpsee", "log", "num-traits", - "pallet-balances", - "pallet-bridge-messages", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", @@ -16256,7 +15950,7 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-trie", "sp-version", "staging-xcm", @@ -16299,7 +15993,7 @@ dependencies = [ "log", "pallet-bags-list-remote-tests", "sp-core", - "sp-tracing 16.0.0", + "sp-tracing", "tokio", "westend-runtime", "westend-runtime-constants", @@ -16319,15 +16013,15 @@ dependencies = [ "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", - "hyper 0.14.27", - "hyper-rustls 0.24.1", + "hyper 0.14.29", + "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", "mime", "once_cell", "percent-encoding", - "pin-project-lite 0.2.12", + "pin-project-lite", "rustls 0.21.7", "rustls-pemfile 1.0.3", "serde", @@ -16364,22 +16058,6 @@ dependencies = [ "subtle 2.5.0", ] -[[package]] -name = "ring" -version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "blake2 0.10.6", - "common", - "fflonk", - "merlin", -] - [[package]] name = "ring" version = "0.16.20" @@ -16437,7 +16115,7 @@ dependencies = [ [[package]] name = "rococo-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "emulated-integration-tests-common", "parachains-common", @@ -16453,7 +16131,7 @@ dependencies = [ [[package]] name = "rococo-parachain-runtime" -version = "0.6.0" +version = "0.16.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -16492,7 +16170,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -16505,7 +16182,7 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "7.0.0" +version = "17.0.0" dependencies = [ "binary-merkle-tree", "bitvec", @@ -16594,9 +16271,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", + "sp-storage", + "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-version", @@ -16612,7 +16288,7 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -16627,7 +16303,7 @@ dependencies = [ [[package]] name = "rococo-system-emulated-network" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-rococo-emulated-chain", "bridge-hub-rococo-emulated-chain", @@ -16639,7 +16315,7 @@ dependencies = [ [[package]] name = "rococo-westend-system-emulated-network" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-rococo-emulated-chain", "asset-hub-westend-emulated-chain", @@ -17058,17 +16734,17 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "23.0.0" +version = "29.0.0" dependencies = [ "log", "sp-core", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "thiserror", ] [[package]] name = "sc-authority-discovery" -version = "0.34.0" +version = "0.44.0" dependencies = [ "async-trait", "futures", @@ -17092,7 +16768,7 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -17100,7 +16776,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.34.0" +version = "0.44.0" dependencies = [ "futures", "futures-timer", @@ -17125,7 +16801,7 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.33.0" +version = "0.42.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -17141,7 +16817,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "clap 4.5.3", @@ -17167,13 +16843,13 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime", ] [[package]] name = "sc-chain-spec-derive" -version = "11.0.0" +version = "12.0.0" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", @@ -17183,7 +16859,7 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.36.0" +version = "0.46.0" dependencies = [ "array-bytes", "chrono", @@ -17217,7 +16893,7 @@ dependencies = [ "sp-keystore", "sp-panic-handler", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", "tempfile", "thiserror", @@ -17226,7 +16902,7 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "28.0.0" +version = "37.0.0" dependencies = [ "fnv", "futures", @@ -17241,11 +16917,11 @@ dependencies = [ "sp-consensus", "sp-core", "sp-database", - "sp-externalities 0.25.0", + "sp-externalities", "sp-runtime", "sp-state-machine", "sp-statement-store", - "sp-storage 19.0.0", + "sp-storage", "sp-test-primitives", "sp-trie", "substrate-prometheus-endpoint", @@ -17255,7 +16931,7 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.35.0" +version = "0.44.0" dependencies = [ "array-bytes", "criterion", @@ -17280,7 +16956,7 @@ dependencies = [ "sp-database", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "substrate-test-runtime-client", "tempfile", @@ -17288,7 +16964,7 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "futures", @@ -17312,7 +16988,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.34.0" +version = "0.44.0" dependencies = [ "async-trait", "futures", @@ -17340,7 +17016,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "tempfile", @@ -17350,7 +17026,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.34.0" +version = "0.44.0" dependencies = [ "async-trait", "fork-tree", @@ -17383,7 +17059,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -17392,7 +17068,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.34.0" +version = "0.44.0" dependencies = [ "futures", "jsonrpsee", @@ -17420,7 +17096,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" -version = "13.0.0" +version = "23.0.0" dependencies = [ "array-bytes", "async-channel", @@ -17453,7 +17129,7 @@ dependencies = [ "sp-keystore", "sp-mmr-primitives", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "tempfile", @@ -17464,7 +17140,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" -version = "13.0.0" +version = "23.0.0" dependencies = [ "futures", "jsonrpsee", @@ -17486,7 +17162,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.33.0" +version = "0.43.0" dependencies = [ "fork-tree", "parity-scale-codec", @@ -17498,7 +17174,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.19.0" +version = "0.29.0" dependencies = [ "ahash 0.8.11", "array-bytes", @@ -17539,7 +17215,7 @@ dependencies = [ "sp-keyring", "sp-keystore", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -17548,7 +17224,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" -version = "0.19.0" +version = "0.29.0" dependencies = [ "finality-grandpa", "futures", @@ -17572,7 +17248,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" -version = "0.35.0" +version = "0.45.0" dependencies = [ "assert_matches", "async-trait", @@ -17610,7 +17286,7 @@ dependencies = [ [[package]] name = "sc-consensus-pow" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "futures", @@ -17634,7 +17310,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "futures", @@ -17657,7 +17333,7 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.32.0" +version = "0.40.0" dependencies = [ "array-bytes", "assert_matches", @@ -17677,49 +17353,49 @@ dependencies = [ "sp-api", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", "sp-maybe-compressed-blob", "sp-panic-handler", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "sp-version", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "substrate-test-runtime", "tempfile", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber", "wat", ] [[package]] name = "sc-executor-common" -version = "0.29.0" +version = "0.35.0" dependencies = [ "polkavm", "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "thiserror", "wasm-instrument", ] [[package]] name = "sc-executor-polkavm" -version = "0.29.0" +version = "0.32.0" dependencies = [ "log", "polkavm", "sc-executor-common", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", ] [[package]] name = "sc-executor-wasmtime" -version = "0.29.0" +version = "0.35.0" dependencies = [ "anyhow", "cargo_metadata", @@ -17734,8 +17410,8 @@ dependencies = [ "sc-executor-common", "sc-runtime-test", "sp-io", - "sp-runtime-interface 24.0.0", - "sp-wasm-interface 20.0.0", + "sp-runtime-interface", + "sp-wasm-interface", "tempfile", "wasmtime", "wat", @@ -17743,7 +17419,7 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.33.0" +version = "0.43.0" dependencies = [ "ansi_term", "futures", @@ -17759,7 +17435,7 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "25.0.0" +version = "33.0.0" dependencies = [ "array-bytes", "parking_lot 0.12.3", @@ -17773,7 +17449,7 @@ dependencies = [ [[package]] name = "sc-mixnet" -version = "0.4.0" +version = "0.14.0" dependencies = [ "array-bytes", "arrayvec 0.7.4", @@ -17801,7 +17477,7 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.34.0" +version = "0.44.0" dependencies = [ "array-bytes", "assert_matches", @@ -17847,7 +17523,7 @@ dependencies = [ "sp-crypto-hashing", "sp-runtime", "sp-test-primitives", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime", "substrate-test-runtime-client", @@ -17865,7 +17541,7 @@ dependencies = [ [[package]] name = "sc-network-common" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -17883,7 +17559,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.34.0" +version = "0.44.0" dependencies = [ "ahash 0.8.11", "async-trait", @@ -17906,7 +17582,7 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.33.0" +version = "0.43.0" dependencies = [ "array-bytes", "async-channel", @@ -17926,7 +17602,7 @@ dependencies = [ [[package]] name = "sc-network-statement" -version = "0.16.0" +version = "0.26.0" dependencies = [ "array-bytes", "async-channel", @@ -17945,7 +17621,7 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.33.0" +version = "0.43.0" dependencies = [ "array-bytes", "async-channel", @@ -17976,7 +17652,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-test-primitives", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -18009,7 +17685,7 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime", "substrate-test-runtime-client", "tokio", @@ -18017,7 +17693,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.33.0" +version = "0.43.0" dependencies = [ "array-bytes", "futures", @@ -18035,7 +17711,7 @@ dependencies = [ [[package]] name = "sc-network-types" -version = "0.10.0" +version = "0.12.1" dependencies = [ "bs58 0.5.0", "ed25519-dalek", @@ -18052,7 +17728,7 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "29.0.0" +version = "39.0.0" dependencies = [ "array-bytes", "async-trait", @@ -18060,8 +17736,8 @@ dependencies = [ "fnv", "futures", "futures-timer", - "hyper 0.14.27", - "hyper-rustls 0.24.1", + "hyper 0.14.29", + "hyper-rustls 0.24.2", "lazy_static", "log", "num_cpus", @@ -18081,11 +17757,11 @@ dependencies = [ "sp-api", "sp-consensus", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-keystore", "sp-offchain", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime-client", "threadpool", "tokio", @@ -18094,7 +17770,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.17.0" +version = "0.18.0" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -18102,7 +17778,7 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "29.0.0" +version = "39.0.0" dependencies = [ "assert_matches", "env_logger 0.11.3", @@ -18139,12 +17815,12 @@ dependencies = [ "sp-version", "substrate-test-runtime-client", "tokio", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] name = "sc-rpc-api" -version = "0.33.0" +version = "0.43.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -18163,7 +17839,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "11.0.0" +version = "16.0.2" dependencies = [ "forwarded-header-value", "futures", @@ -18184,7 +17860,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" -version = "0.34.0" +version = "0.44.0" dependencies = [ "array-bytes", "assert_matches", @@ -18212,7 +17888,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-maybe-compressed-blob", "sp-rpc", "sp-runtime", @@ -18232,14 +17908,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", + "sp-runtime-interface", "substrate-wasm-builder", ] [[package]] name = "sc-service" -version = "0.35.0" +version = "0.45.0" dependencies = [ "async-trait", "directories", @@ -18281,12 +17956,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -18329,8 +18004,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", + "sp-storage", + "sp-tracing", "sp-trie", "substrate-test-runtime", "substrate-test-runtime-client", @@ -18340,7 +18015,7 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.30.0" +version = "0.36.0" dependencies = [ "log", "parity-scale-codec", @@ -18350,7 +18025,7 @@ dependencies = [ [[package]] name = "sc-statement-store" -version = "10.0.0" +version = "19.0.0" dependencies = [ "env_logger 0.11.3", "log", @@ -18370,7 +18045,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" -version = "0.16.0" +version = "0.22.0" dependencies = [ "clap 4.5.3", "fs4", @@ -18382,7 +18057,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" -version = "0.34.0" +version = "0.44.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -18400,7 +18075,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" -version = "27.0.0" +version = "37.0.0" dependencies = [ "derive_more", "futures", @@ -18416,12 +18091,12 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "sc-telemetry" -version = "15.0.0" +version = "24.0.0" dependencies = [ "chrono", "futures", @@ -18440,7 +18115,7 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "28.0.0" +version = "37.0.0" dependencies = [ "ansi_term", "chrono", @@ -18461,11 +18136,11 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing", - "tracing-log 0.2.0", - "tracing-subscriber 0.3.18", + "tracing-log", + "tracing-subscriber", ] [[package]] @@ -18480,7 +18155,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "assert_matches", @@ -18503,7 +18178,7 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", "substrate-test-runtime", @@ -18514,7 +18189,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" -version = "28.0.0" +version = "37.0.0" dependencies = [ "async-trait", "futures", @@ -18530,7 +18205,7 @@ dependencies = [ [[package]] name = "sc-utils" -version = "14.0.0" +version = "17.0.0" dependencies = [ "async-channel", "futures", @@ -18555,9 +18230,9 @@ dependencies = [ [[package]] name = "scale-decode" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12ebca36cec2a3f983c46295b282b35e5f8496346fb859a8776dad5389e5389" +checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" dependencies = [ "derive_more", "parity-scale-codec", @@ -18797,7 +18472,7 @@ dependencies = [ [[package]] name = "seedling-runtime" -version = "0.7.0" +version = "0.17.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -18823,7 +18498,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -19122,7 +18796,7 @@ dependencies = [ [[package]] name = "shell-runtime" -version = "0.7.0" +version = "0.17.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -19147,7 +18821,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -19248,13 +18921,12 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" -version = "7.0.0" +version = "15.0.0" dependencies = [ "enumn", "parity-scale-codec", "paste", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -19434,7 +19106,7 @@ dependencies = [ [[package]] name = "snowbridge-beacon-primitives" -version = "0.2.0" +version = "0.9.0" dependencies = [ "byte-slice-cast", "frame-support", @@ -19449,14 +19121,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "ssz_rs", "ssz_rs_derive", ] [[package]] name = "snowbridge-core" -version = "0.2.0" +version = "0.9.0" dependencies = [ "ethabi-decode", "frame-support", @@ -19472,14 +19144,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", ] [[package]] name = "snowbridge-ethereum" -version = "0.3.0" +version = "0.9.0" dependencies = [ "ethabi-decode", "ethbloom", @@ -19495,7 +19167,7 @@ dependencies = [ "serde_json", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "wasm-bindgen-test", ] @@ -19516,7 +19188,7 @@ dependencies = [ [[package]] name = "snowbridge-outbound-queue-merkle-tree" -version = "0.3.0" +version = "0.9.0" dependencies = [ "array-bytes", "env_logger 0.11.3", @@ -19531,19 +19203,19 @@ dependencies = [ [[package]] name = "snowbridge-outbound-queue-runtime-api" -version = "0.2.0" +version = "0.9.0" dependencies = [ "frame-support", "parity-scale-codec", "snowbridge-core", "snowbridge-outbound-queue-merkle-tree", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "snowbridge-pallet-ethereum-client" -version = "0.2.0" +version = "0.9.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -19564,24 +19236,24 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "static_assertions", ] [[package]] name = "snowbridge-pallet-ethereum-client-fixtures" -version = "0.9.0" +version = "0.17.0" dependencies = [ "hex-literal", "snowbridge-beacon-primitives", "snowbridge-core", "sp-core", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "snowbridge-pallet-inbound-queue" -version = "0.2.0" +version = "0.9.0" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -19603,25 +19275,25 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "snowbridge-pallet-inbound-queue-fixtures" -version = "0.10.0" +version = "0.17.0" dependencies = [ "hex-literal", "snowbridge-beacon-primitives", "snowbridge-core", "sp-core", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "snowbridge-pallet-outbound-queue" -version = "0.2.0" +version = "0.9.0" dependencies = [ "bridge-hub-common", "ethabi-decode", @@ -19639,12 +19311,12 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "snowbridge-pallet-system" -version = "0.2.0" +version = "0.9.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -19663,14 +19335,14 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "snowbridge-router-primitives" -version = "0.9.0" +version = "0.15.0" dependencies = [ "frame-support", "hex-literal", @@ -19681,21 +19353,21 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "snowbridge-runtime-common" -version = "0.2.0" +version = "0.9.0" dependencies = [ "frame-support", "log", "parity-scale-codec", "snowbridge-core", "sp-arithmetic", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -19703,7 +19375,7 @@ dependencies = [ [[package]] name = "snowbridge-runtime-test-common" -version = "0.2.0" +version = "0.9.0" dependencies = [ "cumulus-pallet-parachain-system", "frame-support", @@ -19733,12 +19405,12 @@ dependencies = [ [[package]] name = "snowbridge-system-runtime-api" -version = "0.2.0" +version = "0.9.0" dependencies = [ "parity-scale-codec", "snowbridge-core", "sp-api", - "sp-std 14.0.0", + "sp-std", "staging-xcm", ] @@ -19795,7 +19467,7 @@ dependencies = [ [[package]] name = "solochain-template-node" -version = "0.0.0" +version = "0.1.0" dependencies = [ "clap 4.5.3", "frame-benchmarking-cli", @@ -19837,7 +19509,7 @@ dependencies = [ [[package]] name = "solochain-template-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "frame-benchmarking", "frame-executive", @@ -19866,8 +19538,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -19875,7 +19546,7 @@ dependencies = [ [[package]] name = "sp-api" -version = "26.0.0" +version = "34.0.0" dependencies = [ "docify", "hash-db", @@ -19884,12 +19555,11 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-metadata-ir", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-state-machine", - "sp-std 14.0.0", "sp-test-primitives", "sp-trie", "sp-version", @@ -19898,7 +19568,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "15.0.0" +version = "20.0.0" dependencies = [ "Inflector", "assert_matches", @@ -19926,7 +19596,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", "static_assertions", "substrate-test-runtime-client", @@ -19935,14 +19605,13 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "30.0.0" +version = "38.0.0" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-io", - "sp-std 14.0.0", ] [[package]] @@ -19958,7 +19627,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "23.0.0" +version = "26.0.0" dependencies = [ "criterion", "docify", @@ -19970,7 +19639,6 @@ dependencies = [ "scale-info", "serde", "sp-crypto-hashing", - "sp-std 14.0.0", "static_assertions", ] @@ -19985,27 +19653,9 @@ dependencies = [ "sp-arithmetic", ] -[[package]] -name = "sp-ark-bls12-381" -version = "0.4.2" -source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" -dependencies = [ - "ark-bls12-381-ext", - "sp-crypto-ec-utils 0.4.1", -] - -[[package]] -name = "sp-ark-ed-on-bls12-381-bandersnatch" -version = "0.4.2" -source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" -dependencies = [ - "ark-ed-on-bls12-381-bandersnatch-ext", - "sp-crypto-ec-utils 0.4.1", -] - [[package]] name = "sp-authority-discovery" -version = "26.0.0" +version = "34.0.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -20016,7 +19666,7 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "26.0.0" +version = "34.0.0" dependencies = [ "sp-api", "sp-inherents", @@ -20025,24 +19675,25 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "28.0.0" +version = "37.0.0" dependencies = [ "futures", - "log", "parity-scale-codec", "parking_lot 0.12.3", "schnellru", "sp-api", "sp-consensus", + "sp-core", "sp-database", "sp-runtime", "sp-state-machine", "thiserror", + "tracing", ] [[package]] name = "sp-consensus" -version = "0.32.0" +version = "0.40.0" dependencies = [ "async-trait", "futures", @@ -20057,7 +19708,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.32.0" +version = "0.40.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -20072,7 +19723,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.32.0" +version = "0.40.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -20089,7 +19740,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" -version = "13.0.0" +version = "22.0.0" dependencies = [ "array-bytes", "lazy_static", @@ -20110,7 +19761,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" -version = "13.0.0" +version = "21.0.0" dependencies = [ "finality-grandpa", "log", @@ -20126,7 +19777,7 @@ dependencies = [ [[package]] name = "sp-consensus-pow" -version = "0.32.0" +version = "0.40.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -20134,23 +19785,9 @@ dependencies = [ "sp-runtime", ] -[[package]] -name = "sp-consensus-sassafras" -version = "0.3.4-dev" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-api", - "sp-application-crypto", - "sp-consensus-slots", - "sp-core", - "sp-runtime", -] - [[package]] name = "sp-consensus-slots" -version = "0.32.0" +version = "0.40.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -20160,10 +19797,9 @@ dependencies = [ [[package]] name = "sp-core" -version = "28.0.0" +version = "34.0.0" dependencies = [ "array-bytes", - "bandersnatch_vrfs", "bitflags 1.3.2", "blake2 0.10.6", "bounded-collections", @@ -20195,11 +19831,11 @@ dependencies = [ "serde", "serde_json", "sp-crypto-hashing", - "sp-debug-derive 14.0.0", - "sp-externalities 0.25.0", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", @@ -20210,7 +19846,7 @@ dependencies = [ [[package]] name = "sp-core-fuzz" -version = "0.0.0" +version = "0.1.0" dependencies = [ "lazy_static", "libfuzzer-sys", @@ -20220,22 +19856,21 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "15.0.0" +version = "16.0.0" dependencies = [ "sp-crypto-hashing", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "15.0.0" +version = "16.0.0" dependencies = [ "sp-crypto-hashing-proc-macro", ] [[package]] name = "sp-crypto-ec-utils" -version = "0.4.1" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" +version = "0.14.0" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -20248,28 +19883,8 @@ dependencies = [ "ark-ed-on-bls12-377-ext", "ark-ed-on-bls12-381-bandersnatch", "ark-ed-on-bls12-381-bandersnatch-ext", - "ark-scale 0.0.11", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", -] - -[[package]] -name = "sp-crypto-ec-utils" -version = "0.10.0" -dependencies = [ - "ark-bls12-377", - "ark-bls12-377-ext", - "ark-bls12-381", - "ark-bls12-381-ext", - "ark-bw6-761", - "ark-bw6-761-ext", - "ark-ec", - "ark-ed-on-bls12-377", - "ark-ed-on-bls12-377-ext", - "ark-ed-on-bls12-381-bandersnatch", - "ark-ed-on-bls12-381-bandersnatch-ext", - "ark-scale 0.0.12", - "sp-runtime-interface 24.0.0", + "ark-scale", + "sp-runtime-interface", ] [[package]] @@ -20303,16 +19918,6 @@ dependencies = [ "parking_lot 0.12.3", ] -[[package]] -name = "sp-debug-derive" -version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 2.0.61", -] - [[package]] name = "sp-debug-derive" version = "14.0.0" @@ -20324,27 +19929,16 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.19.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" +version = "0.29.0" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 8.0.0", - "sp-storage 13.0.0", -] - -[[package]] -name = "sp-externalities" -version = "0.25.0" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-storage 19.0.0", + "sp-storage", ] [[package]] name = "sp-genesis-builder" -version = "0.8.0" +version = "0.15.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -20355,7 +19949,7 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "futures", @@ -20368,7 +19962,7 @@ dependencies = [ [[package]] name = "sp-io" -version = "30.0.0" +version = "38.0.0" dependencies = [ "bytes", "docify", @@ -20381,12 +19975,11 @@ dependencies = [ "secp256k1", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-keystore", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-state-machine", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "tracing", "tracing-core", @@ -20394,7 +19987,7 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "31.0.0" +version = "39.0.0" dependencies = [ "sp-core", "sp-runtime", @@ -20403,14 +19996,14 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.34.0" +version = "0.40.0" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "rand", "rand_chacha", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", ] [[package]] @@ -20423,7 +20016,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" -version = "0.6.0" +version = "0.7.0" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -20432,7 +20025,7 @@ dependencies = [ [[package]] name = "sp-mixnet" -version = "0.4.0" +version = "0.12.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -20442,7 +20035,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" -version = "26.0.0" +version = "34.0.0" dependencies = [ "array-bytes", "log", @@ -20452,14 +20045,14 @@ dependencies = [ "serde", "sp-api", "sp-core", - "sp-debug-derive 14.0.0", + "sp-debug-derive", "sp-runtime", "thiserror", ] [[package]] name = "sp-npos-elections" -version = "26.0.0" +version = "34.0.0" dependencies = [ "parity-scale-codec", "rand", @@ -20473,7 +20066,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-fuzzer" -version = "2.0.0-alpha.5" +version = "2.0.0" dependencies = [ "clap 4.5.3", "honggfuzz", @@ -20484,7 +20077,7 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "26.0.0" +version = "34.0.0" dependencies = [ "sp-api", "sp-core", @@ -20502,7 +20095,7 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "26.0.0" +version = "32.0.0" dependencies = [ "rustc-hash", "serde", @@ -20512,7 +20105,7 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "31.0.1" +version = "39.0.0" dependencies = [ "docify", "either", @@ -20533,34 +20126,17 @@ dependencies = [ "sp-core", "sp-io", "sp-state-machine", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "sp-weights", "substrate-test-runtime-client", + "tracing", "zstd 0.12.4", ] [[package]] name = "sp-runtime-interface" -version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.19.0", - "sp-runtime-interface-proc-macro 11.0.0", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-tracing 10.0.0", - "sp-wasm-interface 14.0.0", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "24.0.0" +version = "28.0.0" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -20569,34 +20145,22 @@ dependencies = [ "primitive-types", "rustversion", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", - "sp-runtime-interface-proc-macro 17.0.0", + "sp-runtime-interface-proc-macro", "sp-runtime-interface-test-wasm", "sp-state-machine", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", "trybuild", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "Inflector", - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 2.0.61", -] - -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "17.0.0" +version = "18.0.0" dependencies = [ "Inflector", "expander", @@ -20614,7 +20178,7 @@ dependencies = [ "sc-executor-common", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-runtime-interface-test-wasm", "sp-runtime-interface-test-wasm-deprecated", "sp-state-machine", @@ -20629,8 +20193,7 @@ dependencies = [ "bytes", "sp-core", "sp-io", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", + "sp-runtime-interface", "substrate-wasm-builder", ] @@ -20640,13 +20203,13 @@ version = "2.0.0" dependencies = [ "sp-core", "sp-io", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "substrate-wasm-builder", ] [[package]] name = "sp-session" -version = "27.0.0" +version = "35.0.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -20659,7 +20222,7 @@ dependencies = [ [[package]] name = "sp-staking" -version = "26.0.0" +version = "34.0.0" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -20671,7 +20234,7 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.35.0" +version = "0.43.0" dependencies = [ "arbitrary", "array-bytes", @@ -20684,7 +20247,7 @@ dependencies = [ "rand", "smallvec", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-panic-handler", "sp-runtime", "sp-trie", @@ -20695,7 +20258,7 @@ dependencies = [ [[package]] name = "sp-statement-store" -version = "10.0.0" +version = "18.0.0" dependencies = [ "aes-gcm", "curve25519-dalek", @@ -20709,44 +20272,26 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "thiserror", "x25519-dalek", ] -[[package]] -name = "sp-std" -version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" - [[package]] name = "sp-std" version = "14.0.0" [[package]] name = "sp-storage" -version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" +version = "21.0.0" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 8.0.0", - "sp-std 8.0.0", -] - -[[package]] -name = "sp-storage" -version = "19.0.0" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 14.0.0", + "sp-debug-derive", ] [[package]] @@ -20763,7 +20308,7 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -20774,29 +20319,17 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "parity-scale-codec", - "sp-std 8.0.0", - "tracing", - "tracing-core", - "tracing-subscriber 0.2.25", -] - -[[package]] -name = "sp-tracing" -version = "16.0.0" +version = "17.0.0" dependencies = [ "parity-scale-codec", "tracing", "tracing-core", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] name = "sp-transaction-pool" -version = "26.0.0" +version = "34.0.0" dependencies = [ "sp-api", "sp-runtime", @@ -20804,7 +20337,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -20817,7 +20350,7 @@ dependencies = [ [[package]] name = "sp-trie" -version = "29.0.0" +version = "37.0.0" dependencies = [ "ahash 0.8.11", "array-bytes", @@ -20832,7 +20365,7 @@ dependencies = [ "scale-info", "schnellru", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-runtime", "thiserror", "tracing", @@ -20844,7 +20377,7 @@ dependencies = [ [[package]] name = "sp-version" -version = "29.0.0" +version = "37.0.0" dependencies = [ "impl-serde", "parity-scale-codec", @@ -20853,14 +20386,14 @@ dependencies = [ "serde", "sp-crypto-hashing-proc-macro", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "13.0.0" +version = "14.0.0" dependencies = [ "parity-scale-codec", "proc-macro2 1.0.82", @@ -20871,20 +20404,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 8.0.0", - "wasmtime", -] - -[[package]] -name = "sp-wasm-interface" -version = "20.0.0" +version = "21.0.0" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -20895,7 +20415,7 @@ dependencies = [ [[package]] name = "sp-weights" -version = "27.0.0" +version = "31.0.0" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -20904,7 +20424,7 @@ dependencies = [ "serde", "smallvec", "sp-arithmetic", - "sp-debug-derive 14.0.0", + "sp-debug-derive", ] [[package]] @@ -20986,18 +20506,18 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-chain-spec-builder" -version = "1.6.1" +version = "5.0.0" dependencies = [ "clap 4.5.3", "log", "sc-chain-spec", "serde_json", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "staging-node-cli" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "array-bytes", "assert_cmd", @@ -21033,7 +20553,7 @@ dependencies = [ [[package]] name = "staging-node-inspect" -version = "0.12.0" +version = "0.22.0" dependencies = [ "clap 4.5.3", "parity-scale-codec", @@ -21050,7 +20570,7 @@ dependencies = [ [[package]] name = "staging-parachain-info" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -21058,7 +20578,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -21067,7 +20586,7 @@ version = "2.0.0" [[package]] name = "staging-xcm" -version = "7.0.0" +version = "14.1.0" dependencies = [ "array-bytes", "bounded-collections", @@ -21088,7 +20607,7 @@ dependencies = [ [[package]] name = "staging-xcm-builder" -version = "7.0.0" +version = "16.0.0" dependencies = [ "assert_matches", "frame-support", @@ -21110,7 +20629,6 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-weights", "staging-xcm", "staging-xcm-executor", @@ -21118,22 +20636,21 @@ dependencies = [ [[package]] name = "staging-xcm-executor" -version = "7.0.0" +version = "16.0.0" dependencies = [ "environmental", "frame-benchmarking", "frame-support", "impl-trait-for-tuples", - "log", "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-weights", "staging-xcm", + "tracing", ] [[package]] @@ -21308,7 +20825,7 @@ dependencies = [ [[package]] name = "subkey" -version = "9.0.0" +version = "19.0.0" dependencies = [ "clap 4.5.3", "sc-cli", @@ -21316,7 +20833,7 @@ dependencies = [ [[package]] name = "substrate-bip39" -version = "0.4.7" +version = "0.6.0" dependencies = [ "bip39", "hmac 0.12.1", @@ -21350,7 +20867,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-support" -version = "29.0.0" +version = "39.0.0" dependencies = [ "frame-support", "frame-system", @@ -21361,13 +20878,13 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-storage 19.0.0", + "sp-storage", "tokio", ] [[package]] name = "substrate-frame-rpc-system" -version = "28.0.0" +version = "38.0.0" dependencies = [ "assert_matches", "docify", @@ -21384,7 +20901,7 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime-client", "tokio", ] @@ -21393,7 +20910,9 @@ dependencies = [ name = "substrate-prometheus-endpoint" version = "0.17.0" dependencies = [ - "hyper 0.14.27", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "log", "prometheus", "thiserror", @@ -21413,9 +20932,7 @@ dependencies = [ "bp-polkadot-core", "bp-relayers", "bp-runtime", - "bridge-runtime-common", "equivocation-detector", - "finality-grandpa", "finality-relay", "frame-support", "frame-system", @@ -21435,9 +20952,11 @@ dependencies = [ "rbtag", "relay-substrate-client", "relay-utils", + "scale-info", "sp-consensus-grandpa", "sp-core", "sp-runtime", + "sp-trie", "structopt", "strum 0.26.2", "thiserror", @@ -21445,7 +20964,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "jsonrpsee", @@ -21459,7 +20978,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" -version = "27.0.0" +version = "37.0.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -21511,7 +21030,6 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures", - "hex-literal", "log", "pallet-babe", "pallet-balances", @@ -21534,7 +21052,7 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -21543,12 +21061,13 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-version", "substrate-test-runtime-client", "substrate-wasm-builder", + "tracing", "trie-db", ] @@ -21586,7 +21105,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" -version = "4.0.0-dev" +version = "3.0.0" dependencies = [ "futures", "sc-service", @@ -21596,7 +21115,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "17.0.0" +version = "24.0.0" dependencies = [ "array-bytes", "build-helper", @@ -21612,7 +21131,7 @@ dependencies = [ "sp-core", "sp-io", "sp-maybe-compressed-blob", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", "strum 0.26.2", "tempfile", @@ -21903,7 +21422,7 @@ checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" dependencies = [ "env_logger 0.11.3", "test-log-macros", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] @@ -21919,13 +21438,12 @@ dependencies = [ [[package]] name = "test-parachain-adder" -version = "1.0.0" +version = "0.1.0" dependencies = [ "dlmalloc", "parity-scale-codec", "polkadot-parachain-primitives", "sp-io", - "sp-std 14.0.0", "substrate-wasm-builder", "tiny-keccak", ] @@ -21958,7 +21476,7 @@ dependencies = [ [[package]] name = "test-parachain-halt" -version = "1.0.0" +version = "0.1.0" dependencies = [ "rustversion", "substrate-wasm-builder", @@ -21973,7 +21491,6 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "sp-io", - "sp-std 14.0.0", "substrate-wasm-builder", "tiny-keccak", ] @@ -22027,7 +21544,7 @@ dependencies = [ [[package]] name = "testnet-parachains-constants" -version = "1.0.0" +version = "9.0.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -22239,7 +21756,7 @@ dependencies = [ "mio", "num_cpus", "parking_lot 0.12.3", - "pin-project-lite 0.2.12", + "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", @@ -22296,7 +21813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.12", + "pin-project-lite", "tokio", "tokio-util", ] @@ -22339,7 +21856,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.12", + "pin-project-lite", "tokio", ] @@ -22406,7 +21923,7 @@ dependencies = [ "futures-core", "futures-util", "pin-project", - "pin-project-lite 0.2.12", + "pin-project-lite", "tokio", "tower-layer", "tower-service", @@ -22424,7 +21941,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "pin-project-lite 0.2.12", + "pin-project-lite", "tower-layer", "tower-service", ] @@ -22448,7 +21965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", - "pin-project-lite 0.2.12", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -22486,7 +22003,7 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "7.0.0" +version = "15.0.0" dependencies = [ "coarsetime", "polkadot-primitives", @@ -22506,17 +22023,6 @@ dependencies = [ "syn 2.0.61", ] -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -22528,38 +22034,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log 0.1.3", - "tracing-serde", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" @@ -22567,7 +22041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "chrono", - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", "parking_lot 0.12.3", @@ -22577,7 +22051,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] @@ -22892,12 +22366,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] @@ -23557,7 +23031,7 @@ dependencies = [ [[package]] name = "westend-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "emulated-integration-tests-common", "pallet-staking", @@ -23577,7 +23051,7 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "7.0.0" +version = "17.0.0" dependencies = [ "binary-merkle-tree", "bitvec", @@ -23672,9 +23146,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", + "sp-storage", + "sp-tracing", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -23689,7 +23162,7 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -23704,7 +23177,7 @@ dependencies = [ [[package]] name = "westend-system-emulated-network" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-westend-emulated-chain", "bridge-hub-westend-emulated-chain", @@ -24133,7 +23606,7 @@ dependencies = [ "simple-mermaid 0.1.0", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -24143,7 +23616,7 @@ dependencies = [ [[package]] name = "xcm-emulator" -version = "0.5.0" +version = "0.15.0" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", @@ -24168,8 +23641,8 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "staging-xcm", "staging-xcm-executor", ] @@ -24193,14 +23666,14 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "xcm-procedural" -version = "7.0.0" +version = "10.1.0" dependencies = [ "Inflector", "proc-macro2 1.0.82", @@ -24212,7 +23685,7 @@ dependencies = [ [[package]] name = "xcm-runtime-apis" -version = "0.1.0" +version = "0.3.0" dependencies = [ "env_logger 0.11.3", "frame-executive", @@ -24227,7 +23700,6 @@ dependencies = [ "scale-info", "sp-api", "sp-io", - "sp-std 14.0.0", "sp-weights", "staging-xcm", "staging-xcm-builder", @@ -24236,7 +23708,7 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "frame-system", @@ -24249,7 +23721,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -24257,7 +23729,7 @@ dependencies = [ [[package]] name = "xcm-simulator-example" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "frame-system", @@ -24274,8 +23746,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -24303,7 +23775,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 2b84f8039147..06af87112a36 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.14.0"; + version = "stable2407"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; - rev = "polkadot-v${version}"; - hash = "sha256-IKKhGjWHyHUrDVGJo1d1JXzagkydgdfd/u6jk76qxHU="; + rev = "polkadot-${version}"; + hash = "sha256-g+jReHOAkaWjr1yJILFL4mSYGEfRBlSCrUHp8ro22SA="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -47,12 +47,7 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc="; - "common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o="; - "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo="; "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w="; - "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8="; - "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI="; }; }; From 4929645269e44a62651ca9470a6b45f0e990ad23 Mon Sep 17 00:00:00 2001 From: Sergey Yakovlev Date: Tue, 30 Jul 2024 15:34:25 +0300 Subject: [PATCH 121/481] k3d: 5.6.0 -> 5.7.2 --- pkgs/applications/networking/cluster/k3d/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3d/default.nix b/pkgs/applications/networking/cluster/k3d/default.nix index 2731e237d45f..933a3342004a 100644 --- a/pkgs/applications/networking/cluster/k3d/default.nix +++ b/pkgs/applications/networking/cluster/k3d/default.nix @@ -15,16 +15,17 @@ let in buildGoModule rec { pname = "k3d"; - version = "5.6.0"; + version = "5.7.2"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; rev = "refs/tags/v${version}"; - hash = "sha256-KIYwuDPkxhtQy989XW+DcI5NJPhfLP07mYUFc180Sdw="; + hash = "sha256-dZ3G5zucGeFl1ooNJ7mUpgtv99ZZgOk5deHNUtP7vt0="; }; - vendorHash = null; + vendorHash = "sha256-lFmIRtkUiohva2Vtg4AqHaB5McVOWW5+SFShkNqYVZ8="; + deleteVendor = true; nativeBuildInputs = [ installShellFiles ]; From 66f63313539b5955d9286da21b37e79f6b1ecc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Jul 2024 07:56:00 -0700 Subject: [PATCH 122/481] python312Packages.backports-strenum: 1.2.8 -> 1.3.1 Diff: https://github.com/clbarnes/backports.strenum/compare/refs/tags/v1.2.8...v1.3.1 --- .../python-modules/backports-strenum/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix index 71312dd1677e..8c2df112478c 100644 --- a/pkgs/development/python-modules/backports-strenum/default.nix +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -4,24 +4,25 @@ fetchFromGitHub, poetry-core, pytestCheckHook, + pythonAtLeast, pythonOlder, }: buildPythonPackage rec { pname = "backports-strenum"; - version = "1.2.8"; + version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "clbarnes"; repo = "backports.strenum"; rev = "refs/tags/v${version}"; - hash = "sha256-jbMR9VAGsMAJTP2VQyRr+RPYwWwk8hGAYs4KoZEWa7U="; + hash = "sha256-j5tALFrLeZ8k+GwAaq0ocmcQWvdWkRUHbOVq5Du4mu0="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; From 793e6d9a1812c60b71d6ba38502bbd5a1ed747c0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 30 Jul 2024 17:21:46 +0200 Subject: [PATCH 123/481] box86: Fix updateScript Need gitUpdater from buildPackages, otherwise it tries to cross-compile some things that are broken on cross (pycparser, Nix) --- pkgs/applications/emulators/box86/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/box86/default.nix b/pkgs/applications/emulators/box86/default.nix index 961188b2df8d..d5db0f3d4966 100644 --- a/pkgs/applications/emulators/box86/default.nix +++ b/pkgs/applications/emulators/box86/default.nix @@ -1,8 +1,8 @@ { + buildPackages, lib, stdenv, fetchFromGitHub, - gitUpdater, cmake, python3, withDynarec ? stdenv.hostPlatform.isAarch32, @@ -71,7 +71,8 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + # gitUpdater for local system, otherwise we're cross-compiling gitUpdater + updateScript = buildPackages.gitUpdater { rev-prefix = "v"; }; tests.hello = runCommand "box86-test-hello" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to From fdfaaae011a36b46bf192476805fc3e6464c5940 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 27 Jul 2024 11:49:07 +0100 Subject: [PATCH 124/481] libdwarf-lite: init at 0.10.1 Co-authored-by: Cosima Neidahl --- pkgs/by-name/li/libdwarf-lite/package.nix | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/li/libdwarf-lite/package.nix diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix new file mode 100644 index 000000000000..25ea4593de2f --- /dev/null +++ b/pkgs/by-name/li/libdwarf-lite/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libdwarf-lite"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "jeremy-rifkin"; + repo = "libdwarf-lite"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ouhYapiqBFPJwoUIyiuEtsezF2wR63WZL7VwvnDExoU="; + }; + + outputs = [ + "dev" + "lib" + "out" + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_DWARFDUMP" false) + (lib.cmakeBool "PIC_ALWAYS" true) + ]; + + meta = { + description = "Minimal libdwarf mirror for faster cloning and configuration"; + homepage = "https://github.com/jeremy-rifkin/libdwarf-lite"; + license = lib.licenses.lgpl21Only; + maintainers = [ ]; + mainProgram = "libdwarf-lite"; + platforms = lib.platforms.all; + }; +}) From 03f1c7eefa59ad90a77e9e08aaec21e53b252d1c Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 27 Jul 2024 11:49:33 +0100 Subject: [PATCH 125/481] naja: init at 0-unstable-2024-07-21 Co-authored-by: Cosima Neidahl --- pkgs/by-name/na/naja/package.nix | 69 ++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 pkgs/by-name/na/naja/package.nix diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix new file mode 100644 index 000000000000..1f724e3c63d6 --- /dev/null +++ b/pkgs/by-name/na/naja/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + bison, + boost, + capnproto, + doxygen, + flex, + libdwarf-lite, + pkg-config, + python3, + tbb_2021_11, +}: +stdenv.mkDerivation { + pname = "naja"; + version = "0-unstable-2024-07-21"; + + src = fetchFromGitHub { + owner = "najaeda"; + repo = "naja"; + rev = "8c068f3bd1bbd57b851547f191a58a375fd35cda"; + hash = "sha256-aUYPJGr4D5n92fp0namPT6I/gMRZoF7YHnB7GoRzwYI="; + fetchSubmodules = true; + }; + + outputs = [ + "dev" + "lib" + "out" + ]; + + strictDeps = true; + + nativeBuildInputs = [ + bison + capnproto + cmake + doxygen + flex + pkg-config + python3 + ]; + + buildInputs = [ + boost + capnproto # cmake modules + flex # include dir + libdwarf-lite + tbb_2021_11 + ]; + + cmakeFlags = [ + (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) + (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true) + ]; + + doCheck = true; + + meta = { + description = "Structural Netlist API (and more) for EDA post synthesis flow development"; + homepage = "https://github.com/najaeda/naja"; + license = lib.licenses.asl20; + maintainers = [ ]; + mainProgram = "naja_edit"; + platforms = lib.platforms.all; + }; +} From b11f469249bbb656a5c9570943c0ef19f901a807 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 21:22:22 -0700 Subject: [PATCH 126/481] llvmPackages.clang: set CLANG_DEFAULT_CXX_STDLIB for pkgsLLVM --- pkgs/development/compilers/llvm/common/clang/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 922eb8657cee..dde531adf44e 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -69,7 +69,7 @@ let # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]); + ]) ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "-DCLANG_DEFAULT_CXX_STDLIB=ON"; postPatch = '' # Make sure clang passes the correct location of libLTO to ld64 From a534cc07ffd2c369258f05b40341fcf98dccb765 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 04:06:57 +0000 Subject: [PATCH 127/481] waffle: 1.8.0 -> 1.8.1 --- pkgs/development/libraries/waffle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 9f8d4e914b71..361c1e17336a 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "waffle"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "waffle"; rev = "v${version}"; - sha256 = "sha256-GVULv/TkCS9CgSFWlskIamw5Z402n684G6jeTLMCPNc="; + sha256 = "sha256-Y7GRYLqSO572qA1eZ3jS8QlZ1X9xKpDtScaySTuPK/U="; }; buildInputs = [ From 06d0e0e8a22a107b5aa1946c287d271a0043e964 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 04:27:46 +0000 Subject: [PATCH 128/481] gapless: 3.8 -> 3.8.1 --- pkgs/by-name/ga/gapless/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gapless/package.nix b/pkgs/by-name/ga/gapless/package.nix index 9852ab96a125..feacd598c9b0 100644 --- a/pkgs/by-name/ga/gapless/package.nix +++ b/pkgs/by-name/ga/gapless/package.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gapless"; - version = "3.8"; + version = "3.8.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-AZoMAbQ3foW2jx+mBam925a8ykMtGvaiVg9N8/Ggny0="; + hash = "sha256-pABiz7AIfkuB2Z0ErZoHfIrgdllO83ucbUFNjZ9wc+o="; }; nativeBuildInputs = [ From 084f5223b9b8a8d42701f71422a71077c8b818e8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 27 Jul 2024 20:33:11 +0300 Subject: [PATCH 129/481] volk: 2.5.0 -> 3.0.0 (for aarch64-darwin only); move to pkgs/by-name --- .../vo/volk/package.nix} | 0 pkgs/development/libraries/volk/2.5.0.nix | 60 ------------------- pkgs/top-level/all-packages.nix | 6 -- 3 files changed, 66 deletions(-) rename pkgs/{development/libraries/volk/default.nix => by-name/vo/volk/package.nix} (100%) delete mode 100644 pkgs/development/libraries/volk/2.5.0.nix diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/by-name/vo/volk/package.nix similarity index 100% rename from pkgs/development/libraries/volk/default.nix rename to pkgs/by-name/vo/volk/package.nix diff --git a/pkgs/development/libraries/volk/2.5.0.nix b/pkgs/development/libraries/volk/2.5.0.nix deleted file mode 100644 index 3e15993efc39..000000000000 --- a/pkgs/development/libraries/volk/2.5.0.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, python3 -, enableModTool ? true -, removeReferencesTo -, fetchpatch -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "volk"; - # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: - # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "gnuradio"; - repo = "volk"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; - fetchSubmodules = true; - }; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; - sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; - extraPrefix = ""; - }) - ]; - - cmakeFlags = lib.optionals (!enableModTool) [ - "-DENABLE_MODTOOL=OFF" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 - # volk_32f_log2_32f: fail on arch neon - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" - ]; - - postInstall = lib.optionalString (!stdenv.isDarwin) '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) - ''; - - nativeBuildInputs = [ - cmake - python3 - python3.pkgs.mako - ]; - - doCheck = true; - - meta = with lib; { - homepage = "http://libvolk.org/"; - description = "Vector Optimized Library of Kernels"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ doronbehar ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed2192dd8e0f..1f6bc181d316 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7511,12 +7511,6 @@ with pkgs; volctl = callPackage ../tools/audio/volctl { }; - volk = if (stdenv.isDarwin && stdenv.isAarch64) then - (callPackage ../development/libraries/volk/2.5.0.nix { }) - else - (callPackage ../development/libraries/volk { }) - ; - vorta = qt6Packages.callPackage ../applications/backup/vorta { }; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; From 9964f0d02d58d8f3bb95988cabe902faa0a45fd3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 27 Jul 2024 20:35:27 +0300 Subject: [PATCH 130/481] volk: 3.0.0 -> 3.1.2; cleanup Diff: https://github.com/gnuradio/volk/compare/v3.0.0...v3.1.2 --- pkgs/by-name/vo/volk/package.nix | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/vo/volk/package.nix b/pkgs/by-name/vo/volk/package.nix index caf3c848a1ed..488b4e286419 100644 --- a/pkgs/by-name/vo/volk/package.nix +++ b/pkgs/by-name/vo/volk/package.nix @@ -5,41 +5,31 @@ , cmake , python3 , enableModTool ? true -, removeReferencesTo }: stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "3.0.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "gnuradio"; repo = "volk"; rev = "v${finalAttrs.version}"; - hash = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; + hash = "sha256-R1FT5sbl0fAAl6YIX5aD5CiQ/AjZkCSDPPQPiuy4WBY="; fetchSubmodules = true; }; patches = [ - # Remove a failing test + # https://github.com/gnuradio/volk/pull/766 (fetchpatch { - url = "https://github.com/gnuradio/volk/commit/fe2e4a73480bf2ac2e566052ea682817dddaf61f.patch"; - hash = "sha256-Vko/Plk7u6UAr32lieU+T9G34Dkg9EW3Noi/NArpRL4="; + url = "https://github.com/gnuradio/volk/commit/e46771a739658b5483c25ee1203587bf07468c4d.patch"; + hash = "sha256-33V6lA4Ch50o2E7HPUMQ2NPqHXx/i6FUbz3vIaQa9Wc="; }) ]; - cmakeFlags = lib.optionals (!enableModTool) [ - "-DENABLE_MODTOOL=OFF" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "-DVOLK_CPU_FEATURES=OFF" - # offset 17912 in1: -0.0366274 in2: -0.0366173 tolerance was: 1e-05 - # volk_32f_log2_32f: fail on arch neon - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" + cmakeFlags = [ + (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) - ''; - nativeBuildInputs = [ cmake python3 From 61a18c5508bbe1802d3b8c64b2ad8ac2730d6b29 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 27 Jul 2024 21:09:30 +0300 Subject: [PATCH 131/481] volk: nixfmt (rfc 166) --- pkgs/by-name/vo/volk/package.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/vo/volk/package.nix b/pkgs/by-name/vo/volk/package.nix index 488b4e286419..ecba4223280e 100644 --- a/pkgs/by-name/vo/volk/package.nix +++ b/pkgs/by-name/vo/volk/package.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, python3 -, enableModTool ? true +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + python3, + enableModTool ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -26,9 +27,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - cmakeFlags = [ - (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) - ]; + cmakeFlags = [ (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) ]; nativeBuildInputs = [ cmake From d15b7226b3b1df0e6661bfeffbfa28ab5fcd6514 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 28 Jul 2024 10:28:51 +0300 Subject: [PATCH 132/481] gnuradio3_9: try to fix build by disabling doxygen Encounteres an error gnuradio3_8 also experiences when volkExternal == volk (3.1.2). --- pkgs/applications/radio/gnuradio/3.9.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 80be5b79c8aa..faa4d2e25f6b 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -11,7 +11,6 @@ , boost , log4cpp , mpir -, doxygen , python , codec2 , gsm @@ -70,10 +69,6 @@ let six ]; }; - doxygen = { - native = [ doxygen ]; - cmakeEnableFlag = "DOXYGEN"; - }; man-pages = { cmakeEnableFlag = "MANPAGES"; }; From 47fa6173fcd246d4dc2687943d88593b717d36dc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 28 Jul 2024 10:31:02 +0300 Subject: [PATCH 133/481] gnuradio3_9{,Minimal}: remove --- pkgs/applications/radio/gnuradio/3.9.nix | 306 ------------------ .../modtool-newmod-permissions.3_9.patch | 15 - pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 33 -- 4 files changed, 3 insertions(+), 354 deletions(-) delete mode 100644 pkgs/applications/radio/gnuradio/3.9.nix delete mode 100644 pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix deleted file mode 100644 index faa4d2e25f6b..000000000000 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ /dev/null @@ -1,306 +0,0 @@ -{ lib, stdenv -, fetchpatch -, fetchFromGitHub -, cmake -# Remove gcc and python references -, removeReferencesTo -, pkg-config -, volk -, cppunit -, orc -, boost -, log4cpp -, mpir -, python -, codec2 -, gsm -, fftwFloat -, alsa-lib -, libjack2 -, CoreAudio -, uhd -, SDL -, gsl -, soapysdr -, libsodium -, libsndfile -, libunwind -, thrift -, cppzmq -# Needed only if qt-gui is disabled, from some reason -, icu -# GUI related -, gtk3 -, pango -, gobject-introspection -, cairo -, qt5 -, libsForQt5 -# Features available to override, the list of them is in featuresInfo. They -# are all turned on by default. -, features ? {} -# If one wishes to use a different src or name for a very custom build -, overrideSrc ? {} -, pname ? "gnuradio" -, version ? "3.9.8.0" -}: - -let - sourceSha256 = "sha256-0umGUOjD5l84CBBeDy1uFgUyEDpI9o9/SEQ8BZm22j4="; - featuresInfo = { - # Needed always - basic = { - native = [ - cmake - pkg-config - orc - ]; - runtime = [ - volk - boost - log4cpp - mpir - ] - # when gr-qtgui is disabled, icu needs to be included, otherwise - # building with boost 1.7x fails - ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; - pythonNative = with python.pkgs; [ - mako - six - ]; - }; - man-pages = { - cmakeEnableFlag = "MANPAGES"; - }; - python-support = { - pythonRuntime = [ python.pkgs.six ]; - native = [ - python - ]; - cmakeEnableFlag = "PYTHON"; - }; - testing-support = { - native = [ cppunit ]; - cmakeEnableFlag = "TESTING"; - }; - post-install = { - cmakeEnableFlag = "POSTINSTALL"; - }; - gnuradio-runtime = { - cmakeEnableFlag = "GNURADIO_RUNTIME"; - pythonRuntime = [ - python.pkgs.pybind11 - ]; - }; - gr-ctrlport = { - runtime = [ - libunwind - thrift - ]; - pythonRuntime = [ - python.pkgs.thrift - # For gr-perf-monitorx - python.pkgs.matplotlib - python.pkgs.networkx - ]; - cmakeEnableFlag = "GR_CTRLPORT"; - }; - gnuradio-companion = { - pythonRuntime = with python.pkgs; [ - pyyaml - mako - numpy - pygobject3 - ]; - native = [ - python.pkgs.pytest - ]; - runtime = [ - gtk3 - pango - gobject-introspection - cairo - libsndfile - ]; - cmakeEnableFlag = "GRC"; - }; - jsonyaml_blocks = { - pythonRuntime = [ - python.pkgs.jsonschema - ]; - cmakeEnableFlag = "JSONYAML_BLOCKS"; - }; - gr-blocks = { - cmakeEnableFlag = "GR_BLOCKS"; - runtime = [ - libsndfile - ]; - }; - gr-fec = { - cmakeEnableFlag = "GR_FEC"; - }; - gr-fft = { - runtime = [ fftwFloat ]; - cmakeEnableFlag = "GR_FFT"; - }; - gr-filter = { - runtime = [ fftwFloat ]; - cmakeEnableFlag = "GR_FILTER"; - pythonRuntime = with python.pkgs; [ - scipy - pyqtgraph - pyqt5 - ]; - }; - gr-analog = { - cmakeEnableFlag = "GR_ANALOG"; - }; - gr-digital = { - cmakeEnableFlag = "GR_DIGITAL"; - }; - gr-dtv = { - cmakeEnableFlag = "GR_DTV"; - }; - gr-audio = { - runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] - ; - cmakeEnableFlag = "GR_AUDIO"; - }; - gr-channels = { - cmakeEnableFlag = "GR_CHANNELS"; - }; - gr-qtgui = { - runtime = [ qt5.qtbase libsForQt5.qwt ]; - pythonRuntime = [ python.pkgs.pyqt5 ]; - cmakeEnableFlag = "GR_QTGUI"; - }; - gr-trellis = { - cmakeEnableFlag = "GR_TRELLIS"; - }; - gr-uhd = { - runtime = [ - uhd - ]; - cmakeEnableFlag = "GR_UHD"; - }; - gr-uhd-rfnoc = { - runtime = [ - uhd - ]; - cmakeEnableFlag = "UHD_RFNOC"; - }; - gr-utils = { - cmakeEnableFlag = "GR_UTILS"; - pythonRuntime = with python.pkgs; [ - # For gr_plot - matplotlib - ]; - }; - gr-modtool = { - pythonRuntime = with python.pkgs; [ - setuptools - click - click-plugins - ]; - cmakeEnableFlag = "GR_MODTOOL"; - }; - gr-blocktool = { - cmakeEnableFlag = "GR_BLOCKTOOL"; - }; - gr-video-sdl = { - runtime = [ SDL ]; - cmakeEnableFlag = "GR_VIDEO_SDL"; - }; - gr-vocoder = { - runtime = [ codec2 gsm ]; - cmakeEnableFlag = "GR_VOCODER"; - }; - gr-wavelet = { - cmakeEnableFlag = "GR_WAVELET"; - runtime = [ gsl libsodium ]; - }; - gr-zeromq = { - runtime = [ cppzmq ]; - cmakeEnableFlag = "GR_ZEROMQ"; - pythonRuntime = [ - # Will compile without this, but it is required by tests, and by some - # gr blocks. - python.pkgs.pyzmq - ]; - }; - gr-network = { - cmakeEnableFlag = "GR_NETWORK"; - }; - gr-soapy = { - cmakeEnableFlag = "GR_SOAPY"; - runtime = [ - soapysdr - ]; - }; - }; - shared = (import ./shared.nix { - inherit - stdenv - lib - python - removeReferencesTo - featuresInfo - features - version - sourceSha256 - overrideSrc - fetchFromGitHub - ; - qt = qt5; - gtk = gtk3; - }); - inherit (shared.passthru) hasFeature; # function -in - -stdenv.mkDerivation (finalAttrs: (shared // { - inherit pname version; - # Will still evaluate correctly if not used here. It only helps nix-update - # find the right file in which version is defined. - inherit (shared) src; - # Remove failing tests - preConfigure = (shared.preConfigure or "") + '' - # https://github.com/gnuradio/gnuradio/issues/3801 - rm gr-blocks/python/blocks/qa_cpp_py_binding.py - rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py - rm gr-blocks/python/blocks/qa_ctrlport_probes.py - ''; - patches = [ - # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 - ./modtool-newmod-permissions.3_9.patch - # Fix compilation with GCC 13 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/fe1b3592776c26e349e9985d47d3178568dfe6ec.patch"; - hash = "sha256-bu6fJuUo/i4kM+cZqSw8moB0ymoSVooLfwUIW+WDpWI="; - }) - ]; - passthru = shared.passthru // { - # Deps that are potentially overridden and are used inside GR plugins - the same version must - inherit - boost - volk - ; - # Used by many gnuradio modules, the same attribute is present in - # gnuradio3.10 where there it's spdlog. - logLib = log4cpp; - } // lib.optionalAttrs (hasFeature "gr-uhd") { - inherit uhd; - } // lib.optionalAttrs (hasFeature "gr-qtgui") { - inherit (libsForQt5) qwt; - }; - - postInstall = shared.postInstall - # This is the only python reference worth removing, if needed. - + lib.optionalString (!hasFeature "python-support") '' - ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake - ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) - ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake - '' - ; -})) diff --git a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch deleted file mode 100644 index 7cab73fede0c..000000000000 --- a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py -index babebfcde..9a02f663e 100644 ---- c/gr-utils/modtool/core/newmod.py -+++ w/gr-utils/modtool/core/newmod.py -@@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): - self._setup_scm(mode='new') - logger.info(f"Creating out-of-tree module in {self.dir}...") - try: -- shutil.copytree(self.srcdir, self.dir) -+ # https://stackoverflow.com/a/17022146/4935114 -+ shutil.copystat = lambda x, y: x -+ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) - try: - shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), - os.path.join(self.dir, '.clang-format')) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4aeafb857599..3272e206a0c0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -560,6 +560,9 @@ mapAliases ({ gnome3 = gnome; # Added 2021-05-07 gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 + gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 + gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 + gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gnuradio-limesdr = throw "'gnuradio-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6bc181d316..9361970b27d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30301,39 +30301,6 @@ with pkgs; }; }; }; - gnuradio3_9 = callPackage ../applications/radio/gnuradio/wrapper.nix { - unwrapped = callPackage ../applications/radio/gnuradio/3.9.nix { - inherit (darwin.apple_sdk.frameworks) CoreAudio; - python = python311; - }; - }; - gnuradio3_9Packages = lib.recurseIntoAttrs gnuradio3_9.pkgs; - # A build without gui components and other utilites not needed for end user - # libraries - gnuradio3_9Minimal = gnuradio.override { - doWrap = false; - unwrapped = gnuradio.unwrapped.override { - volk = volk.override { - # So it will not reference python - enableModTool = false; - }; - uhd = uhdMinimal; - features = { - gnuradio-companion = false; - python-support = false; - examples = false; - gr-qtgui = false; - gr-utils = false; - gr-modtool = false; - gr-blocktool = false; - sphinx = false; - doxygen = false; - # Doesn't make it reference python eventually, but makes reverse - # depdendencies require python to use cmake files of GR. - gr-ctrlport = false; - }; - }; - }; gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({ inherit (darwin.apple_sdk.frameworks) CoreAudio; From 06823daf53703a307b40dc96888d5e3d5e267702 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 28 Jul 2024 12:14:34 +0300 Subject: [PATCH 134/481] gnuradio3_8Packages.ais: mark as broken on Darwin --- pkgs/development/gnuradio-modules/ais/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 8155f39ee689..66a6e82fff8b 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , cmake @@ -57,6 +58,9 @@ mkDerivation rec { homepage = "https://github.com/bistromath/gr-ais"; license = licenses.gpl3Plus; platforms = platforms.unix; + # rpcserver_aggregator.h:111:54: error: no template named 'unary_function' + # in namespace 'std'; did you mean '__unary_function'? + broken = stdenv.isDarwin; maintainers = with maintainers; [ mog ]; }; } From 87e26eeed44595446f006d533a159bf2cdc64efc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 28 Jul 2024 14:35:28 +0300 Subject: [PATCH 135/481] volk_2: init at 2.5.0 Based on the expression deleted in a previous commit, use this expression in an upcoming commit for gnuradio3_8{,Minimal}. --- pkgs/by-name/vo/volk_2/package.nix | 67 ++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 pkgs/by-name/vo/volk_2/package.nix diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix new file mode 100644 index 000000000000..b1cb2ab575fd --- /dev/null +++ b/pkgs/by-name/vo/volk_2/package.nix @@ -0,0 +1,67 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + python311, + enableModTool ? true, + removeReferencesTo, + fetchpatch, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "volk"; + # Version 2.5.1 seems to cause a build issue for aarch64-darwin[1], and for + # gnuradio 3.8 on all platforms[2]. Hence we pin this package to 2.5.0 and + # use it for GR 3.8 for all platforms. + # + # [1]: https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A + # [2]: https://github.com/NixOS/nixpkgs/pull/330477#issuecomment-2254477735 + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "gnuradio"; + repo = "volk"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; + fetchSubmodules = true; + }; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; + sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; + extraPrefix = ""; + }) + ]; + + cmakeFlags = + [ (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 + # volk_32f_log2_32f: fail on arch neon + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" + ]; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' + remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) + ''; + + nativeBuildInputs = [ + cmake + # This version of the project wasn't updated to use Python 3.12 which + # doesn't include the deprecated distutils module. + python311 + python311.pkgs.mako + removeReferencesTo + ]; + + doCheck = true; + + meta = { + homepage = "http://libvolk.org/"; + description = "Vector Optimized Library of Kernels (version 2.5.0 - for GR 3.8)"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +}) From 97f944d47368d9324e7e8093f06b2fc32f1dfffd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 28 Jul 2024 14:40:25 +0300 Subject: [PATCH 136/481] gnuradio3_8: fix build by using volk_2 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9361970b27d7..de2a445e4825 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30305,6 +30305,7 @@ with pkgs; unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({ inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python311; + volk = volk_2; } // lib.optionalAttrs stdenv.isLinux { stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; }); @@ -30315,7 +30316,7 @@ with pkgs; gnuradio3_8Minimal = gnuradio3_8.override { doWrap = false; unwrapped = gnuradio3_8.unwrapped.override { - volk = volk.override { + volk = volk_2.override { enableModTool = false; }; uhd = uhdMinimal; From a77ec8862d37ca70d9cb3b1ecc8d4e64a89271e9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 28 Jul 2024 19:49:52 +0300 Subject: [PATCH 137/481] suscan: unstable-2022-07-05 -> 0.3.0 Nothing really changed, only upstream tagged the same commit as v0.3.0, see: https://github.com/BatchDrake/suscan/compare/37dad542b97aff24654f0bb80fb8e85af7cb84ab...v0.3.0 --- pkgs/applications/radio/suscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/applications/radio/suscan/default.nix index d2b13784a72c..b798c33310ac 100644 --- a/pkgs/applications/radio/suscan/default.nix +++ b/pkgs/applications/radio/suscan/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "suscan"; - version = "unstable-2022-07-05"; + version = "0.3.0"; src = fetchFromGitHub { owner = "BatchDrake"; repo = "suscan"; - rev = "37dad542b97aff24654f0bb80fb8e85af7cb84ab"; + rev = "v${version}"; sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M="; }; From bb01e59debd15accb23229325202eec2e6615554 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 31 Jul 2024 12:23:51 +0300 Subject: [PATCH 138/481] suscan: fix build by adding zlib --- pkgs/applications/radio/suscan/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/applications/radio/suscan/default.nix index b798c33310ac..62600c440da5 100644 --- a/pkgs/applications/radio/suscan/default.nix +++ b/pkgs/applications/radio/suscan/default.nix @@ -9,6 +9,7 @@ , soapysdr-with-plugins , libxml2 , volk +, zlib }: stdenv.mkDerivation rec { @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { soapysdr-with-plugins libxml2 volk + zlib ]; meta = with lib; { From cae1f154e597bfba4842ef687fd214601fdde6cd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 31 Jul 2024 13:21:40 +0300 Subject: [PATCH 139/481] gnuradio{,3_8}: use removeReferencesTo from nativeBuildInputs --- pkgs/applications/radio/gnuradio/3.8.nix | 2 +- pkgs/applications/radio/gnuradio/default.nix | 6 +++--- pkgs/applications/radio/gnuradio/shared.nix | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index b8123d112003..67cc2d6c8ebf 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -296,7 +296,7 @@ stdenv.mkDerivation (finalAttrs: (shared // { # This is the only python reference worth removing, if needed (3.7 doesn't # set that reference). + lib.optionalString (!hasFeature "python-support") '' - ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake + remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; })) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 6a04491a5cee..e7efa57428b8 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -312,9 +312,9 @@ stdenv.mkDerivation (finalAttrs: (shared // { postInstall = shared.postInstall # This is the only python reference worth removing, if needed. + lib.optionalString (!hasFeature "python-support") '' - ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake - ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) - ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake + remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake + remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; })) diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 9cf8b22b4158..fe75f6037f37 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -38,7 +38,7 @@ in { sha256 = sourceSha256; } ; - nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( + nativeBuildInputs = [ removeReferencesTo ] ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( lib.optionals (hasFeature feat) ( (lib.optionals (builtins.hasAttr "native" info) info.native) ++ @@ -85,11 +85,11 @@ in { postInstall = "" # Gcc references + lib.optionalString (hasFeature "gnuradio-runtime") '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' # Clang references in InstalledDir + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.isDarwin) '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' ; # NOTE: Outputs are disabled due to upstream not using GNU InstallDIrs cmake From e05dc5df3ab6c707f6c4534e03be22164a42ed91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 10:43:46 +0000 Subject: [PATCH 140/481] cargo-swift: 0.7.1 -> 0.8.0 --- pkgs/by-name/ca/cargo-swift/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index 6d69053d1cd6..53aefb56374e 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-swift"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "antoniusnaumann"; repo = "cargo-swift"; rev = "v${version}"; - hash = "sha256-2jKu1Hl+2HnlZWu+mLmrhrhzH1Q/S9ej+SJyjeMr4CI="; + hash = "sha256-T8cIZJwnA3bFMIEezMrh5LRXV1SRCAVLanQm7rmc0sU="; }; - cargoHash = "sha256-PQkV2Gz1whIM772bGAEC0TQO9w4DaWSrtCejgVCFTpA="; + cargoHash = "sha256-qm1xSmCOF/ZHhwbCaB0Df+Rcvrh2imMPSCS1Hxl0TaI="; meta = with lib; { description = "Cargo plugin to easily build Swift packages from Rust code"; From d82d2c4919af04dc8535baf6c7de973db958f1b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 10:57:24 +0000 Subject: [PATCH 141/481] otpclient: 3.7.0 -> 4.0.0 --- pkgs/applications/misc/otpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 8ca73be27547..0befa164fa3f 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.7.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Xw6Z/xDPQEVMdxMzrhtPAl3nOD7oMlZhKDb9bD8GEO8="; + hash = "sha256-Ah1TWRxLFKgSDjnLO5XLIyo1hgD7EAlMHDbxxcOu4Yg="; }; nativeBuildInputs = [ From 6654981565213710fcb7626237de0bb8941e44b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 11:34:49 +0000 Subject: [PATCH 142/481] qxmpp: 1.7.1 -> 1.8.0 --- pkgs/development/libraries/qxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index e4df5d8a1d0e..d8509d7be73d 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e9Uucf0iKR11X35nCPZvf8GuF4k5Ha4huStyylNk3+4="; + sha256 = "sha256-QUIHowMl3YTDQlo58OHXXNaYLI4vuIozYbZnz4EQUmQ="; }; nativeBuildInputs = [ From 42e1111aff039355d057af5d239a5fdade9bf14b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 11:35:40 +0000 Subject: [PATCH 143/481] jaq: 1.5.1 -> 1.6.0 --- pkgs/development/tools/jaq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index b8eeb18f5213..8304303d301f 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-i/VCr12ThKkT8L2lvzWiPD2Ir1WLcbgGYVsUDRgzGLs="; + hash = "sha256-VD10BO7bxTmD1A1AZsiEiYBsVhAKlXxdHNMmXqpvpKM="; }; - cargoHash = "sha256-3F95yv4D2FLuT7+e0LJ0NQ8bjsirCF/qsO0V7WdJS5M="; + cargoHash = "sha256-7MK0iLBpjvWE7UH5Tb3qIm2XnEVsAvBy34Ed4wHagZQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From 019d0919383f5b28f0339020bb85fb291000bf54 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 21:11:17 -0700 Subject: [PATCH 144/481] llvmPackages.clangUseLLVM: add --undefined-version by default Majority of packages with a version script have broken version scripts, this will likely result in us adding this flag to many packages. To keep things simple, just add it as a default. --- pkgs/development/compilers/llvm/common/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index b84fcab17f1b..3bd40e556746 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -439,7 +439,8 @@ let ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; nixSupport.cc-ldflags = lib.optionals ( !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD - ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; + ) [ "-L${targetLlvmLibraries.libunwind}/lib" ] + ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version"; } ); @@ -619,6 +620,7 @@ let compiler-rt-no-libc = callPackage ./compiler-rt { patches = compiler-rtPatches; + doFakeLibgcc = stdenv.hostPlatform.useLLVM or false; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt From ed47080c943a7ecfb2a3d08dcf6d322af8fa23fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 14:08:54 +0000 Subject: [PATCH 145/481] heh: 0.5.0 -> 0.6.0 --- pkgs/applications/editors/heh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/heh/default.nix b/pkgs/applications/editors/heh/default.nix index 7fd704ab6e8b..cf36720b33f2 100644 --- a/pkgs/applications/editors/heh/default.nix +++ b/pkgs/applications/editors/heh/default.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "heh"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ndd7xv"; repo = pname; rev = "v${version}"; - hash = "sha256-zkb+HogwioqxZ+BTl7bcDQx9i9uWhT2QdAIXpHqvDl0="; + hash = "sha256-P3EZSe5Zv7pJ2QwKvtBh5kz93y6DBWkj6s8v3+8Xp9Q="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit ]); - cargoHash = "sha256-YcTaLq04NhmnJ1pdbiKMRIBSFvHNWNgoAS8Uz8uGGAw="; + cargoHash = "sha256-l3XR6srs6RmvcGjMFni6wYLLqXE8mMUq59WFLKGQl3U="; meta = with lib; { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; From 07471b398d990ed3cdf594909e497f774907e0a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 14:10:21 +0000 Subject: [PATCH 146/481] gruvbox-plus-icons: 5.4.0 -> 5.5.0 --- pkgs/by-name/gr/gruvbox-plus-icons/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix index e244c4856f30..ff5e1411b8b1 100644 --- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gruvbox-plus-icons"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "SylEleuth"; repo = "gruvbox-plus-icon-pack"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mtOYoaejK6ZGPcM4IxXs6l6oXGP9WSMw5N7JIF3n67s="; + sha256 = "sha256-G7F+69K2aJVBM3yOQIMTH2pDXBfLmYScKIIAza3YNw8="; }; nativeBuildInputs = [ gtk3 ]; From f76f48b6e0bbf75a878b35d1fcf129e3b7bf84c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 00:29:50 +0000 Subject: [PATCH 147/481] valkey: 7.2.5 -> 7.2.6 --- pkgs/by-name/va/valkey/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index 4a8b427ece98..1a97c09ebd29 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "7.2.5"; + version = "7.2.6"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-nDAQbxlSBXKSJqZgvElsrZeDnHw4A4eA8f9ecXdx0/U="; + hash = "sha256-nWeuWlP000DHEmIBzW1UmGqN+BggCjTS5plbQ/NV6wY="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; From 4f9ba47795f876e60f2c829ae7c434ab2e3de48d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 00:40:54 +0000 Subject: [PATCH 148/481] prometheus-consul-exporter: 0.12.0 -> 0.12.1 --- pkgs/servers/monitoring/prometheus/consul-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 8b4695d4dd90..4c6eaa48c1e1 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "consul_exporter"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "consul_exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-qLc0CG+N3OF1V6rJQCWDxIrsU0lHoskMNUbwsx8pcPs="; + hash = "sha256-cB3tpRa2sZBte5Rk7v9rvxvuRh2Ff3vPxmMYwhxxPSA="; }; - vendorHash = "sha256-G7Gf3igUnDID9hTuvIHd7syii2+3dPAlewsW8yKNJvs="; + vendorHash = "sha256-naEbalwVRUFW2wRU3gxb/Zeu4oSnO6+bOZimxaySSyA="; ldflags = [ "-s" From d6664f5367e93ab00ed874166c8cbaac732ae2b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 00:42:45 +0000 Subject: [PATCH 149/481] nova: 3.9.0 -> 3.10.0 --- pkgs/applications/networking/cluster/nova/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/applications/networking/cluster/nova/default.nix index 1e8ab2402d9b..911a3fa2d87c 100644 --- a/pkgs/applications/networking/cluster/nova/default.nix +++ b/pkgs/applications/networking/cluster/nova/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nova"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; rev = "v${version}"; - hash = "sha256-9ccWH0bh67LCwzKmyaE32j+qeKfNauclSMjpRwdblH8="; + hash = "sha256-2jm9FoB8CPvnqJABotPhlvJdgZTtuvntzqWmQ2Li7W4="; }; - vendorHash = "sha256-Vt2yUYm2i1NHzW7GxDRqBpaFS4dLfODNEMPO+CTwrLY="; + vendorHash = "sha256-m9gCsWvZ55Wv8PFV3x+tjlEZ4oDFVBbOSnvsjPTvR6k="; ldflags = [ "-X main.version=${version}" "-s" "-w" ]; From 1a624644879a4d73112cf5f8262842970bacf857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 01:25:11 +0000 Subject: [PATCH 150/481] mssql_jdbc: 12.6.3 -> 12.8.0 --- pkgs/servers/sql/mssql/jdbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index f408ec022160..6a276e7abf58 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.6.3"; + version = "12.8.0"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-Q5XwJ3j6J06DjX2tIVM676tXvKSrBb0W6/EucHpyTI4="; + sha256 = "sha256-mzSPFlv6MUtKNzZvRBy2khEa2YUEiH4xMR0EYXk3AHY="; }; dontUnpack = true; From 01b1811560b514a29f28d8a1676eebe776ebffe0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 01:26:40 +0000 Subject: [PATCH 151/481] datovka: 4.24.0 -> 4.24.1 --- pkgs/applications/networking/datovka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index da61b2684067..b445676ca378 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.24.0"; + version = "4.24.1"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-6Bd6IeuCXVnK8ZPgU9FOSNqoYf3ZNpkSBC+cR5JU9AQ="; + sha256 = "sha256-/thevIj3nliVkkFGQ0fr6qAprkNj1FgHsXx7Wmn10xI="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; From 5a4e1dae67a1f901972c274e1fcf06558e19edc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 01:46:30 +0000 Subject: [PATCH 152/481] mongodb-compass: 1.43.4 -> 1.43.5 --- pkgs/by-name/mo/mongodb-compass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 74431e60f2ac..a34867e99848 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -33,7 +33,7 @@ }: let - version = "1.43.4"; + version = "1.43.5"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-K4BOWmlXO16cF8WN+rncifWSHJRxSADxLdKRHCet5Co="; + hash = "sha256-91qTy/y+p1yPt5tEfKmGT7lGKndsel902bcHTh7UB20="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 56123b37a66159b02cbb5aadf22dfe65ea3d48f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 02:05:26 +0000 Subject: [PATCH 153/481] humioctl: 0.35.1 -> 0.36.0 --- pkgs/by-name/hu/humioctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hu/humioctl/package.nix b/pkgs/by-name/hu/humioctl/package.nix index 74f1bc7fd160..018448d431b0 100644 --- a/pkgs/by-name/hu/humioctl/package.nix +++ b/pkgs/by-name/hu/humioctl/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "humioctl"; - version = "0.35.1"; + version = "0.36.0"; src = fetchFromGitHub { owner = "humio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-naN/731Byn0E1h+Yk/8fAyeJpSHTn99jEcRC3rSh2c8="; + hash = "sha256-2vkzde4l6GIIBzzNSewCtaVlBqkqpZQGXjw7VdJFPaE="; }; vendorHash = "sha256-vGX77+I/zdTBhVSywd7msjrJ0KtcdZRgvWZWQC9M9og="; From e0640d882b2ecec2f28b33b5ea259edc0051225a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 05:17:38 +0000 Subject: [PATCH 154/481] gcsfuse: 2.3.2 -> 2.4.0 --- pkgs/tools/filesystems/gcsfuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 1b52fa09c854..e4dbfb1cf57b 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-mJOZDhNri3ZxLygWHckmF76mQkrbRJb933f+WFYw75Q="; + hash = "sha256-4susiXFe1aBcakxRkhmOe7dvcwsNfam4KKyFFzYXhcU="; }; - vendorHash = "sha256-9eUUjcRQ/H3iPO2F+KE0nd5+b8slc6xacXSZt3jytgU="; + vendorHash = "sha256-uOr929RS8q7LB+WDiyxEIyScE/brmvPJKfnq28PfsDM="; subPackages = [ "." "tools/mount_gcsfuse" ]; From 0e5f46b7275f6a096fecdd74ff5b71c2d02f50db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 05:32:50 +0000 Subject: [PATCH 155/481] boogie: 3.2.1 -> 3.2.3 --- pkgs/by-name/bo/boogie/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 528e62179eb0..93005522cf4d 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-89S3yBjEUHbQbuWWLe/pTMaDOCqDR04hNJwIRzh5xaI="; + sha256 = "sha256-dMJ6A2ggBb20vuHL1g/Zx3pl9tXE8oayMGOqpChcg2U="; }; projectFile = [ "Source/Boogie.sln" ]; From 9d80e128f72afbb921e848f21c123801d406935e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 06:06:01 +0000 Subject: [PATCH 156/481] python312Packages.fakeredis: 2.23.3 -> 2.23.4 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b2f0b9c08fad..3c49234385ef 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.23.3"; + version = "2.23.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-U+jLxI2Ly+LvC/0eGXdaAa6iqDFfu5n8X0UrTWFRhhE="; + hash = "sha256-SZyYtXwd5ofE2rlRw9Nl24VYMlPIuzrnoyE2ayapZww="; }; build-system = [ poetry-core ]; From 29c5b2860959ea200c8c3a40cbd4b8cede09fb36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 06:36:21 +0000 Subject: [PATCH 157/481] murex: 6.2.3000 -> 6.2.4000 --- pkgs/shells/murex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 04718b50379d..66d24292ce8a 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "6.2.3000"; + version = "6.2.4000"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y9FVmIYipEkKXHU7TcRX7s/8/50b5fYnPLalFXHPomM="; + sha256 = "sha256-CgbbbFFsY6zBwS4GeZk5DuHWibRIewvQ1CnvuvTFaSU="; }; vendorHash = "sha256-/qK7Zgdz48vmz+tIMZmo1M5Glr842fOCinMoLAeQasg="; From 57e6d796a2d1069ca9393500e6260546a7859e90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 07:24:49 +0000 Subject: [PATCH 158/481] octavePackages.miscellaneous: 1.3.0 -> 1.3.1 --- pkgs/development/octave-modules/miscellaneous/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/miscellaneous/default.nix b/pkgs/development/octave-modules/miscellaneous/default.nix index db2f45a5ac3d..64edb8e9a418 100644 --- a/pkgs/development/octave-modules/miscellaneous/default.nix +++ b/pkgs/development/octave-modules/miscellaneous/default.nix @@ -8,11 +8,11 @@ buildOctavePackage rec { pname = "miscellaneous"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "10n107njz24ln7v9a1l3dkh7s7vd6qwgbinrj1nl4wflxsir4l9k"; + sha256 = "sha256-VxIReiXTHRJmADZGpA6B59dCdDPCY2bkJt/6mrir1kg="; }; buildInputs = [ From c882d9b673e8d6eb6a29b0954519c72871b91e08 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 31 Jul 2024 21:31:37 +0200 Subject: [PATCH 159/481] nixos/screego: init module Add module for screego --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/screego.nix | 96 +++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 nixos/modules/services/web-apps/screego.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e48a836a6abd..82a555be35c8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1464,6 +1464,7 @@ ./services/web-apps/pretix.nix ./services/web-apps/prosody-filer.nix ./services/web-apps/rimgo.nix + ./services/web-apps/screego.nix ./services/web-apps/sftpgo.nix ./services/web-apps/suwayomi-server.nix ./services/web-apps/rss-bridge.nix diff --git a/nixos/modules/services/web-apps/screego.nix b/nixos/modules/services/web-apps/screego.nix new file mode 100644 index 000000000000..9258e63c5d47 --- /dev/null +++ b/nixos/modules/services/web-apps/screego.nix @@ -0,0 +1,96 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) mkOption types mkIf; + cfg = config.services.screego; + defaultSettings = { + SCREEGO_SERVER_ADDRESS = "127.0.0.1:5050"; + SCREEGO_TURN_ADDRESS = "0.0.0.0:3478"; + SCREEGO_TURN_PORT_RANGE = "50000:55000"; + SCREEGO_SESSION_TIMEOUT_SECONDS = "0"; + SCREEGO_CLOSE_ROOM_WHEN_OWNER_LEAVES = "true"; + SCREEGO_AUTH_MODE = "turn"; + SCREEGO_LOG_LEVEL = "info"; + }; +in +{ + meta.maintainers = with lib.maintainers; [ pinpox ]; + + options.services.screego = { + + enable = lib.mkEnableOption "screego screen-sharing server for developers"; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open the firewall port(s). + ''; + }; + + environmentFile = mkOption { + default = null; + description = '' + Environment file (see {manpage}`systemd.exec(5)` "EnvironmentFile=" + section for the syntax) passed to the service. This option can be + used to safely include secrets in the configuration. + ''; + example = "/run/secrets/screego-envfile"; + type = with types; nullOr path; + }; + + settings = lib.mkOption { + type = types.attrsOf types.str; + description = '' + Screego settings passed as Nix attribute set, they will be merged with + the defaults. Settings will be passed as environment variables. + + See https://screego.net/#/config for possible values + ''; + default = defaultSettings; + example = { + SCREEGO_EXTERNAL_IP = "dns:example.com"; + }; + }; + }; + + config = + let + # User-provided settings should be merged with default settings, + # overwriting where necessary + mergedConfig = defaultSettings // cfg.settings; + turnUDPPorts = lib.splitString ":" mergedConfig.SCREEGO_TURN_PORT_RANGE; + turnPort = lib.toInt (builtins.elemAt (lib.splitString ":" mergedConfig.SCREEGO_TURN_ADDRESS) 1); + in + mkIf (cfg.enable) { + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ turnPort ]; + allowedUDPPorts = [ turnPort ]; + allowedUDPPortRanges = [ + { + from = lib.toInt (builtins.elemAt turnUDPPorts 0); + to = lib.toInt (builtins.elemAt turnUDPPorts 1); + } + ]; + }; + + systemd.services.screego = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + description = "screego screen-sharing for developers"; + environment = mergedConfig; + serviceConfig = { + DynamicUser = true; + ExecStart = "${lib.getExe pkgs.screego} serve"; + Restart = "on-failure"; + RestartSec = "5s"; + } // lib.optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; }; + }; + }; +} From 29735f370b72f137852cbf0ddf9f884a255a0917 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 09:43:49 +0000 Subject: [PATCH 160/481] srm-cuarzo: 0.6.3-1 -> 0.7.0-1 --- pkgs/by-name/sr/srm-cuarzo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index ce1e7bd2787c..fe06aba60695 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.6.3-1"; + version = "0.7.0-1"; rev = "v${self.version}"; - hash = "sha256-nQucfh/Eri2BM70NFYqJQnBgVlHO/5eNHVFX/6RYoZA="; + hash = "sha256-IiHcJyF7lxS/OXU/TGRrzOGNk1kKknyZ4WxMIJshZXs="; src = fetchFromGitHub { inherit (self) rev hash; From a2312ca74f4e686328e79398046c444e8da31fb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 10:10:16 +0000 Subject: [PATCH 161/481] sarif-fmt: 0.5.0 -> 0.6.0 --- pkgs/by-name/sa/sarif-fmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index aa61af8f1375..2be6f11a386c 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage rec { pname = "sarif-fmt"; - version = "0.5.0"; + version = "0.6.0"; src = fetchCrate { inherit pname version; - hash = "sha256-QiIAo9q8pcon/Os7ih8jJyDLvKPrLD70LkMAQfgwDNM="; + hash = "sha256-2B0ylCTRaCglS+iTvM0L5RSAObS8k40g7hqKPo/7Zqc="; }; - cargoHash = "sha256-RlINf/8P+OpZffvqbkKoafeolioDGABWS71kpGcX/cs="; + cargoHash = "sha256-oYLMCuAln9jkOHOjW5zuD7ZUKju8KkZw/A2sV1MZuC4="; # `test_clippy` (the only test we enable) is broken on Darwin # because `--enable-profiler` is not enabled in rustc on Darwin From 186d7806a6cdb7d799d673d2e064037c79293450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 10:32:50 +0000 Subject: [PATCH 162/481] shellcheck-sarif: 0.5.0 -> 0.6.0 --- pkgs/by-name/sh/shellcheck-sarif/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix index 20d157f7efe7..49ecc8117733 100644 --- a/pkgs/by-name/sh/shellcheck-sarif/package.nix +++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage rec { pname = "shellcheck-sarif"; - version = "0.5.0"; + version = "0.6.0"; src = fetchCrate { inherit pname version; - hash = "sha256-PFMakiV9vXzMqVh1WeVTDwGpN7RVfFQlVWKkaD6ef+Q="; + hash = "sha256-ZVzUEhhiL5KeOck6Jmg1LKyQ3oHc6OQXSrSlC1s6qpA="; }; - cargoHash = "sha256-kkSTRoouuIh4Bsh+zqhtTwIGLxDE+3u8SuP+8i+lw5Q="; + cargoHash = "sha256-ftTGtvpIR8NymkJkUTZzV7KdS0aHutu4WAZ4CQZd3jE="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 11b4c29cfa34ae83ab6743559bd38ca07b749f3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 12:09:05 +0000 Subject: [PATCH 163/481] ethercat: 1.6.0 -> 1.6.1 --- pkgs/by-name/et/ethercat/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index f8e128bf436a..add1fe101f21 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ethercat"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitLab { owner = "etherlab.org"; repo = "ethercat"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-w1aoznLjCHh+dN2fyfpKpzq68B4D/rert2XFpTxk/F4="; + hash = "sha256-fvuyADZzH1lHo1TkGd9s3n2n8y9vsGgs/ZOakIw48WI="; }; separateDebugInfo = true; From fbb011af0f002087f4c8849db64b7989991f8547 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 12:40:47 +0000 Subject: [PATCH 164/481] deck: 1.39.3 -> 1.39.4 --- pkgs/applications/networking/deck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index d57e11209b30..fe6e645840f8 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.39.3"; + version = "1.39.4"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-Oi/2sIsnJp1wK9PCS4GMCnFPLIAwNZeP7Qnnum3a118="; + hash = "sha256-VNli6MtE2/JC+H5zPdwjefxrV85bOJrYKOlpFH524U8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-SXpY6FokcrxWZu0LybGKN3tw8GwbntV3ZQ+T2dhGDqY="; + vendorHash = "sha256-CuJbkRezv0nL6UlB8Qg1G3gVhBM1EtvxDxN53E/Mib8="; postInstall = '' installShellCompletion --cmd deck \ From f728dd56afcc6355e50238db7beacb1cd11adb9c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 1 Aug 2024 14:54:39 +0200 Subject: [PATCH 165/481] naja: Mark broken on Darwin, add temporary note about maintenance --- pkgs/by-name/na/naja/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index 1f724e3c63d6..dd0903a21f29 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -62,8 +62,12 @@ stdenv.mkDerivation { description = "Structural Netlist API (and more) for EDA post synthesis flow development"; homepage = "https://github.com/najaeda/naja"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = [ + # maintained by the team working on NGI-supported software, no group for this yet + ]; mainProgram = "naja_edit"; platforms = lib.platforms.all; + # "aligned deallocation function of type [...] is only available on macOS 10.13 or newer" even with 11.0 SDK + broken = stdenv.hostPlatform.isDarwin; }; } From 57d79f6095a820737c84a471e35799413b10a65e Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Thu, 1 Aug 2024 15:40:06 +0200 Subject: [PATCH 166/481] quarto: 1.5.55 -> 1.5.56 --- pkgs/development/libraries/quarto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index e96bb6346721..1cf1d80b4ff0 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.5.55"; + version = "1.5.56"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-1HqjMENJ1H5RBaKIRZoUDGrdSEQOhhIiRLIQFqnkFlk="; + sha256 = "sha256-sq7/Jfwo//yMiK0JSN99HMnXswNP4vPElZIRmSb+R8g="; }; nativeBuildInputs = [ From 07dfa0de033b914777a8279eeadbe2e1b8e80a23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 13:54:31 +0000 Subject: [PATCH 167/481] dissent: 0.0.25 -> 0.0.26 --- pkgs/by-name/di/dissent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index f3c0f8113388..31023fcb4410 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "dissent"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "diamondburned"; repo = "dissent"; rev = "v${version}"; - hash = "sha256-ysI7zgducK52XbSzsaCnffSC9BRd/aaybMif/GkkhcI="; + hash = "sha256-BvVu83XqiRQ7t7MtRHLfN3m1roSbRvZyHTxpQI7lGuA="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service ''; - vendorHash = "sha256-qBgj3h+WKWxVahRXyO/w2zGY4UCVkjP7XKFk/9GOFqs="; + vendorHash = "sha256-3mZUSN1Ul223vp8Zx12hULtCM7eVJl7y0q+Fk1tFEBs="; meta = with lib; { description = "A third-party Discord client designed for a smooth, native experience (formerly gtkcord4)"; From f2fb5aa2e79f57f30c5825be8d1117bd1f36aa28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 15:09:39 +0000 Subject: [PATCH 168/481] media-downloader: 4.8.0 -> 4.9.0 --- pkgs/by-name/me/media-downloader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 5d77bbd63478..06704c3db719 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-qSZb83gB9Kw6goY7RkWRWXpzHTF27EV5T59RitjSuc4="; + hash = "sha256-ERH/lQv+ykJ0gfJBkwGUeFXenoALr2rf7Vm+ZAn23fg="; }; nativeBuildInputs = [ From 82bae7f3663b64de765c8d01381daace0d4f4c34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 15:24:21 +0000 Subject: [PATCH 169/481] python312Packages.binwalk: 2.4.1 -> 2.4.2 --- pkgs/development/python-modules/binwalk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 844765011ca6..25365c67fbde 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; src = fetchFromGitHub { owner = "OSPG"; repo = "binwalk"; - rev = "v${version}"; - hash = "sha256-VApqQrVBV7w15Bpwc6Fd/cA1Ikqu7Ds8qu0TH68YVog="; + rev = "refs/tags/v${version}"; + hash = "sha256-IFq/XotW3bbf3obWXRK6Nw1KQDqyFHb4tcA09Twg8SQ="; }; build-system = [ setuptools ]; From 6525c157c1286c6eab9e74108ea1c262cbd9c051 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 17:16:17 +0000 Subject: [PATCH 170/481] atac: 0.15.1 -> 0.16.0 --- pkgs/by-name/at/atac/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index b8b8b91f9988..66d001d21522 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-WDO6HDmjlXU4uelAJIWJN2sOJTioR7i2WzQpqg6dtKo="; + hash = "sha256-PTslXzgZCzmy45zI2omv4Ef5h4gJdfWcK5ko7ulHnXo="; }; - cargoHash = "sha256-+dBEl1qk1/3WuSypsxV4x7DEmnMxa2z0MC03IZaON3s="; + cargoHash = "sha256-ZQyj2+gsZnayWD29dYZDh1zYTstaQluzzF7pXf0yoY4="; nativeBuildInputs = [ pkg-config From 5be99f30e97e5e8c3a76f67b458404dc1b7d07ca Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 1 Aug 2024 18:42:18 +0100 Subject: [PATCH 171/481] audacity: unpin FFmpeg 6 From : > Audacity 3.5 and later also supports avformat-61.dll. --- pkgs/applications/audio/audacity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 907399f90639..bdedb3b9579b 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -30,7 +30,7 @@ , libid3tag , libopus , libuuid -, ffmpeg_6 +, ffmpeg_7 , soundtouch , pcre , portaudio # given up fighting their portaudio.patch? @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ffmpeg_6 + ffmpeg_7 file flac gtk3 @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString stdenv.isLinux '' wrapProgram "$out/bin/audacity" \ "''${gappsWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_6 ]} \ + --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_7 ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" '' + lib.optionalString stdenv.isDarwin '' From ea32b7855329db2348ca5e31ff67697873dba4e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 18:37:07 +0000 Subject: [PATCH 172/481] aardvark-dns: 1.11.0 -> 1.12.0 --- pkgs/tools/networking/aardvark-dns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 3daebbead08c..5eba887bfadc 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-MejXcHleJ6AmnoiZefZfp9La8D4PxHgEg0pMxUk2740="; + hash = "sha256-4mOX0PYj6qm1X8QQYhUAJbLUUi/O+BqRy4se9XvS4c0="; }; - cargoHash = "sha256-r7etdWr/0cY38A7fRB5QQ86EyQ5YpuxyY3vx5qrdquc="; + cargoHash = "sha256-IvDBtu2DSQUmFtfx81wW+Z82cvMtoWEEH+tyX0FjYFg="; passthru.tests = { inherit (nixosTests) podman; }; From 812a66dbd67455c83db78fb76fb439a01669ee26 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Thu, 1 Aug 2024 21:04:34 +0200 Subject: [PATCH 173/481] libjson-rpc-cpp: 1.3.0 -> 1.4.1 --- .../libraries/libjson-rpc-cpp/default.nix | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 4e97ff2f4d5d..f132a66560be 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,47 +1,22 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, pkg-config -, cmake -, argtable -, catch2 -, curl -, doxygen -, hiredis -, jsoncpp -, libmicrohttpd -}: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, argtable, catch2 +, curl, doxygen, hiredis, jsoncpp, libmicrohttpd }: stdenv.mkDerivation rec { pname = "libjson-rpc-cpp"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "cinemast"; repo = "libjson-rpc-cpp"; - sha256 = "sha256-EAakiqlfMprwLjloDekOssaB/EnAmn5njcwHGZtYs9w="; + sha256 = "sha256-YCCZN4y88AixQeo24pk6YHfSCsJz8jJ97Dg40KM08cQ="; rev = "v${version}"; }; env.NIX_CFLAGS_COMPILE = "-I${catch2}/include/catch2"; - patches = [ - (fetchpatch { - name = "int-to-MHD_Result.patch"; - url = "https://patch-diff.githubusercontent.com/raw/cinemast/libjson-rpc-cpp/pull/299.patch"; - sha256 = "sha256-hiey6etzbOxhMElTMX7offKbey7c2OO/UWeN03k0AaM="; - }) - ]; - nativeBuildInputs = [ pkg-config cmake doxygen ]; - buildInputs = [ - argtable - catch2 - curl - hiredis - jsoncpp - libmicrohttpd - ]; + + buildInputs = [ argtable catch2 curl hiredis jsoncpp libmicrohttpd ]; postPatch = '' for f in cmake/FindArgtable.cmake \ @@ -71,7 +46,9 @@ stdenv.mkDerivation rec { preInstall = '' function fixRunPath { p=$(patchelf --print-rpath $1) - q="$p:${lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" + q="$p:${ + lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ] + }:$out/lib" patchelf --set-rpath $q $1 } @@ -98,5 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cinemast/libjson-rpc-cpp"; license = licenses.mit; platforms = platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + maintainers = with maintainers; [ robertrichter ]; }; } From 2775b81e4e3155a41cc014e064ffb8c883e17467 Mon Sep 17 00:00:00 2001 From: redyf Date: Thu, 1 Aug 2024 16:40:54 -0300 Subject: [PATCH 174/481] superfile: 1.1.3 -> 1.1.4 --- pkgs/by-name/su/superfile/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 0ba66643442b..446095774d41 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "superfile"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "yorukot"; repo = "superfile"; rev = "v${version}"; - hash = "sha256-z1jcRzID20s7tEDUaEcnOYBfv/BPZtcXz9fy3V5iPPg="; + hash = "sha256-ajLlXySf/YLHrwwacV5yIF8qU5pKvEoOwpDoxh49qaU="; }; - vendorHash = "sha256-OzPH7dNu/V4HDGSxrvYxu3s+hw36NiulFZs0BJ44Pjk="; + vendorHash = "sha256-vybe4KNj6ZhvXRTiN7e5+IhOewfK5L2jKPrcdCYGc4k="; ldflags = ["-s" "-w"]; From 4b0746388bffded10c132a04388ce02356a054f6 Mon Sep 17 00:00:00 2001 From: redyf Date: Thu, 1 Aug 2024 16:41:36 -0300 Subject: [PATCH 175/481] superfile: add redyf as maintainer --- pkgs/by-name/su/superfile/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 446095774d41..9bb594a3751e 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { homepage = "https://github.com/yorukot/superfile"; changelog = "https://github.com/yorukot/superfile/blob/${src.rev}/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [momeemt]; + maintainers = with maintainers; [momeemt redyf]; mainProgram = "superfile"; }; } From ac184d1a52a6fb04b2a485447cc63131ac110f83 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 1 Aug 2024 22:47:51 +0200 Subject: [PATCH 176/481] mysql80: 8.0.38 -> 8.0.39 Changes: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-39.html --- pkgs/servers/sql/mysql/8.0.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 20bf870af5ea..4a072ae3f46b 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.38"; + version = "8.0.39"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-0qXCL4tWLX4PEdm441yYeaUWYDlCTBNCclN9Ao1yGRQ="; + hash = "sha256-jEpLHUnHFJINJo/jmNeZVZqzxc9ZoDaGGUs3yz020ws="; }; nativeBuildInputs = [ bison cmake pkg-config ] From 6917964f10b7dfba375e73a9e61c96b70ec6ea91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 21:27:03 +0000 Subject: [PATCH 177/481] tfupdate: 0.8.2 -> 0.8.4 --- pkgs/applications/networking/cluster/tfupdate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tfupdate/default.nix b/pkgs/applications/networking/cluster/tfupdate/default.nix index 25a547402104..c9595ce183d7 100644 --- a/pkgs/applications/networking/cluster/tfupdate/default.nix +++ b/pkgs/applications/networking/cluster/tfupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfupdate"; - version = "0.8.2"; + version = "0.8.4"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${version}"; - sha256 = "sha256-RewBCiUNdXA30gwcnBu+wBoMNbVjaIWkCQV+Bat6l0o="; + sha256 = "sha256-/wkCd73SrspHccbOZV6lq0Htk+Vjgbu2uTZLiEeZAdc="; }; - vendorHash = "sha256-fs61aMsRGF2zmyLro5ySWi3P1qPPgvISTqCvuVWAvz0="; + vendorHash = "sha256-/ZNWVuGInZY/t0s317FQstEPeJpTKWMXUVo8cE44GkI="; # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted From fc7a83f8b62e90de5679e993d4d49ca014ea013d Mon Sep 17 00:00:00 2001 From: DCsunset Date: Thu, 1 Aug 2024 18:49:43 -0400 Subject: [PATCH 178/481] step-cli: format package.nix with nixfmt --- pkgs/by-name/st/step-cli/package.nix | 61 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index d0d4aacce489..ce3793463590 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -2,40 +2,41 @@ lib, buildGoModule, fetchFromGitHub, -}: let +}: +let version = "0.27.2"; in - buildGoModule { - pname = "step-cli"; - inherit version; +buildGoModule { + pname = "step-cli"; + inherit version; - src = fetchFromGitHub { - owner = "smallstep"; - repo = "cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-9w7rUtlLa1kl9oVboWZWj4eoZh+pPdGsEEQDWYdEMns="; - }; + src = fetchFromGitHub { + owner = "smallstep"; + repo = "cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-9w7rUtlLa1kl9oVboWZWj4eoZh+pPdGsEEQDWYdEMns="; + }; - ldflags = [ - "-w" - "-s" - "-X=main.Version=${version}" - ]; + ldflags = [ + "-w" + "-s" + "-X=main.Version=${version}" + ]; - preCheck = '' - # Tries to connect to smallstep.com - rm command/certificate/remote_test.go - ''; + preCheck = '' + # Tries to connect to smallstep.com + rm command/certificate/remote_test.go + ''; - vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo="; + vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo="; - meta = { - description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; - homepage = "https://smallstep.com/cli/"; - changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [isabelroses]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - mainProgram = "step"; - }; - } + meta = { + description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; + homepage = "https://smallstep.com/cli/"; + changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ isabelroses ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "step"; + }; +} From ab8e7df7502fede509280324e98f5e3b8c26a9a1 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 2 Aug 2024 00:29:54 +0200 Subject: [PATCH 179/481] s3ql: 5.1.3 -> 5.2.1 --- pkgs/tools/backup/s3ql/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index bc6ea1876767..1583048f961c 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -4,18 +4,19 @@ python3, sqlite, which, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { pname = "s3ql"; - version = "5.1.3"; + version = "5.2.1"; pyproject = true; src = fetchFromGitHub { owner = "s3ql"; repo = "s3ql"; rev = "refs/tags/s3ql-${version}"; - hash = "sha256-8vGW0Kl6hDTY+9mTnm2S659PZ/9gl90d2tXxKIIFimo="; + hash = "sha256-85J0ymGe9V6f95Ycdq84dY+UiybhPdFXZzuIBb1nD5c="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -52,6 +53,13 @@ python3.pkgs.buildPythonApplication rec { pytestFlagsArray = [ "tests/" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "s3ql-([0-9.]+)" + ]; + }; + meta = with lib; { description = "Full-featured file system for online data storage"; homepage = "https://github.com/s3ql/s3ql/"; From be556244a4d8e7719fc1c9a4baa455061abf0a1d Mon Sep 17 00:00:00 2001 From: redyf Date: Thu, 1 Aug 2024 20:16:53 -0300 Subject: [PATCH 180/481] iosevka: 30.3.3 -> 31.0.0 https://github.com/be5invis/Iosevka/releases/tag/v31.0.0 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index f1dadcb0d33d..a616f4e7979e 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "30.3.3"; + version = "31.0.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-vbtcnBj+mYqUBUpyDXDjoz1elL5xPybZ60DBA3iFRME="; + hash = "sha256-toC3Q5DkTu8yfrCwhRutUaPW0JJO/Vnhkh6PUKIa31I="; }; - npmDepsHash = "sha256-5PTwvwGQKIL22BDq252DGddsXodaYlXUr0PiejFW+28="; + npmDepsHash = "sha256-PWzhpz+L1mNQI5PCHVsU/+vfb5im/V8NxhlUtdhSeMM="; nativeBuildInputs = [ remarshal From d30e4a2f5907c665fcf4c906584122e1bbb24d32 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 21 Jul 2024 16:08:19 +0100 Subject: [PATCH 181/481] attract-mode: move to `pkgs/by-name` --- .../default.nix => by-name/at/attract-mode/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/attract-mode/default.nix => by-name/at/attract-mode/package.nix} (100%) diff --git a/pkgs/applications/emulators/attract-mode/default.nix b/pkgs/by-name/at/attract-mode/package.nix similarity index 100% rename from pkgs/applications/emulators/attract-mode/default.nix rename to pkgs/by-name/at/attract-mode/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b210c70cadb0..63116bc934e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2540,8 +2540,6 @@ with pkgs; unfreeEnableDiscord = true; }; - attract-mode = callPackage ../applications/emulators/attract-mode { }; - basiliskii = callPackage ../applications/emulators/basiliskii { }; box64 = callPackage ../applications/emulators/box64 { From 7b2c57a072daa15fa658b43d7799acefdd95a30a Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 21 Jul 2024 16:08:39 +0100 Subject: [PATCH 182/481] attract-mode: format with `nixfmt-rfc-style` --- pkgs/by-name/at/attract-mode/package.nix | 30 +++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/attract-mode/package.nix b/pkgs/by-name/at/attract-mode/package.nix index 53765e927a0d..abf2dfe9b751 100644 --- a/pkgs/by-name/at/attract-mode/package.nix +++ b/pkgs/by-name/at/attract-mode/package.nix @@ -1,5 +1,19 @@ -{ expat, fetchFromGitHub, ffmpeg_4, fontconfig, freetype, libarchive, libjpeg -, libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib +{ + expat, + fetchFromGitHub, + ffmpeg_4, + fontconfig, + freetype, + libarchive, + libjpeg, + libGLU, + libGL, + openal, + pkg-config, + sfml, + lib, + stdenv, + zlib, }: stdenv.mkDerivation rec { @@ -20,7 +34,17 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg_4 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib + expat + ffmpeg_4 + fontconfig + freetype + libarchive + libjpeg + libGLU + libGL + openal + sfml + zlib ]; meta = with lib; { From 1c8f82e0b3aa565f0adb723eb9dcfd058dc774ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 00:17:17 +0000 Subject: [PATCH 183/481] simdjson: 3.9.5 -> 3.10.0 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 8ef7308764b3..5f2c020c30f6 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.9.5"; + version = "3.10.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-OCEHfjyWLxjThe1nrXIexMa4rI7RWt+3qnQErxHc7CU="; + sha256 = "sha256-MKaYThfAbQiUHBFPAWJatKdLJdmJfsR3o8gp81RE3SI="; }; nativeBuildInputs = [ cmake ]; From fae007be061dce15b771ee61174b229055438519 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 01:41:10 +0000 Subject: [PATCH 184/481] steampipePackages.steampipe-plugin-aws: 0.138.0 -> 0.144.0 --- .../steampipe-packages/steampipe-plugin-aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix index 7e3952665e21..6debf3e507bf 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-aws"; - version = "0.138.0"; + version = "0.144.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-2iJCCntjv9S+mJtszGY0RbHYQr59umTry/L4vDv9nLs="; + hash = "sha256-ZPTB8qbR0qJOJ7mQZuU370/s97kWJc7TtTuSqjqrleA="; }; - vendorHash = "sha256-Nz5eq64YV82foMH9l5o/lDlVcbsWwS2ftRTIdA5+EnA="; + vendorHash = "sha256-h0+ffKSyEU7lSqbL+LwqRZp563AlAGpzMbtg3qdOjrk="; ldflags = [ "-s" From 3ab88dc28b6fd7a5851057f122aaedab27d140a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 02:01:29 +0000 Subject: [PATCH 185/481] pmacct: 1.7.8 -> 1.7.9 --- pkgs/tools/networking/pmacct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix index 620f2e965c34..542339b05dbb 100644 --- a/pkgs/tools/networking/pmacct/default.nix +++ b/pkgs/tools/networking/pmacct/default.nix @@ -18,14 +18,14 @@ }: stdenv.mkDerivation rec { - version = "1.7.8"; + version = "1.7.9"; pname = "pmacct"; src = fetchFromGitHub { owner = "pmacct"; repo = "pmacct"; rev = "v${version}"; - hash = "sha256-AcgZ5/8d1U/zGs4QeOkgkZS7ttCW6gtUv/Xuf4O4VE0="; + hash = "sha256-3gV6GUhTQnH09NRIJQI0xBn05Bgo3AJsE2cSxNPXITo="; }; nativeBuildInputs = [ From 2d44e42d984fa31fd1fea99fc88833a68a63cd2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 02:01:33 +0000 Subject: [PATCH 186/481] steampipePackages.steampipe-plugin-github: 0.41.0 -> 0.42.0 --- .../steampipe-packages/steampipe-plugin-github/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix index f1b829d5b3b2..3ab7a37f6236 100644 --- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix +++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "steampipe-plugin-github"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe-plugin-github"; rev = "refs/tags/v${version}"; - hash = "sha256-HrtAeQrJJhM1FroeIAVp9ItCFJR/7KkZQLs5QHDVtxw="; + hash = "sha256-GtlUSIjRLlO/ICdWV9QNjLyBwM+/Jpt4INIaHst4Tao="; }; - vendorHash = "sha256-GVd0Mif1gsANCBz/0db0Pvcgf3XW1CsZTKgiZ4pWaaI="; + vendorHash = "sha256-UivLueePtstJtAWbl7li8FzZ41Q2kF9FYzVYdQ4172g="; ldflags = [ "-s" From 5e1a7105f53fe14eeeb983ec85928691b164cf2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 02:16:14 +0000 Subject: [PATCH 187/481] laurel: 0.6.2 -> 0.6.3 --- pkgs/servers/monitoring/laurel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index c96de249f5e5..56bbfc09cb52 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "threathunters-io"; repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-1V5VonSH631bS5sIYkHC3lk4yumDCJ+LZHE00Kbx+J8="; + hash = "sha256-vasu4ffSdiyeXGV8JUZYL3I/04UvZ/mOImdE45la9y8="; }; - cargoHash = "sha256-GhgGMETOOPjG6ANwwavI5lhMmByq73KDHvcO5pnADHE="; + cargoHash = "sha256-uQs+BUBWdbSoE3UqrSjqImVm5uwYf7XiTFtGG1BcFZI="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; From dc696e8084dbd13b915357ff51920253927cfc3c Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 2 Aug 2024 01:32:51 -0400 Subject: [PATCH 188/481] brave: 1.67.134 -> 1.68.134 https://community.brave.com/t/release-channel-1-68-134/560701 --- .../networking/browsers/brave/default.nix | 16 ++++++++-------- .../networking/browsers/brave/update.sh | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index abb49edcc0dc..923a23c489b9 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -4,19 +4,19 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( if stdenv.isAarch64 then - { + rec { pname = "brave"; - version = "1.67.134"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_arm64.deb"; - hash = "sha256-5wa4y+3PlcrT+U7xiPjkXqhpFz1rC+wyH6q9blmjaCI="; + version = "1.68.134"; + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; + hash = "sha256-FP+Afk62/aiKd6ZPX0zy76bzO3pJjm4pqauxluFYEl8="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then - { + rec { pname = "brave"; - version = "1.67.134"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_amd64.deb"; - hash = "sha256-OJYPV3yJkqGh4OdX4lFZNrOxv33ysFQSTwYmlToXOq8="; + version = "1.68.134"; + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + hash = "sha256-l07sbkM5gDMcXeMoWiWH/8nU+Y0ShyB2jIHsqEFaoew="; platform = "x86_64-linux"; } else diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh index c0b8d7cff415..04fbbc349419 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -24,18 +24,18 @@ cat > $SCRIPT_DIR/default.nix << EOF callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( if stdenv.isAarch64 then - { + rec { pname = "brave"; version = "${latestVersionAarch64}"; - url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAmd64}_arm64.deb"; + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; hash = "${hashAarch64}"; platform = "aarch64-linux"; } else if stdenv.isx86_64 then - { + rec { pname = "brave"; version = "${latestVersionAmd64}"; - url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb"; + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; hash = "${hashAmd64}"; platform = "x86_64-linux"; } From cdc9919a562332b5b9b9ae8679822e72b599b233 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 2 Aug 2024 06:53:04 +0100 Subject: [PATCH 189/481] nixosTests.bittorrent: avoid use of an alias By default the use of alias generates warning: $ nix build --no-link -f. nixosTests.bittorrent evaluation warning: transmission has been renamed to transmission_3 since transmission_4 is also available. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details) When alaises are disabled that causes the eval failure: error: attribute 'transmission' missing at /home/slyfox/dev/git/nixpkgs/nixos/tests/bittorrent.nix:24:36: 23| transmissionConfig = { ... }: { 24| environment.systemPackages = [ pkgs.transmission ]; | ^ 25| services.transmission = { Did you mean one of transmission_3 or transmission_4? --- nixos/tests/bittorrent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index b5f5982743a1..565e37cf0e56 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -21,7 +21,7 @@ let download-dir = "/var/lib/transmission/Downloads"; transmissionConfig = { ... }: { - environment.systemPackages = [ pkgs.transmission ]; + environment.systemPackages = [ pkgs.transmission_3 ]; services.transmission = { enable = true; settings = { From c7733a3ad267022886538ff6890ad614e572da2f Mon Sep 17 00:00:00 2001 From: danielalvsaaker <30574112+danielalvsaaker@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:27:00 +0200 Subject: [PATCH 190/481] fractal: 7 -> 8 --- .../instant-messengers/fractal/Cargo.lock | 2315 ++++++----------- .../instant-messengers/fractal/default.nix | 10 +- 2 files changed, 824 insertions(+), 1501 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock index 336cfeb7c00a..9be63cae42a0 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock @@ -4,21 +4,21 @@ version = 3 [[package]] name = "accessory" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850bb534b9dc04744fbbb71d30ad6d25a7e4cf6dc33e223c81ef3a92ebab4e0b" +checksum = "87537f9ae7cfa78d5b8ebd1a1db25959f5e737126be4d8eb44a5452fc4b63cde" dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -79,22 +79,9 @@ checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "ammonia" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" -dependencies = [ - "html5ever", - "maplit", - "once_cell", - "tendril", - "url", -] +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -123,9 +110,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "anymap2" @@ -144,7 +131,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -161,7 +148,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -187,9 +174,9 @@ checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "enumflags2", "futures-channel", @@ -212,34 +199,33 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "flate2", "futures-core", @@ -250,11 +236,11 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", @@ -269,21 +255,12 @@ dependencies = [ [[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", ] @@ -295,18 +272,18 @@ checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" [[package]] name = "async-process" -version = "2.2.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", "async-io", - "async-lock 3.3.0", + "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener", "futures-lite", "rustix", "tracing", @@ -315,13 +292,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -336,12 +313,12 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ "async-io", - "async-lock 2.8.0", + "async-lock", "atomic-waker", "cfg-if", "futures-core", @@ -349,7 +326,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -371,24 +348,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -411,9 +388,9 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "av1-grain" @@ -438,6 +415,61 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "backoff" version = "0.4.0" @@ -454,9 +486,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -467,23 +499,11 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -498,7 +518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "annotate-snippets", - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -509,7 +529,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -526,9 +546,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", ] @@ -541,15 +561,15 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec", @@ -584,18 +604,15 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] @@ -609,9 +626,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -621,9 +638,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -632,10 +649,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.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "bytesize" @@ -645,11 +668,11 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -658,13 +681,13 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -678,9 +701,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.92" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" dependencies = [ "jobserver", "libc", @@ -711,23 +734,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg-vis" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a2c3bf5fc10fe2ca157564fbe08a4cb2b0a7d2ff3fe2f9683e65d5e7c7859c" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chacha20" @@ -755,17 +766,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -781,9 +791,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -798,9 +808,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -868,22 +878,13 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -905,9 +906,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -915,18 +916,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -949,16 +938,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "serde", "subtle", @@ -973,14 +961,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -988,34 +976,34 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] -name = "data-encoding" -version = "2.5.0" +name = "date_header" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" [[package]] name = "deadpool" @@ -1031,9 +1019,9 @@ dependencies = [ [[package]] name = "deadpool-runtime" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" dependencies = [ "tokio", ] @@ -1051,9 +1039,9 @@ dependencies = [ [[package]] name = "deadpool-sync" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8db70494c13cae4ce67b4b4dafdaf828cf0df7237ab5b9e2fcabee4965d0a0a" +checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04" dependencies = [ "deadpool-runtime", ] @@ -1067,7 +1055,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1079,19 +1067,18 @@ dependencies = [ "const-oid", "der_derive", "flagset", - "pem-rfc7468", "zeroize", ] [[package]] name = "der_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1101,18 +1088,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", -] - -[[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]] @@ -1133,7 +1108,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1143,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1153,48 +1128,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "djb_hash" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -1223,39 +1166,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "endi" @@ -1265,9 +1178,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[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", @@ -1275,13 +1188,13 @@ 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.58", + "syn 2.0.71", ] [[package]] @@ -1292,9 +1205,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1302,26 +1215,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[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", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1330,21 +1226,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ - "event-listener 5.3.0", + "event-listener", "pin-project-lite", ] @@ -1366,9 +1252,9 @@ dependencies = [ [[package]] name = "eyeball" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42482893d982111055ce4b24234d6250396d3785767c6b04cedd84612a0b80fb" +checksum = "d93bd0ebf93d61d6332d3c09a96e97975968a44e19a64c947bde06e6baff383f" dependencies = [ "futures-core", "readlock", @@ -1377,9 +1263,9 @@ dependencies = [ [[package]] name = "eyeball-im" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021fab29d9670be5867b16d56a95c29a12c3c1bb654e7d589010a028716d625d" +checksum = "2ae8c5165c9770f3ec7cccce12f4c5d70f01fa8bf84cf30cfbfd5a1c6f8901d5" dependencies = [ "futures-core", "imbl", @@ -1390,9 +1276,9 @@ dependencies = [ [[package]] name = "eyeball-im-util" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fea22ab33f31f2fac1a3a81b9024b461e28518f3262fecb6156943221e9960" +checksum = "32b6b037e2cdce928a432ecc2880c944e5436d8a38c827974b882ad373f60037" dependencies = [ "arrayvec", "eyeball-im", @@ -1423,14 +1309,14 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1441,21 +1327,11 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - [[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "field-offset" @@ -1469,15 +1345,15 @@ dependencies = [ [[package]] name = "flagset" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" +checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1489,7 +1365,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -1524,11 +1400,10 @@ dependencies = [ [[package]] name = "fractal" -version = "7.0.0" +version = "8.0.0" dependencies = [ "ashpd", "djb_hash", - "eyeball-im", "futures-channel", "futures-util", "geo-uri", @@ -1540,20 +1415,18 @@ dependencies = [ "gstreamer-play", "gstreamer-video", "gtk4", - "html-escape", - "html2pango", - "html5gum", "image", - "indexmap 2.2.6", + "indexmap", "libadwaita", "libshumate", + "linkify", "matrix-sdk", "matrix-sdk-ui", "mime", "mime_guess", "once_cell", "oo7", - "pulldown-cmark 0.10.2", + "pulldown-cmark", "qrcode", "rand", "regex", @@ -1566,7 +1439,9 @@ dependencies = [ "sourceview5", "strum", "thiserror", + "tld", "tokio", + "tokio-stream", "tracing", "tracing-subscriber", "url", @@ -1651,7 +1526,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1723,9 +1598,9 @@ checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1735,22 +1610,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gdk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1763,9 +1638,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1775,14 +1650,14 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gdk4-win32" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6181b6e5c91ee292dca0032b00d48dee8e61358253742c9752537a88486b3f" +checksum = "05afbcc8165b10f9143d2c4e4a589fce3a5071c6b20d75dd40704266d6eb4bb4" dependencies = [ "gdk4", "gdk4-win32-sys", @@ -1793,14 +1668,14 @@ dependencies = [ [[package]] name = "gdk4-win32-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8530d6619cf43f007f3efd993a356e1ca4e643c4d0bd2a99832a08af2e402" +checksum = "198c0604ceb45732c76b1fdb696d92b99400ea3a1c549fc5e40f4d79f8033205" dependencies = [ "gdk4-sys", "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -1811,7 +1686,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -1835,9 +1709,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1878,15 +1752,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845" +checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" dependencies = [ "futures-channel", "futures-core", @@ -1902,24 +1776,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -1937,25 +1811,25 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71" +checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" dependencies = [ - "heck 0.5.0", - "proc-macro-crate 3.1.0", + "heck", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "glib-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" dependencies = [ "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -1991,20 +1865,20 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" dependencies = [ "glib", "graphene-sys", @@ -2013,32 +1887,33 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps", + "system-deps 7.0.1", ] [[package]] -name = "group" -version = "0.13.0" +name = "growable-bloom-filter" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "c669fa03050eb3445343f215d62fc1ab831e8098bc9a55f26e9724faff11075c" dependencies = [ - "ff", - "rand_core", - "subtle", + "serde", + "serde_bytes", + "serde_derive", + "xxhash-rust", ] [[package]] name = "gsk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -2051,9 +1926,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -2062,14 +1937,14 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gst-plugin-gtk4" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c12132d3619f85db54f6034b4e3872577886657b07e055c521baeb2d5f6733" +checksum = "69b98aeb531b6cf9c3a6eb36742cedc0168054e2f040b76ddc61260c10dec589" dependencies = [ "async-channel", "gdk4-win32", @@ -2090,14 +1965,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e5e874f1660252fd2ec81c602066df3633b3a6fcbe2b196f7f93c27cf069b2a" dependencies = [ "chrono", - "toml_edit 0.22.9", + "toml_edit 0.22.16", ] [[package]] name = "gstreamer" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6f2d7dcde4b42b5297d25e9f51914cacfa148c99ba6ddabebf006fb2b18c20" +checksum = "21e95b1d1153239a621ec143501fdcca6c1ad3efb87d268597285f85c4136f73" dependencies = [ "cfg-if", "futures-channel", @@ -2105,7 +1980,7 @@ dependencies = [ "futures-util", "glib", "gstreamer-sys", - "itertools 0.12.1", + "itertools 0.13.0", "libc", "muldiv", "num-integer", @@ -2120,9 +1995,9 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a5de9ced05f9650168a74c7a4afeddbf3e63af595a7d56a700765be3b4869c" +checksum = "50c434cbdde750d82853a978a59eb96e270c238d721a41bee0f37bfdc771f997" dependencies = [ "cfg-if", "glib", @@ -2136,23 +2011,23 @@ dependencies = [ [[package]] name = "gstreamer-audio-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d92a1e2a915874f70f0a33c3ea4589bc6b66a138b6ec8bb6acedf49bdec2c3" +checksum = "4bb0542026fb062c2880d15e712c0814336e3209a054da43a64c14f7570da02f" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-base" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" +checksum = "a3faa0b3cf361bf538dcb25b5cb7f6e73bd872ed031d85f3997b42d3fbd66409" dependencies = [ "atomic_refcell", "cfg-if", @@ -2164,22 +2039,22 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" +checksum = "4a6643ef963c636b8022adc93aa19eac6f356bd174a187c499339fc5d64c1e05" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-gl" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d21c0c5fbf74018a0254b3ab77bca0a5b2c0f002bcfd910c09113ae90a95d98" +checksum = "cfe28e4b7c72022958add8a3d86e7293ff227a5086c426731b5ec5a15ffbc759" dependencies = [ "glib", "gstreamer", @@ -2192,9 +2067,9 @@ dependencies = [ [[package]] name = "gstreamer-gl-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d1e3b9b02abc23835e9d770f2bd705b67a50406ea37e963b4526a77c6a7cd8" +checksum = "2bc2ff7c20ae47c4a80f42a67d85d6889a5fad3bc2385aec6dc9b58795920c5b" dependencies = [ "glib-sys", "gobject-sys", @@ -2202,14 +2077,14 @@ dependencies = [ "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-pbutils" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173b14cdf3d10bc57d136797946fe2091c322015d879919765c317a0ea5edb3" +checksum = "05155dded8d67ecae23d22b9e8cad67e16b46f9f9fec161cabfda804716bba4c" dependencies = [ "glib", "gstreamer", @@ -2222,9 +2097,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3afcb1df3d217b2a6b00aa7a391a779764b5be6ccb7dcf35b5690279c61c5c" +checksum = "5a1711616229f46a5767b79eb3bf15cb5ab9be9a721dc00b857f1cd6454387ac" dependencies = [ "glib-sys", "gobject-sys", @@ -2232,14 +2107,14 @@ dependencies = [ "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-play" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cd4315d97f8f38a6a6fdaad27d51cc67fd132785816091ad9985e197d2c052" +checksum = "fcc9fac3926d08f882d5a7b98fc7780b2ea812cbebc0c56c56c7186bde34fcdd" dependencies = [ "glib", "gstreamer", @@ -2250,35 +2125,35 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19def7b12d3a53c520ad661b8f4501ae04158627e4a9fc49cc30c4ea04522cbf" +checksum = "37ffb862566a025cb5477089bbcdb15cc871e317ad451169835a2c06efaa7097" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-sys" -version = "0.22.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-video" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc0a96481ecfcdd120d5057bb7ab5a6f6cd392cc34ba1e8b86cac3ba082f788" +checksum = "57332bca1ae7825a53fe57d993b63389f132d335aed691ac76f0ffe4304548e3" dependencies = [ "cfg-if", "futures-channel", @@ -2293,23 +2168,23 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ea7996ba44fbbf563aeeda96e24259efc9f06b407854d837ee58e260d7ba78" +checksum = "0f5c334d143384e8dc714af948c2e5d7d12cb588fdcfb56f3bf37c24daf350ef" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gtk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" +checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" dependencies = [ "cairo-rs", "field-offset", @@ -2328,23 +2203,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" +checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" dependencies = [ - "anyhow", - "proc-macro-crate 3.1.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] name = "gtk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -2356,26 +2229,7 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", + "system-deps 7.0.1", ] [[package]] @@ -2390,15 +2244,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -2410,39 +2258,9 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", ] -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -2455,6 +2273,12 @@ 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" @@ -2479,59 +2303,25 @@ dependencies = [ "digest", ] -[[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[package]] -name = "html2pango" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f061cc3c0538033f81a94417f209e2b1908e3dab8b87b205d84e6109c8091b" -dependencies = [ - "ammonia", - "anyhow", - "html5ever", - "linkify", - "maplit", - "markup5ever_rcdom", - "once_cell", - "regex", -] - [[package]] name = "html5ever" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" dependencies = [ "log", "mac", "markup5ever", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "html5gum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4e556171a058ba117bbe88b059fb37b6289023e007d2903ea6dca3a3cbff14" -dependencies = [ - "jetscii", + "syn 2.0.71", ] [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2540,26 +2330,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -2569,39 +2365,58 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2668,19 +2483,19 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ - "byteorder", - "thiserror", + "byteorder-lite", + "quick-error", ] [[package]] name = "imbl" -version = "2.0.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085" +checksum = "bc3be8d8cd36f33a46b1849f31f837c44d9fa87223baee3b4bd96b8f11df81eb" dependencies = [ "bitmaps", "imbl-sized-chunks", @@ -2707,18 +2522,18 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "include_dir" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ "include_dir_macros", ] [[package]] name = "include_dir_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ "proc-macro2", "quote", @@ -2741,17 +2556,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - [[package]] name = "indexmap" version = "2.2.6" @@ -2759,7 +2563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", "serde", ] @@ -2775,9 +2579,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", "js-sys", @@ -2793,7 +2597,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -2820,23 +2624,26 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jetscii" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" - [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2874,25 +2681,11 @@ dependencies = [ "serde", ] -[[package]] -name = "k256" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" -dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "once_cell", - "sha2", - "signature", -] - [[package]] name = "konst" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d712a8c49d4274f8d8a5cf61368cb5f3c143d149882b1a2918129e53395fdb0" +checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" dependencies = [ "const_panic", "konst_kernel", @@ -2901,29 +2694,20 @@ dependencies = [ [[package]] name = "konst_kernel" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac6ea8c376b6e208a81cf39b8e82bebf49652454d98a4829e907dac16ef1790" +checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" dependencies = [ "typewit", ] -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" -dependencies = [ - "serde", -] - [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -2940,11 +2724,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -2956,9 +2739,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -2967,14 +2750,14 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libfuzzer-sys" @@ -2989,12 +2772,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -3005,9 +2788,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libshumate" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd77c1202aaccef5460f4ca95b3b3c117f85986c942127e4e518c47058a6eaf6" +checksum = "fc9921cc829fb2d546bd6a3a158a4134002098887e0bb01ceb4535521af610ec" dependencies = [ "gdk-pixbuf", "gdk4", @@ -3020,9 +2803,9 @@ dependencies = [ [[package]] name = "libshumate-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5765221e416ebe7b5e9c5bd7e8dd09ca9e920b012474ca8f3da18f8e13c4a5" +checksum = "b238767323bdd28dc72471fa8a512ad0ae99a18d9668deb626c55f373f7aff81" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -3031,7 +2814,7 @@ dependencies = [ "gobject-sys", "gtk4-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -3040,7 +2823,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "convert_case", "cookie-factory", @@ -3048,7 +2831,7 @@ dependencies = [ "libspa-sys", "nix 0.27.1", "nom", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -3059,7 +2842,7 @@ checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ "bindgen", "cc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -3074,18 +2857,18 @@ dependencies = [ [[package]] name = "linkify" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5" +checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780" dependencies = [ "memchr", ] [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "locale_config" @@ -3102,9 +2885,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3112,9 +2895,9 @@ dependencies = [ [[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 = "loop9" @@ -3131,7 +2914,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -3160,7 +2943,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3171,7 +2954,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3184,7 +2967,7 @@ dependencies = [ "macroific_core", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3204,120 +2987,18 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "markup5ever" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" dependencies = [ "log", - "phf 0.10.1", + "phf", "phf_codegen", "string_cache", "string_cache_codegen", "tendril", ] -[[package]] -name = "markup5ever_rcdom" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] -name = "mas-http" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "bytes", - "futures-util", - "headers", - "http", - "http-body", - "hyper", - "opentelemetry", - "serde", - "serde_json", - "serde_urlencoded", - "thiserror", - "tower", - "tower-http", - "tracing", - "tracing-opentelemetry", -] - -[[package]] -name = "mas-iana" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "schemars", - "serde", -] - -[[package]] -name = "mas-jose" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "base64ct", - "chrono", - "digest", - "ecdsa", - "elliptic-curve", - "generic-array", - "hmac", - "k256", - "mas-iana", - "p256", - "p384", - "rand", - "rsa", - "schemars", - "sec1", - "serde", - "serde_json", - "serde_with", - "sha2", - "signature", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "mas-oidc-client" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "base64ct", - "bytes", - "chrono", - "form_urlencoded", - "futures-util", - "headers", - "http", - "language-tags", - "mas-http", - "mas-iana", - "mas-jose", - "mime", - "oauth2-types", - "rand", - "serde", - "serde_json", - "serde_urlencoded", - "serde_with", - "thiserror", - "tower", - "tracing", - "url", -] - [[package]] name = "matchers" version = "0.1.0" @@ -3328,10 +3009,16 @@ dependencies = [ ] [[package]] -name = "matrix-pickle" -version = "0.1.1" +name = "matchit" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fd26463ce5d86b8d9bb9c4142d453198ba22fb91bd46d3c9f144ae699d821d" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "matrix-pickle" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb521190328c57a2051f70250beb874dc0fac6bcd22b615f7f9700b7b4fb826" dependencies = [ "matrix-pickle-derive", "thiserror", @@ -3339,21 +3026,21 @@ dependencies = [ [[package]] name = "matrix-pickle-derive" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93779aa78d39c2fe34746287b10a866192cf8af1b81767fff76bd64099acc0f5" +checksum = "c6fb3c7231cbb7fbbc50871615edebf65183b382cdaa1fe21c5e88a12617de8e" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "matrix-sdk" version = "0.7.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "anymap2", "aquamarine", @@ -3361,26 +3048,21 @@ dependencies = [ "async-channel", "async-stream", "async-trait", + "axum", "backoff", "bytes", "bytesize", - "cfg-vis", - "chrono", - "event-listener 4.0.3", + "event-listener", "eyeball", "eyeball-im", - "eyeball-im-util", "futures-core", "futures-util", "gloo-timers", "http", - "hyper", "image", "imbl", - "indexmap 2.2.6", + "indexmap", "js_int", - "language-tags", - "mas-oidc-client", "matrix-sdk-base", "matrix-sdk-common", "matrix-sdk-indexeddb", @@ -3393,7 +3075,6 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "sha2", "tempfile", "thiserror", "tokio", @@ -3403,20 +3084,22 @@ dependencies = [ "tracing", "url", "urlencoding", + "vodozemac", "zeroize", ] [[package]] name = "matrix-sdk-base" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "as_variant", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "eyeball", "eyeball-im", "futures-util", + "growable-bloom-filter", "matrix-sdk-common", "matrix-sdk-crypto", "matrix-sdk-store-encryption", @@ -3432,7 +3115,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "async-trait", "futures-core", @@ -3453,8 +3136,8 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "aes", "as_variant", @@ -3487,6 +3170,7 @@ dependencies = [ "tokio-stream", "tracing", "ulid", + "url", "vodozemac", "zeroize", ] @@ -3494,13 +3178,14 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "anyhow", "async-trait", - "base64 0.21.7", + "base64", "getrandom", "gloo-utils", + "hkdf", "indexed_db_futures", "js-sys", "matrix-sdk-crypto", @@ -3509,17 +3194,19 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_json", + "sha2", "thiserror", "tokio", "tracing", "wasm-bindgen", "web-sys", + "zeroize", ] [[package]] name = "matrix-sdk-qrcode" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "byteorder", "qrcode", @@ -3531,7 +3218,7 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "async-trait", "deadpool-sqlite", @@ -3553,12 +3240,11 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ - "base64 0.21.7", + "base64", "blake3", "chacha20poly1305", - "displaydoc", "hmac", "pbkdf2", "rand", @@ -3573,7 +3259,7 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "as_variant", "async-once-cell", @@ -3588,8 +3274,9 @@ dependencies = [ "futures-core", "futures-util", "fuzzy-matcher", + "growable-bloom-filter", "imbl", - "indexmap 2.2.6", + "indexmap", "itertools 0.12.1", "matrix-sdk", "matrix-sdk-base", @@ -3603,7 +3290,6 @@ dependencies = [ "tokio", "tracing", "unicode-normalization", - "url", ] [[package]] @@ -3618,9 +3304,9 @@ 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 = "memoffset" @@ -3645,9 +3331,9 @@ checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -3661,9 +3347,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -3688,11 +3374,10 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -3716,18 +3401,18 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", ] [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -3762,9 +3447,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -3776,11 +3461,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -3805,9 +3489,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3826,7 +3510,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3840,9 +3524,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -3851,11 +3535,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -3863,12 +3546,11 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -3877,30 +3559,10 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] -[[package]] -name = "oauth2-types" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "chrono", - "data-encoding", - "http", - "language-tags", - "mas-iana", - "mas-jose", - "parse-display", - "serde", - "serde_json", - "serde_with", - "sha2", - "thiserror", - "url", -] - [[package]] name = "objc" version = "0.2.7" @@ -3932,9 +3594,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -3947,10 +3609,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oo7" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82" +checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" dependencies = [ + "endi", "futures-util", "num", "num-bigint-dig", @@ -3976,7 +3639,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -3993,7 +3656,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4014,40 +3677,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry", - "ordered-float", - "percent-encoding", - "rand", - "thiserror", -] - [[package]] name = "option-operations" version = "0.5.0" @@ -4057,15 +3686,6 @@ dependencies = [ "paste", ] -[[package]] -name = "ordered-float" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-stream" version = "0.2.0" @@ -4082,35 +3702,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - [[package]] name = "pango" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" +checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" dependencies = [ "gio", "glib", @@ -4120,14 +3716,14 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -4138,9 +3734,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4148,47 +3744,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "parse-display" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5" -dependencies = [ - "parse-display-derive", - "regex", - "regex-syntax 0.8.3", -] - -[[package]] -name = "parse-display-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "regex-syntax 0.8.3", - "structmeta", - "syn 2.0.58", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -4200,30 +3771,12 @@ dependencies = [ "hmac", ] -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - [[package]] name = "phf" version = "0.11.2" @@ -4236,12 +3789,12 @@ dependencies = [ [[package]] name = "phf_codegen" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", + "phf_generator 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -4274,7 +3827,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4312,7 +3865,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4329,9 +3882,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -4345,7 +3898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libspa", "libspa-sys", @@ -4363,18 +3916,7 @@ checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ "bindgen", "libspa-sys", - "system-deps", -] - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", + "system-deps 6.2.2", ] [[package]] @@ -4404,12 +3946,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "png" version = "0.17.13" @@ -4425,13 +3961,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -4467,34 +4003,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -4530,9 +4038,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4553,14 +4061,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "prost" -version = "0.12.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -4568,35 +4076,24 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "pulldown-cmark" -version = "0.9.6" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" dependencies = [ - "bitflags 2.5.0", - "memchr", - "unicase", -] - -[[package]] -name = "pulldown-cmark" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "getopts", "memchr", "pulldown-cmark-escape", @@ -4605,9 +4102,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "qoi" @@ -4620,9 +4117,9 @@ dependencies = [ [[package]] name = "qrcode" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d" +checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" dependencies = [ "image", ] @@ -4710,7 +4207,7 @@ dependencies = [ "rand", "rand_chacha", "simd_helpers", - "system-deps", + "system-deps 6.2.2", "thiserror", "v_frame", "wasm-bindgen", @@ -4718,9 +4215,9 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.5" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" dependencies = [ "avif-serialize", "imgref", @@ -4753,29 +4250,29 @@ dependencies = [ [[package]] name = "readlock" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b323e7196daa571c8584de958be19e92941c41f845776fe06babfe8fa280a2" +checksum = "072cfe5b1d2dcd38d20e18f85e9c9978b6cc08f0b373e9f1fff1541335622974" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -4789,13 +4286,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -4806,27 +4303,27 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "async-compression", - "base64 0.21.7", + "base64", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4839,8 +4336,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 1.0.1", "tokio", "tokio-native-tls", "tokio-socks", @@ -4854,30 +4350,20 @@ dependencies = [ "winreg", ] -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" dependencies = [ "bytemuck", ] [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -4886,9 +4372,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -4906,30 +4392,10 @@ dependencies = [ "lru", ] -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "ruma" -version = "0.9.4" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.10.1" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "assign", "js_int", @@ -4940,16 +4406,18 @@ dependencies = [ "ruma-federation-api", "ruma-html", "ruma-push-gateway-api", + "web-time", ] [[package]] name = "ruma-client-api" -version = "0.17.4" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.18.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", "assign", "bytes", + "date_header", "http", "js_int", "js_option", @@ -4959,20 +4427,23 @@ dependencies = [ "serde", "serde_html_form", "serde_json", + "thiserror", + "url", + "web-time", ] [[package]] name = "ruma-common" -version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.13.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", - "base64 0.21.7", + "base64", "bytes", "form_urlencoded", "getrandom", "http", - "indexmap 2.2.6", + "indexmap", "js-sys", "js_int", "konst", @@ -4995,15 +4466,15 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.27.11" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.28.1" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", - "indexmap 2.2.6", + "indexmap", "js_int", "js_option", "percent-encoding", - "pulldown-cmark 0.9.6", + "pulldown-cmark", "regex", "ruma-common", "ruma-html", @@ -5014,13 +4485,14 @@ dependencies = [ "thiserror", "tracing", "url", + "web-time", "wildmatch", ] [[package]] name = "ruma-federation-api" -version = "0.8.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "ruma-common", @@ -5031,20 +4503,21 @@ dependencies = [ [[package]] name = "ruma-html" -version = "0.1.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.2.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", "html5ever", - "phf 0.11.2", + "phf", + "ruma-common", "tracing", "wildmatch", ] [[package]] name = "ruma-identifiers-validation" -version = "0.9.3" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.5" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "thiserror", @@ -5052,23 +4525,23 @@ dependencies = [ [[package]] name = "ruma-macros" -version = "0.12.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.13.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro2", "quote", "ruma-identifiers-validation", "serde", - "syn 2.0.58", + "syn 2.0.71", "toml", ] [[package]] name = "ruma-push-gateway-api" -version = "0.8.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "ruma-common", @@ -5083,7 +4556,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -5093,9 +4566,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -5114,11 +4587,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5127,24 +4600,31 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64", + "rustls-pki-types", ] [[package]] -name = "rustversion" -version = "1.0.15" +name = "rustls-pki-types" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -5155,53 +4635,12 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "schemars" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" -dependencies = [ - "chrono", - "dyn-clone", - "indexmap 1.9.3", - "schemars_derive", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "schemars_derive" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - [[package]] name = "secular" version = "1.0.1" @@ -5213,11 +4652,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -5226,9 +4665,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -5236,15 +4675,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -5262,33 +4701,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] @@ -5298,7 +4726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" dependencies = [ "form_urlencoded", - "indexmap 2.2.6", + "indexmap", "itoa", "ryu", "serde", @@ -5306,16 +4734,25 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "indexmap 2.2.6", "itoa", "ryu", "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + [[package]] name = "serde_repr" version = "0.1.19" @@ -5324,14 +4761,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -5348,36 +4785,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" -dependencies = [ - "base64 0.21.7", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.6", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "sha1" version = "0.10.6" @@ -5417,9 +4824,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -5430,7 +4837,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest", "rand_core", ] @@ -5472,9 +4878,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5482,9 +4888,9 @@ dependencies = [ [[package]] name = "sourceview5" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0bf70f2f1ac4624af22056f9c4cf58dccff73dafc7207b46fbd3df7b57410f" +checksum = "905c83b38d4aff1800a12adba65b083deba61b4d948f62fc2ff7ad7d77656d05" dependencies = [ "futures-channel", "futures-core", @@ -5500,9 +4906,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac236ad7ce6dad2b819ced8b68b5a1cf4d968aa301cb9a7692470eb21f657be" +checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -5512,15 +4918,9 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -5574,60 +4974,37 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "structmeta" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn 2.0.58", -] - -[[package]] -name = "structmeta-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.71", ] [[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 = "syn" @@ -5642,9 +5019,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -5658,25 +5035,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "system-configuration" -version = "0.5.1" +name = "sync_wrapper" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "system-deps" @@ -5685,7 +5047,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.5.0", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "system-deps" +version = "7.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" +dependencies = [ + "cfg-expr", + "heck", "pkg-config", "toml", "version-compare", @@ -5693,9 +5068,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "temp-dir" @@ -5728,22 +5103,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -5800,9 +5175,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5814,10 +5189,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tokio" -version = "1.37.0" +name = "tld" +version = "2.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "73ca5fc340fcb4f52570c502cf443fc22d5521e9ef2bb03528e3634254016cf7" +dependencies = [ + "phf", + "phf_codegen", +] + +[[package]] +name = "tokio" +version = "1.38.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -5834,13 +5219,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -5879,83 +5264,60 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.16", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.6", - "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 2.2.6", + "indexmap", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ - "indexmap 2.2.6", + "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.13", ] [[package]] @@ -5974,24 +5336,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "bitflags 2.5.0", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.2" @@ -6024,7 +5368,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -6048,22 +5392,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-opentelemetry" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "tracing", - "tracing-core", - "tracing-subscriber", - "web-time", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" @@ -6122,9 +5450,9 @@ dependencies = [ [[package]] name = "ulid" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" dependencies = [ "getrandom", "rand", @@ -6169,9 +5497,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "universal-hash" @@ -6185,9 +5513,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -6207,12 +5535,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - [[package]] name = "uuid" version = "1.6.1" @@ -6260,13 +5582,16 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vodozemac" -version = "0.5.1" -source = "git+https://github.com/matrix-org/vodozemac?rev=0c75746fc8a5eda4a0e490d345d1798b4c6cbd67#0c75746fc8a5eda4a0e490d345d1798b4c6cbd67" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051d4af70b53b42adf2aac459a305851b8d754f210aaf11ab509e1065beff422" dependencies = [ "aes", "arrayvec", - "base64 0.22.0", + "base64", + "base64ct", "cbc", + "chacha20poly1305", "curve25519-dalek", "ed25519-dalek", "getrandom", @@ -6322,7 +5647,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", "wasm-bindgen-shared", ] @@ -6356,7 +5681,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6408,9 +5733,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wildmatch" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939e59c1bc731542357fdaad98b209ef78c8743d652bb61439d16b16a79eb025" +checksum = "3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19" [[package]] name = "winapi" @@ -6440,7 +5765,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6458,7 +5783,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6478,17 +5803,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "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.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6499,9 +5825,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6511,9 +5837,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6523,9 +5849,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6535,9 +5867,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6547,9 +5879,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6559,9 +5891,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6571,9 +5903,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -6586,18 +5918,18 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -6628,24 +5960,19 @@ dependencies = [ [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "xml5ever" -version = "0.17.0" +name = "xxhash-rust" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" -dependencies = [ - "log", - "mac", - "markup5ever", -] +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" [[package]] name = "yansi-term" @@ -6658,22 +5985,21 @@ dependencies = [ [[package]] name = "zbus" -version = "4.1.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "derivative", "enumflags2", - "event-listener 5.3.0", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.28.0", + "nix 0.29.0", "ordered-stream", "rand", "serde", @@ -6692,15 +6018,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.71", "zvariant_utils", ] @@ -6717,29 +6042,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -6752,7 +6077,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -6781,9 +6106,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.0.2" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ "endi", "enumflags2", @@ -6795,24 +6120,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 56593cc315cb..887a5cc17241 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -25,23 +25,21 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "7"; + version = "8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; rev = "refs/tags/${version}"; - hash = "sha256-IfcThpsGATMD3Uj9tvw/aK7IVbiVT8sdZ088gRUqnlg="; + hash = "sha256-a77+lPH2eqWTLFrYfcBXSvbyyYC52zSo+Rh/diqKYx4="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "mas-http-0.8.0" = "sha256-IiYxF9qT/J/n8t/cVT/DRV3gl2MTA6/YfjshVIic/n4="; - "matrix-sdk-0.7.1" = "sha256-quwt9Dx0K6LDMwHBipc52Ek59zz5mlTAdOj+RXZBU3Q="; - "ruma-0.9.4" = "sha256-tp0EFS39UTXZJQPUDjeQixb8wzsMCzyFggVj6M8TRYg="; - "vodozemac-0.5.1" = "sha256-Hm0C696RmNX6n1Jx+hqkKMjpdbArliuzdiS4wCv3OIM="; + "matrix-sdk-0.7.1" = "sha256-ZlkxGXGrmZ8VQV7UY7A7BBfcqFCAB9Ep7l65irx4Dy8="; + "ruma-0.10.1" = "sha256-C/GJ0hDWJ9/grfjMuPSatJq2SrVkV0jxQlAAASkUWqg="; }; }; From 7985734e0fafdba50aded28b956074699d7ad433 Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Wed, 31 Jul 2024 18:44:52 +0200 Subject: [PATCH 191/481] switcheroo: add missing imagemagick dependency --- pkgs/by-name/sw/switcheroo/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix index 632960d70bcc..459f4a93793f 100644 --- a/pkgs/by-name/sw/switcheroo/package.nix +++ b/pkgs/by-name/sw/switcheroo/package.nix @@ -6,6 +6,7 @@ , fetchFromGitLab , glib , gtk4 +, imagemagick , libadwaita , meson , ninja @@ -53,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: { darwin.apple_sdk.frameworks.Foundation ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ imagemagick ]}" + ) + ''; + # Workaround for the gettext-sys issue # https://github.com/Koka/gettext-rs/issues/114 env.NIX_CFLAGS_COMPILE = lib.optionalString From b0d7dec1b5a2fac3dcd74cf0b777b1831295b9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Jul 2024 08:05:40 -0700 Subject: [PATCH 192/481] python312Packages.pyoverkiz: only depend on backports-strenum on Python < 3.11 --- .../python-modules/pyoverkiz/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 929d98ef0b57..bca06fd41de6 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -7,6 +7,7 @@ boto3, buildPythonPackage, fetchFromGitHub, + fetchpatch2, poetry-core, pyhumps, pytest-asyncio, @@ -29,10 +30,14 @@ buildPythonPackage rec { hash = "sha256-HlDydPreHe/O+fqVwjkwQlQx0o9UxI/fwA+idB02Gng="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"' - ''; + patches = [ + # https://github.com/iMicknl/python-overkiz-api/pull/1309 + (fetchpatch2 { + url = "https://github.com/iMicknl/python-overkiz-api/commit/9e5bbec3fc88faac9dae0c0c001ed7582c4933e2.patch"; + excludes = [ "poetry.lock" ]; + hash = "sha256-KzagDvljkKoUJT+41o7Jv5OPLpPXQDeGmz3O/HOk1YQ="; + }) + ]; build-system = [ poetry-core ]; @@ -40,11 +45,10 @@ buildPythonPackage rec { aiohttp attrs backoff - backports-strenum boto3 pyhumps warrant-lite - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ backports-strenum ]; nativeCheckInputs = [ pytest-asyncio From 4a7c396766098b2f2f756dc477d2821d2e9efd57 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:21:10 +0300 Subject: [PATCH 193/481] koboldcpp: 1.71.1 -> 1.72 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.72 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.71.1...v1.72 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index aecb24f217f3..1b3e89c11be4 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.71.1"; + version = "1.72"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-69iqpXzG9NXrqv08lJ36hlHWXwXUJs6yqcaGr32cHPw="; + hash = "sha256-DePcBVNXIWIlOXyNeNMUFFIQxQuwqG8KBUh2/X7R6X8="; }; enableParallelBuilding = true; From 9f6e9449fca3a7f5a5775eb6db6711431f1114e8 Mon Sep 17 00:00:00 2001 From: esthromeris Date: Fri, 2 Aug 2024 13:56:44 +0200 Subject: [PATCH 194/481] fallout-ce: remove TheBrainScrambler as maintainer --- pkgs/games/fallout-ce/build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/fallout-ce/build.nix b/pkgs/games/fallout-ce/build.nix index c220895db08c..58305487d7c1 100644 --- a/pkgs/games/fallout-ce/build.nix +++ b/pkgs/games/fallout-ce/build.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { meta = with lib; { license = licenses.sustainableUse; - maintainers = with maintainers; [ hughobrien TheBrainScrambler ]; + maintainers = with maintainers; [ hughobrien ]; platforms = platforms.linux; } // extraMeta; } From 4ec746337634ceebbaa0a35372dc2227412be55a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 13:02:50 +0000 Subject: [PATCH 195/481] carapace: 1.0.4 -> 1.0.5 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 37b3d67559c9..65df6529242b 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-ht0zeeePU2fPMP7/Q0K2VKUudVCa4T94sESJCxix04M="; + hash = "sha256-PDxYRFf7nQfPb6uazwRmZOvCy3xMF5OqHDLy7hsFSBE="; }; - vendorHash = "sha256-XDX59HFf0yMEy9D5nQLZk1LeKrBcgC8M5kUyGiy29Ak="; + vendorHash = "sha256-GnwOyIKJ1K8+0a+VrXcohclgxnQTezu4S0C2cJO+ULU="; ldflags = [ "-s" From 2a3d5d1e9fd2877cdd8a149b7e1e8f1c69eb0ddb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 13:03:16 +0000 Subject: [PATCH 196/481] d2: 0.6.5 -> 0.6.6 --- pkgs/tools/text/d2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 8a6641102269..8e0f8f7a8d6d 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "d2"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yEYdFpIIY+nAaeMPEwgz0th2rf67LeYK19Ov9QB/7J0="; + hash = "sha256-SAejVwqTa/yV1pAIltAkX25KxITfkbzP9SGcLQdPUCg="; }; vendorHash = "sha256-aoc8KSznkWJpn0Ye7FUOH5sNQ4fslIGJhIaQdGrwcqQ="; From 29c6f7dbcfc8b4e562f9285ec516f83a6ffed97e Mon Sep 17 00:00:00 2001 From: matthiasdotsh Date: Thu, 23 May 2024 13:19:56 +0000 Subject: [PATCH 197/481] maintainers: add matthiasdotsh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b670176d03ea..c6c4b4c47b61 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12686,6 +12686,12 @@ githubId = 427866; name = "Matthias Beyer"; }; + matthiasdotsh = { + email = "git@matthias.sh"; + name = "Matthias"; + github = "matthiasdotsh"; + githubId = 142118899; + }; matthiasq = { email = "matthias.queitsch@mailbox.org"; github = "matthias-Q"; From d8d017d906e427e4ee162bd6998fd7e07374d188 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 13:44:51 +0000 Subject: [PATCH 198/481] go-mockery: 2.43.2 -> 2.44.1 --- pkgs/development/tools/go-mockery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index b43c635145cc..551934001bda 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.43.2"; + version = "2.44.1"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-qOiWWyhNNxjaIuFTzhJwog9wPNWa82/JYc0ST6s0OkA="; + sha256 = "sha256-FaQzGkMUgf3QRM3gjlvUEDmnb1mZ8Yd85E4ONB5yCm4="; }; preCheck = '' From 77a4902508ec390c891a10299fb7be953b450d84 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 2 Aug 2024 16:41:05 +0200 Subject: [PATCH 199/481] pixelfed: drop raitobezarius as a maintainer I'm not using seriously Pixelfed those days, this software is non-trivial and the NixOS module seems to have some sharp edges. Change-Id: Ie93df9dcb00d0a58bd5e4165e377979c489af0b0 Signed-off-by: Raito Bezarius --- nixos/tests/web-apps/pixelfed/standard.nix | 2 +- pkgs/servers/web-apps/pixelfed/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/web-apps/pixelfed/standard.nix b/nixos/tests/web-apps/pixelfed/standard.nix index 9260e27af960..3e56dda8f07c 100644 --- a/nixos/tests/web-apps/pixelfed/standard.nix +++ b/nixos/tests/web-apps/pixelfed/standard.nix @@ -1,7 +1,7 @@ import ../../make-test-python.nix ({pkgs, ...}: { name = "pixelfed-standard"; - meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; + meta.maintainers = [ ]; nodes = { server = { pkgs, ... }: { diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index 0d696b33a639..0243b05f6df0 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -43,7 +43,7 @@ php.buildComposerProject (finalAttrs: { description = "Federated image sharing platform"; license = licenses.agpl3Only; homepage = "https://pixelfed.org/"; - maintainers = with maintainers; [ raitobezarius ]; + maintainers = [ ]; platforms = php.meta.platforms; }; }) From 5048af9f17b5650112c5571cc32af89b1325cbfa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 00:52:35 +0000 Subject: [PATCH 200/481] python312Packages.scikit-rf: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/scikit-rf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index 79a27c1dfaaf..a59817d42491 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -33,16 +33,16 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "scikit-rf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xLgttefCRj8U2Wqif/28FiSjPjQn9YYCB+stlhZiIUo="; + hash = "sha256-K+iOpgEKwYtv8be/dLeDHYUDI8xZsoqB7mYDkVeCA10="; }; buildInputs = [ setuptools ]; From c596b526d6eacafeea46da7e46108dea0c507f72 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 3 Aug 2024 00:20:48 +0900 Subject: [PATCH 201/481] python312Packages.scikit-rf: refactor --- .../python-modules/scikit-rf/default.nix | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index a59817d42491..39a5e8437ab1 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -8,9 +8,6 @@ scipy, pandas, matplotlib, - tox, - coverage, - flake8, nbval, pyvisa, networkx, @@ -22,12 +19,8 @@ sphinx, nbsphinx, openpyxl, - qtpy, - pyqtgraph, - pyqt5, setuptools, pytestCheckHook, - pytest-cov, pytest-mock, }: @@ -40,20 +33,25 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-rf"; - repo = pname; + repo = "scikit-rf"; rev = "refs/tags/v${version}"; hash = "sha256-K+iOpgEKwYtv8be/dLeDHYUDI8xZsoqB7mYDkVeCA10="; }; - buildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov=skrf" "" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ numpy scipy pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { plot = [ matplotlib ]; xlsx = [ openpyxl ]; netw = [ networkx ]; @@ -68,28 +66,20 @@ buildPythonPackage rec { nbsphinx openpyxl ]; - qtapps = [ - qtpy - pyqtgraph - pyqt5 - ]; }; + env = lib.optionalAttrs stdenv.isDarwin { MPLBACKEND = "Agg"; }; + nativeCheckInputs = [ - tox - coverage - flake8 - pytest-cov pytest-mock nbval matplotlib pyvisa openpyxl networkx + pytestCheckHook ]; - checkInputs = [ pytestCheckHook ]; - # test_calibration.py generates a divide by zero error on darwin # https://github.com/scikit-rf/scikit-rf/issues/972 disabledTestPaths = lib.optional ( From 35aef7f6b5e3b482f788ecda14d1e19f8ffe902c Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 2 Aug 2024 19:24:25 +0530 Subject: [PATCH 202/481] hugo: 0.130.0 -> 0.131.0 Diff: https://github.com/gohugoio/hugo/compare/refs/tags/v0.130.0...v0.131.0 Changelog: https://github.com/gohugoio/hugo/releases/tag/v0.131.0 Signed-off-by: Muhammad Falak R Wani --- pkgs/by-name/hu/hugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index b1e9c50b24f8..e88b62309830 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.130.0"; + version = "0.131.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-ZZYItkQI9qxQ/STmvZQoL9kbQGIa+t7zeINeEvGHiG8="; + hash = "sha256-FtCh96ZPSwaFko/BIMoDoKwBt+sYBuhCG7ug6oYgdKQ="; }; - vendorHash = "sha256-k4huXZR2BJLMEsaGpfgEM11ZTbU1Tyfan9fOraCNXFY="; + vendorHash = "sha256-enhuBKRr2wZN04kGiTKlBX/CnBkL16Ivllg85N97Mt4="; doCheck = false; From c05535798dcae0da3bf5983e8673e94187a7eb8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 16:15:22 +0000 Subject: [PATCH 203/481] python312Packages.datalad: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/datalad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index 8d6d7b4ce3b1..a5f963b24e78 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -52,13 +52,13 @@ buildPythonPackage rec { pname = "datalad"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "datalad"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Vw/RpMf+jnUijJ3GZ9nLk1IRWOADmM+jNtYl5Ba6uLg="; + hash = "sha256-HBHz1z34GFurDROm2goDxm3G2ml3SYOOTU2cQE36VYg="; }; postPatch = '' From 50962e2880f1a2ef3a464759767789b1161c437e Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 2 Aug 2024 21:49:17 +0530 Subject: [PATCH 204/481] arti: 1.2.4 -> 1.2.6 Diff: https://gitlab.torproject.org/tpo/core/arti/-/compare/arti-v1.2.4...arti-v1.2.6 Changelog: https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v1.2.6/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/tools/security/arti/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 321ab52ccef9..392744dd5d5f 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-yyb5v5dKgl5/45GNZKNXpJUfj5eAksSKoTOEL6ZL29s="; + hash = "sha256-3/wXxcKjbvlXUjvGgMidORVgeo2c5IuPgjLnY2Nj9oU="; }; - cargoHash = "sha256-xoZ55ngIKcM9WQZeZUBprJE7tGOmaI2tWlFc/AoRbxA="; + cargoHash = "sha256-UeMZlBSbeH/dn5j9vxNkZQ3vkNOxIyPLUOcZe2ZllTM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 95791c8e9565d54c46057546de9a8a0e29dc52d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 16:23:33 +0000 Subject: [PATCH 205/481] python312Packages.sphinx-design: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/sphinx-design/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-design/default.nix b/pkgs/development/python-modules/sphinx-design/default.nix index 4e7134602108..032caf4a0e83 100644 --- a/pkgs/development/python-modules/sphinx-design/default.nix +++ b/pkgs/development/python-modules/sphinx-design/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-design"; - version = "0.6.0"; + version = "0.6.1"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_design"; - hash = "sha256-7I48XFn+1ASbOlouIJNg/qsxgpNGtfagx8NCuJQIIZI="; + hash = "sha256-tE7qNxk4bQTXZcGoJXysorPm+EIdezpedCwP1F+E5jI="; }; nativeBuildInputs = [ flit-core ]; From 6b5fd20954150d2b8c58264897e41fb066e993f2 Mon Sep 17 00:00:00 2001 From: ozwaldorf Date: Fri, 2 Aug 2024 13:01:25 -0400 Subject: [PATCH 206/481] cargo-hakari: 0.9.28 -> 0.9.30 --- pkgs/development/tools/rust/cargo-hakari/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index 6ae5123da7cf..e9edf5f8228e 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.28"; + version = "0.9.30"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; rev = "cargo-hakari-${version}"; - sha256 = "sha256-mTemccM/C9M2kso9PNpd0UGEZJd/tBd1PjCpbDFFtNo="; + sha256 = "sha256-fwqMV8oTEYqS0Y/IXar1DSZ0Gns1qJ9oGhbdehScrgw="; }; - cargoHash = "sha256-UaSW9PZMUhqjvRM0/URHaOfofG5Ap3bvKgAHa+H+MFw="; + cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY="; cargoBuildFlags = [ "-p" "cargo-hakari" ]; cargoTestFlags = [ "-p" "cargo-hakari" ]; From 23417302b94bab7608d5a9f7de4d52e0c9ad26cd Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 3 Aug 2024 01:14:16 +0800 Subject: [PATCH 207/481] emacs: bump emacs2nix to fix generating duplicated entries Closes https://github.com/NixOS/nixpkgs/issues/119586 --- pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 130889e03b4c..2879985e4b86 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchFromGitHub { owner = "nix-community"; repo = "emacs2nix"; - rev = "cf706a3e7a4c56be2d4dc83cc453810dfa023967"; - hash = "sha256-jVbRcjNNKfuOIz76EMbrQxnKCN9d9C+szrk0zC8DaNE="; + rev = "8454f2857252f32621b8022f797fef9b96862204"; + hash = "sha256-UHHEkY+t/IzWe8jC8bm+p275sKfnL5/v5wbwRDw6FZw="; fetchSubmodules = true; }; in From 9d80cddfbe4995436af8946c17d54d3e0afeda54 Mon Sep 17 00:00:00 2001 From: ozwaldorf Date: Fri, 2 Aug 2024 13:24:19 -0400 Subject: [PATCH 208/481] cargo-hakari: rfc style formatting --- .../tools/rust/cargo-hakari/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index e9edf5f8228e..c8429896be45 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -1,4 +1,8 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ + lib, + rustPlatform, + fetchFromGitHub, +}: rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; @@ -13,8 +17,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DkPnQcoiytIYz780veSAhPnk70qkP3QvTJJ41csUThY="; - cargoBuildFlags = [ "-p" "cargo-hakari" ]; - cargoTestFlags = [ "-p" "cargo-hakari" ]; + cargoBuildFlags = [ + "-p" + "cargo-hakari" + ]; + cargoTestFlags = [ + "-p" + "cargo-hakari" + ]; meta = with lib; { description = "Manage workspace-hack packages to speed up builds in large workspaces"; @@ -26,7 +36,13 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://crates.io/crates/cargo-hakari"; changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ figsoda macalinao ]; + license = with licenses; [ + mit + asl20 + ]; + maintainers = with maintainers; [ + figsoda + macalinao + ]; }; } From fbf4f33286540d40f06f3fc62404e747ea63bd23 Mon Sep 17 00:00:00 2001 From: Guillaume DELVIT Date: Fri, 2 Aug 2024 20:04:31 +0200 Subject: [PATCH 209/481] sqlpage : 0.24.0 -> 0.25.0 --- pkgs/servers/sqlpage/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index affa9d6f3f4e..f0372b926fc8 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -11,8 +11,8 @@ let apexcharts = fetchurl { - url = "https://cdn.jsdelivr.net/npm/apexcharts@3.49.1/dist/apexcharts.min.js"; - hash = "sha256-74AuGLJETu9PiPQ69d/gxD3Wy3j10udgC7FQYPQjhyU="; + url = "https://cdn.jsdelivr.net/npm/apexcharts@3.50.0/dist/apexcharts.min.js"; + hash = "sha256-pLaS+eABqnCs0TLhRUEBQVLeF7RSlW5LjsmS7eV4iKI="; }; tablerCss = fetchurl { url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css"; @@ -31,8 +31,8 @@ let hash = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM="; }; tablerIcons = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.4.0/dist/tabler-sprite.svg"; - hash = "sha256-iYxplXfIhVNBOmEEURN7/53A8Mi0hWCbWWo92BzncUA="; + url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg"; + hash = "sha256-lEUAtxI+NffqLDllirLgcCRjEgbeCaz9Gkn3Tu9e9F4="; }; tomselect = fetchurl { url = "https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js"; @@ -42,18 +42,18 @@ in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; rev = "v${version}"; - hash = "sha256-1VP5yjyQNBvaAIRhrv1fntZFqSUIAZm5X0J8xQ2HJuM="; + hash = "sha256-ixxTaJ72EqGqvopcIr/7kRfFyK9p5laAmu7+jR5Tp1I="; }; postPatch = '' substituteInPlace sqlpage/apexcharts.js \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.49.1/dist/apexcharts.min.js */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.50.0/dist/apexcharts.min.js */' \ "$(cat ${apexcharts})" substituteInPlace sqlpage/sqlpage.css \ --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \ @@ -68,14 +68,14 @@ rustPlatform.buildRustPackage rec { --replace-fail '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \ "$(cat ${listJsFixed})" substituteInPlace sqlpage/tabler-icons.svg \ - --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.4.0/dist/tabler-sprite.svg */' \ + --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.10.0/dist/tabler-sprite.svg */' \ "$(cat ${tablerIcons})" substituteInPlace sqlpage/tomselect.js \ --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.popular.min.js */' \ "$(cat ${tomselect})" ''; - cargoHash = "sha256-lfiRnaTF1aLs2QU+gv7J48rZSHJdtt8U81odQ1o74R4="; + cargoHash = "sha256-yD82/h5dgcvp8OBfAoRfkq+YsauPncaRjfGM7dRQq5E="; nativeBuildInputs = [ pkg-config From ff0a196c65bca84ce286e43297ef7fa9a6dd9c02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 18:07:55 +0000 Subject: [PATCH 210/481] podman: 5.1.2 -> 5.2.0 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index e1540b12b2d4..707053dc82b9 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -65,13 +65,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.1.2"; + version = "5.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-IeGOagP1MGH92Si2i6HPwZ71XrYJ7RpxxRNbQN3HGOw="; + hash = "sha256-Rb9rOetMVxf1GhEOzZmaUwRI4nkPdJnpkpjIyJcb6r8="; }; patches = [ From 8b8b6acc49f101a0def178de10e308f8ba5b4d7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 18:42:07 +0000 Subject: [PATCH 211/481] ugrep: 6.2.0 -> 6.3.0 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 2b9c7c93fe68..10d715163a83 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "6.2.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-ItPmcKNvjk6U0u80W9+VvGIPgHJnOkWAIebjHLz5bMg="; + hash = "sha256-v9Bk+RfzoS1/rgnJMo0UQWJn23MPEAVH/phaMQSLjGg="; }; buildInputs = [ From b74c97b315b1c663b0bd780d00a11071ee9d0cbf Mon Sep 17 00:00:00 2001 From: matthiasdotsh Date: Thu, 23 May 2024 13:38:42 +0000 Subject: [PATCH 212/481] python3Packages.soundcard: init at 0.4.3 --- .../python-modules/soundcard/default.nix | 50 +++++++++++++++++++ .../python-modules/soundcard/test.nix | 47 +++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 99 insertions(+) create mode 100644 pkgs/development/python-modules/soundcard/default.nix create mode 100644 pkgs/development/python-modules/soundcard/test.nix diff --git a/pkgs/development/python-modules/soundcard/default.nix b/pkgs/development/python-modules/soundcard/default.nix new file mode 100644 index 000000000000..6fd42cd2ec91 --- /dev/null +++ b/pkgs/development/python-modules/soundcard/default.nix @@ -0,0 +1,50 @@ +{ + buildPythonPackage, + cffi, + fetchPypi, + lib, + libpulseaudio, + numpy, + setuptools, + testers, +}: +let + version = "0.4.3"; +in +buildPythonPackage { + inherit version; + pname = "soundcard"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "SoundCard"; + hash = "sha256-QQg1UUuhCAmAPLmIfUJw85K1nq82WRW7lFFq8/ix0Dc="; + }; + + patchPhase = '' + substituteInPlace soundcard/pulseaudio.py \ + --replace "'pulse'" "'${libpulseaudio}/lib/libpulse.so'" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + cffi + numpy + ]; + + # doesn't work because there are not many soundcards in the + # sandbox. See VM-test + # pythonImportsCheck = [ "soundcard" ]; + + passthru.tests.vm-with-soundcard = testers.runNixOSTest ./test.nix; + + meta = { + description = "Pure-Python Real-Time Audio Library"; + homepage = "https://github.com/bastibe/SoundCard"; + changelog = "https://github.com/bastibe/SoundCard/blob/${version}/README.rst#changelog"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ matthiasdotsh ]; + }; +} diff --git a/pkgs/development/python-modules/soundcard/test.nix b/pkgs/development/python-modules/soundcard/test.nix new file mode 100644 index 000000000000..720e7336cd6a --- /dev/null +++ b/pkgs/development/python-modules/soundcard/test.nix @@ -0,0 +1,47 @@ +{ + name = "Python Soundcard Library Test"; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ (pkgs.python3.withPackages (ps: [ ps.soundcard ])) ]; + + hardware.pulseaudio.enable = true; + hardware.pulseaudio.systemWide = true; + + virtualisation.qemu.options = [ + "-device virtio-sound-pci,audiodev=my_audiodev" + "-audiodev wav,id=my_audiodev" + ]; + }; + + interactive.nodes.machine = + { ... }: + { + services.openssh.enable = true; + services.openssh.settings.PermitRootLogin = "yes"; + users.extraUsers.root.initialPassword = ""; + users.extraUsers.root.hashedPassword = null; + users.extraUsers.root.hashedPasswordFile = null; + users.extraUsers.root.initialHashedPassword = null; + virtualisation.forwardPorts = [ + { + from = "host"; + host.port = 2222; + guest.port = 22; + } + ]; + }; + + testScript = + let + script = builtins.toFile "import.py" '' + import soundcard + ''; + in + '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.succeed("python ${script}") + ''; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0896d469ea2a..46f459954f83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14562,6 +14562,8 @@ self: super: with self; { sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + soundcard = callPackage ../development/python-modules/soundcard { }; + soundcloud-v2 = callPackage ../development/python-modules/soundcloud-v2 { }; sounddevice = callPackage ../development/python-modules/sounddevice { }; From cf9c8caf7f5acac227c959e39dffa9defee0af90 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 2 Aug 2024 12:23:05 -0700 Subject: [PATCH 213/481] python311Packages.openai: 1.37.0 -> 1.38.0 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.37.0...v1.38.0 Changelog: https://github.com/openai/openai-python/releases/tag/v1.38.0 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3085a7ea72b2..b11a1603ecee 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.37.0"; + version = "1.38.0"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-hvzXOMEBDYVhmAJQDKYLO6HZMoRbGPTkXfoHdjysvlQ="; + hash = "sha256-O18JqCsKNqHpbsRHp1ROIphRnIfjeXIDTHYljRMMrpU="; }; build-system = [ From 2ca365ca515ec4ad0a0711e14a68776d5d8b073d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Aug 2024 15:38:40 -0400 Subject: [PATCH 214/481] dbip-country-lite: 2024-07 -> 2024-08 --- pkgs/data/misc/dbip-country-lite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index 062c229fe36b..3f024e0bcafc 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-07"; + version = "2024-08"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-MEhxTByiRoyxQ6DAKUhJKnG+ISvJN0Q5K4o/DoXkxtk="; + hash = "sha256-NdAXeo9anEGJUezxXEpABzNQyefONkh8wtFAnmAwXtw="; }; dontUnpack = true; From a57d965604c291fdf4c1b8d493bf65877c193092 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:27:01 +0200 Subject: [PATCH 215/481] signal-desktop: 7.17.0 -> 7.18.0 https://github.com/signalapp/Signal-Desktop/releases/tag/v7.18.0 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index ebe2cbc9d9a2..58250efb2b12 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.17.0"; + version = "7.18.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-4Yp81aBY01cVZ/KDSqPO3R3HglLup/+sczQ5XNtQn84="; + hash = "sha256-xI3GCs9ZekENktuSf9NNxoOOGuYtKrOV8Ng3eFy493M="; } From 4ce55aef1cbce8e8af7d412924354ce2b27bc3e8 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 2 Aug 2024 22:27:36 +0200 Subject: [PATCH 216/481] signal-desktop-beta: 7.18.0-beta1 -> 7.19.0-beta1 https://github.com/signalapp/Signal-Desktop/releases/tag/v7.19.0-beta.1 --- .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 79c501a2e6ce..ffb73d9e9150 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.18.0-beta.1"; + version = "7.19.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-ZNFssB0SiNAAW7SupxNqdbEtEpemrv+IoyfdWVKu8CI="; + hash = "sha256-kD08xke+HYhwAZG7jmU1ILo013556vNcvAFc/+9BTjg="; } From 3bfeae1428eac1e60a304268bf7dc218f152b145 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 2 Aug 2024 07:26:38 -0400 Subject: [PATCH 217/481] ipu6: Don't build out-of-tree driver for kernels that have it --- nixos/modules/hardware/video/webcam/ipu6.nix | 6 +++--- pkgs/top-level/linux-kernels.nix | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/modules/hardware/video/webcam/ipu6.nix b/nixos/modules/hardware/video/webcam/ipu6.nix index de47fe3f6b5a..ae54e24ee2da 100644 --- a/nixos/modules/hardware/video/webcam/ipu6.nix +++ b/nixos/modules/hardware/video/webcam/ipu6.nix @@ -26,9 +26,9 @@ in config = mkIf cfg.enable { - boot.extraModulePackages = with config.boot.kernelPackages; [ - ipu6-drivers - ]; + # Module is upstream as of 6.10 + boot.extraModulePackages = with config.boot.kernelPackages; + optional (kernelOlder "6.10") ipu6-drivers; hardware.firmware = with pkgs; [ ipu6-camera-bins diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 2854d32ef167..8f160bbc4297 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -377,7 +377,10 @@ in { intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; - ipu6-drivers = callPackage ../os-specific/linux/ipu6-drivers {}; + ipu6-drivers = + if kernelOlder "6.10" + then callPackage ../os-specific/linux/ipu6-drivers {} + else null; ivsc-driver = callPackage ../os-specific/linux/ivsc-driver {}; From 473f1bb5f11524659dc32afe2c7450193bbaa53a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 21:36:05 +0000 Subject: [PATCH 218/481] gate: 0.38.0 -> 0.38.2 --- pkgs/by-name/ga/gate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 2498dc45b5ee..776c8534f18f 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -5,7 +5,7 @@ let pname = "gate"; - version = "0.38.0"; + version = "0.38.2"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "minekube"; repo = "gate"; rev = "refs/tags/v${version}"; - hash = "sha256-kiVyrmAXRDreGIBq9bJhscULjbPgoDVv8kw9APJ5TQk="; + hash = "sha256-lNZRDSBaEE4b3pJ1oOf9yd8l+lFJmnhyy4TahBlQDv0="; }; - vendorHash = "sha256-JaBcGcqFqp9Il3FyU/QwThuggzPg8HWScvFHEAgtgBU="; + vendorHash = "sha256-H8mVlwaEux6PSHfVwFpfa+efmWApCKl6eYx6vA57Hfc="; ldflags = [ "-s" "-w" ]; From 81343957e651c19f5199f3c032a4b67bee92e973 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Thu, 1 Aug 2024 18:51:23 -0400 Subject: [PATCH 219/481] step-cli: install shell completion --- pkgs/by-name/st/step-cli/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index ce3793463590..e901cf614f09 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, + installShellFiles, }: let version = "0.27.2"; @@ -30,6 +32,15 @@ buildGoModule { vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd step \ + --bash <($out/bin/step completion bash) \ + --zsh <($out/bin/step completion zsh) \ + --fish <($out/bin/step completion fish) + ''; + meta = { description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; homepage = "https://smallstep.com/cli/"; From b506b66affa57a87bde86f3aa8a5508c6958b428 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Fri, 2 Aug 2024 18:02:28 -0400 Subject: [PATCH 220/481] step-cli: update .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d83dc1efe44f..fe5ae020247b 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -156,3 +156,6 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856 # nixos/nvidia: apply nixfmt-rfc-style (#313440) fbdcdde04a7caa007e825a8b822c75fab9adb2d6 + +# step-cli: format package.nix with nixfmt (#331629) +fc7a83f8b62e90de5679e993d4d49ca014ea013d From e210e620be7a40ac4b5e3b4d2444cc0d6b516439 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 3 Aug 2024 00:20:04 +0200 Subject: [PATCH 221/481] python312Packages.vector: clean and fix --- .../python-modules/vector/default.nix | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index f0ebd1f62128..ad5efb0c8105 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -1,58 +1,77 @@ { lib, - awkward, buildPythonPackage, - fetchPypi, + pythonOlder, + fetchFromGitHub, + + # build-system hatch-vcs, hatchling, - numba, + + # dependencies numpy, - notebook, packaging, + + # checks + awkward, + dask-awkward, + notebook, + numba, papermill, pytestCheckHook, - pythonOlder, + sympy, + + stdenv, }: buildPythonPackage rec { pname = "vector"; version = "1.4.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Fa74kRVg2x6j/6nb1UFNDsV1pQSiw/I+pFFwoYmURm4="; + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "vector"; + rev = "refs/tags/v${version}"; + hash = "sha256-ckwJgh5aWFTwoEBVmKukdk+cmQeOuecLiYD2EcuELGw="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging ]; - checkInputs = [ + nativeCheckInputs = [ awkward + dask-awkward notebook numba papermill pytestCheckHook + sympy ]; pythonImportsCheck = [ "vector" ]; __darwinAllowLocalNetworking = true; - meta = with lib; { + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # AssertionError: assert 2.1073424255447017e-08 == 0.0 + "test_issue_463" + ]; + + meta = { description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; homepage = "https://github.com/scikit-hep/vector"; changelog = "https://github.com/scikit-hep/vector/releases/tag/v${version}"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ veprbl ]; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ veprbl ]; }; } From 72f35a0af42576b936942c82b93fb47fe6ad6560 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 2 Aug 2024 15:39:05 -0400 Subject: [PATCH 222/481] veilid: 0.3.3 -> 0.3.4 --- pkgs/tools/networking/veilid/Cargo.lock | 786 ++++++++++++++++------- pkgs/tools/networking/veilid/default.nix | 8 +- 2 files changed, 556 insertions(+), 238 deletions(-) diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock index 25774d69682e..99ce44dae7d4 100644 --- a/pkgs/tools/networking/veilid/Cargo.lock +++ b/pkgs/tools/networking/veilid/Cargo.lock @@ -60,7 +60,7 @@ dependencies = [ "getrandom", "once_cell", "version_check", - "zerocopy", + "zerocopy 0.7.35", ] [[package]] @@ -158,9 +158,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -173,33 +173,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -288,9 +288,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -392,9 +392,9 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ "async-io 2.3.3", "async-lock 3.4.0", @@ -470,7 +470,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -480,14 +480,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] -name = "async-trait" -version = "0.1.80" +name = "async-tls" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "b2ae3c9eba89d472a0e4fe1dea433df78fbbe63d2b764addaf2ba3a6bde89a5e" +dependencies = [ + "futures-core", + "futures-io", + "rustls", + "rustls-pemfile", + "webpki-roots 0.22.6", +] + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -500,7 +513,21 @@ dependencies = [ "futures-util", "log", "pin-project-lite", - "tungstenite", + "tungstenite 0.20.1", +] + +[[package]] +name = "async-tungstenite" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5359381fd414fbdb272c48f2111c16cb0bb3447bfacd59311ff3736da9f6664" +dependencies = [ + "async-tls", + "futures-io", + "futures-util", + "log", + "pin-project-lite", + "tungstenite 0.23.0", ] [[package]] @@ -550,7 +577,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http", + "http 0.2.12", "log", "url", ] @@ -583,7 +610,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 0.2.12", "http-body", "hyper", "itoa", @@ -609,7 +636,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 0.2.12", "http-body", "mime", "rustversion", @@ -699,9 +726,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec", @@ -718,7 +745,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -794,9 +821,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" [[package]] name = "byteorder" @@ -805,10 +832,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.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "capnp" @@ -830,9 +863,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.105" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" [[package]] name = "cesu8" @@ -959,9 +992,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -969,9 +1002,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -982,21 +1015,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard-win" @@ -1031,9 +1064,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "combine" @@ -1090,7 +1123,7 @@ dependencies = [ "rust-ini 0.19.0", "serde", "serde_json", - "toml 0.8.14", + "toml 0.8.19", "yaml-rust", ] @@ -1298,7 +1331,7 @@ dependencies = [ "crossterm_winapi", "futures-core", "libc", - "mio", + "mio 0.8.11", "parking_lot 0.12.3", "signal-hook", "signal-hook-mio", @@ -1348,7 +1381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -1423,7 +1456,7 @@ dependencies = [ "serde_yaml", "time", "tokio", - "toml 0.8.14", + "toml 0.8.19", "unicode-segmentation", "unicode-width", "xi-unicode", @@ -1461,7 +1494,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -1485,12 +1518,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1509,15 +1542,15 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -1533,13 +1566,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -1706,7 +1739,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -1726,7 +1759,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -1752,9 +1785,9 @@ dependencies = [ [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", "serde", @@ -1762,14 +1795,14 @@ dependencies = [ [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -1931,6 +1964,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" version = "1.0.30" @@ -2001,7 +2040,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -2113,7 +2152,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -2287,8 +2326,8 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.2.6", + "http 0.2.12", + "indexmap 2.3.0", "slab", "tokio", "tokio-util", @@ -2516,6 +2555,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -2523,7 +2573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", "pin-project-lite", ] @@ -2547,16 +2597,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "http-body", "httparse", "httpdate", @@ -2642,12 +2692,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "num-traits", "png", "tiff", @@ -2677,9 +2727,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2734,9 +2784,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[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" @@ -2931,9 +2981,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if 1.0.0", "windows-targets 0.52.6", @@ -3109,6 +3159,24 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + [[package]] name = "nanorand" version = "0.7.0" @@ -3429,16 +3497,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "num_enum" version = "0.5.11" @@ -3596,7 +3654,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.20.0", +] + +[[package]] +name = "opentelemetry" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", ] [[package]] @@ -3608,11 +3680,11 @@ dependencies = [ "async-trait", "futures-core", "grpcio", - "http", - "opentelemetry-proto", - "opentelemetry-semantic-conventions", + "http 0.2.12", + "opentelemetry-proto 0.3.0", + "opentelemetry-semantic-conventions 0.12.0", "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.20.0", "prost 0.11.9", "protobuf", "thiserror", @@ -3620,6 +3692,24 @@ dependencies = [ "tonic 0.9.2", ] +[[package]] +name = "opentelemetry-otlp" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54" +dependencies = [ + "async-trait", + "futures-core", + "http 0.2.12", + "opentelemetry 0.23.0", + "opentelemetry-proto 0.6.0", + "opentelemetry_sdk 0.23.0", + "prost 0.12.6", + "thiserror", + "tokio", + "tonic 0.11.0", +] + [[package]] name = "opentelemetry-proto" version = "0.3.0" @@ -3629,21 +3719,39 @@ dependencies = [ "futures", "grpcio", "opentelemetry_api", - "opentelemetry_sdk", + "opentelemetry_sdk 0.20.0", "prost 0.11.9", "protobuf", "tonic 0.9.2", ] +[[package]] +name = "opentelemetry-proto" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" +dependencies = [ + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", + "prost 0.12.6", + "tonic 0.11.0", +] + [[package]] name = "opentelemetry-semantic-conventions" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" dependencies = [ - "opentelemetry", + "opentelemetry 0.20.0", ] +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" + [[package]] name = "opentelemetry_api" version = "0.20.0" @@ -3674,7 +3782,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float", + "ordered-float 3.9.2", "percent-encoding", "rand", "regex", @@ -3684,6 +3792,29 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" +dependencies = [ + "async-std", + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "lazy_static", + "once_cell", + "opentelemetry 0.23.0", + "ordered-float 4.2.2", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -3699,6 +3830,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ordered-float" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" +dependencies = [ + "num-traits", +] + [[package]] name = "ordered-multimap" version = "0.4.3" @@ -3814,7 +3954,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec", "windows-targets 0.52.6", ] @@ -3885,7 +4025,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -3899,6 +4039,16 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.3.0", +] + [[package]] name = "pharos" version = "0.5.3" @@ -3926,7 +4076,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -4025,15 +4175,15 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "portable-atomic-util" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e6070f5b7452d6689dd85f08a109adec42cf6d039c9100aab6ee3403fd7307" +checksum = "fcdd8420072e66d54a407b3316991fe946ce3ab1083a7f575b2463866624704d" dependencies = [ "portable-atomic", ] @@ -4046,9 +4196,22 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f" +dependencies = [ + "zerocopy 0.6.6", +] + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.72", +] [[package]] name = "proc-macro-crate" @@ -4098,6 +4261,27 @@ dependencies = [ "prost-derive 0.12.6", ] +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck 0.5.0", + "itertools 0.12.1", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost 0.12.6", + "prost-types", + "regex", + "syn 2.0.72", + "tempfile", +] + [[package]] name = "prost-derive" version = "0.11.9" @@ -4121,7 +4305,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -4139,6 +4323,15 @@ version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" +[[package]] +name = "protobuf-src" +version = "2.1.0+27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7edafa3bcc668fa93efafcbdf58d7821bbda0f4b458ac7fae3d57ec0fec8167" +dependencies = [ + "cmake", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -4242,9 +4435,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] @@ -4542,6 +4735,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "scc" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ccfb12511cdb770157ace92d7dda771e498445b78f9886e8cdbc5140a4eced" +dependencies = [ + "sdd", +] + [[package]] name = "schemars" version = "0.8.21" @@ -4563,7 +4765,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.29.1", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -4588,6 +4790,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdd" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177258b64c0faaa9ffd3c65cd3262c2bc7e2588dbbd9c1641d0346145c1bbda8" + [[package]] name = "secret-service" version = "2.0.2" @@ -4610,9 +4818,9 @@ dependencies = [ [[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.6.0", "core-foundation", @@ -4623,9 +4831,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -4719,7 +4927,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -4730,7 +4938,7 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -4741,16 +4949,17 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -4763,14 +4972,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -4781,7 +4990,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "itoa", "ryu", "serde", @@ -4799,7 +5008,21 @@ dependencies = [ "lazy_static", "log", "parking_lot 0.12.3", - "serial_test_derive", + "serial_test_derive 2.0.0", +] + +[[package]] +name = "serial_test" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot 0.12.3", + "scc", + "serial_test_derive 3.1.1", ] [[package]] @@ -4810,7 +5033,18 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", +] + +[[package]] +name = "serial_test_derive" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] @@ -4893,12 +5127,12 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] @@ -5062,9 +5296,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.69" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -5079,9 +5313,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.30.12" +version = "0.30.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -5092,6 +5326,18 @@ dependencies = [ "windows 0.52.0", ] +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if 1.0.0", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + [[package]] name = "termcolor" version = "1.4.1" @@ -5132,22 +5378,32 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", +] + +[[package]] +name = "thread-id" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" +dependencies = [ + "libc", + "winapi", ] [[package]] @@ -5215,9 +5471,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5230,22 +5486,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.1", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5260,13 +5515,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -5305,21 +5560,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.20", ] [[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", ] @@ -5330,22 +5585,22 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] @@ -5361,7 +5616,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "http-body", "hyper", "hyper-timeout", @@ -5388,7 +5643,7 @@ dependencies = [ "base64 0.21.7", "bytes", "h2", - "http", + "http 0.2.12", "http-body", "hyper", "hyper-timeout", @@ -5467,7 +5722,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -5541,8 +5796,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.20.0", + "opentelemetry_sdk 0.20.0", "smallvec", "tracing", "tracing-core", @@ -5550,6 +5805,24 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "tracing-opentelemetry" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", + "smallvec", + "tracing", + "tracing-core", + "tracing-log 0.2.0", + "tracing-subscriber", + "web-time", +] + [[package]] name = "tracing-oslog" version = "0.1.2" @@ -5566,6 +5839,24 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "tracing-perfetto" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd21777b526dfcb57f11f65aa8a2024d83e1db52841993229b6e282e511978b7" +dependencies = [ + "anyhow", + "bytes", + "chrono", + "prost 0.12.6", + "prost-build", + "protobuf-src", + "rand", + "thread-id", + "tracing", + "tracing-subscriber", +] + [[package]] name = "tracing-subscriber" version = "0.3.18" @@ -5634,7 +5925,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals 0.28.0", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -5646,7 +5937,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.12", "httparse", "log", "rand", @@ -5656,6 +5947,24 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" @@ -5782,33 +6091,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -[[package]] -name = "veilid-async-tls" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f273e0e7f394ba1d52a1613411cb7442641f2625eb25cfd13d31965d8da558ee" -dependencies = [ - "futures-core", - "futures-io", - "rustls", - "rustls-pemfile", - "webpki-roots 0.22.6", -] - -[[package]] -name = "veilid-async-tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae5d6d02764ce82b7fdae4360bd497fe8df7a08a5901ef15a49e1ee2f734e2d" -dependencies = [ - "futures-io", - "futures-util", - "log", - "pin-project-lite", - "tungstenite", - "veilid-async-tls", -] - [[package]] name = "veilid-bugsalot" version = "0.2.0" @@ -5820,14 +6102,14 @@ dependencies = [ [[package]] name = "veilid-cli" -version = "0.3.3" +version = "0.3.4" dependencies = [ "arboard", "async-std", - "async-tungstenite", + "async-tungstenite 0.23.0", "cfg-if 1.0.0", "chrono", - "clap 4.5.8", + "clap 4.5.13", "config 0.14.0", "console", "crossbeam-channel", @@ -5849,7 +6131,7 @@ dependencies = [ "rustyline-async", "serde", "serde_derive", - "serial_test", + "serial_test 2.0.0", "stop-token", "thiserror", "tokio", @@ -5861,13 +6143,14 @@ dependencies = [ [[package]] name = "veilid-core" -version = "0.3.3" +version = "0.3.4" dependencies = [ "argon2", "async-io 1.13.0", - "async-lock 2.8.0", "async-std", "async-std-resolver", + "async-tls", + "async-tungstenite 0.27.0", "async_executors", "backtrace", "blake3", @@ -5923,7 +6206,7 @@ dependencies = [ "serde-wasm-bindgen 0.6.5", "serde_bytes", "serde_json", - "serial_test", + "serial_test 2.0.0", "sha2 0.10.8", "shell-words", "simplelog", @@ -5941,8 +6224,6 @@ dependencies = [ "tracing-subscriber", "tracing-wasm", "tsify", - "veilid-async-tls", - "veilid-async-tungstenite", "veilid-bugsalot", "veilid-hashlink", "veilid-igd", @@ -5965,7 +6246,7 @@ dependencies = [ [[package]] name = "veilid-flutter" -version = "0.3.3" +version = "0.3.4" dependencies = [ "allo-isolate", "android_log-sys 0.3.1", @@ -5980,9 +6261,9 @@ dependencies = [ "jni", "lazy_static", "libc-print", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry-semantic-conventions", + "opentelemetry 0.20.0", + "opentelemetry-otlp 0.13.0", + "opentelemetry-semantic-conventions 0.12.0", "oslog", "paranoid-android", "parking_lot 0.12.3", @@ -5993,7 +6274,7 @@ dependencies = [ "tokio-util", "tracing", "tracing-flame", - "tracing-opentelemetry", + "tracing-opentelemetry 0.21.0", "tracing-subscriber", "veilid-core", ] @@ -6023,13 +6304,14 @@ dependencies = [ [[package]] name = "veilid-server" -version = "0.3.3" +version = "0.3.4" dependencies = [ "ansi_term", "async-std", + "async-tungstenite 0.27.0", "backtrace", "cfg-if 1.0.0", - "clap 4.5.8", + "clap 4.5.13", "color-eyre", "config 0.14.0", "console-subscriber", @@ -6042,15 +6324,16 @@ dependencies = [ "json", "lazy_static", "nix 0.29.0", - "opentelemetry", - "opentelemetry-otlp", - "opentelemetry-semantic-conventions", + "opentelemetry 0.23.0", + "opentelemetry-otlp 0.16.0", + "opentelemetry-semantic-conventions 0.16.0", + "opentelemetry_sdk 0.23.0", "parking_lot 0.12.3", "rpassword", "serde", "serde_derive", "serde_yaml", - "serial_test", + "serial_test 3.1.1", "signal-hook", "signal-hook-async-std", "stop-token", @@ -6062,10 +6345,10 @@ dependencies = [ "tracing-appender", "tracing-flame", "tracing-journald", - "tracing-opentelemetry", + "tracing-opentelemetry 0.24.0", + "tracing-perfetto", "tracing-subscriber", "url", - "veilid-async-tungstenite", "veilid-bugsalot", "veilid-core", "wg", @@ -6074,10 +6357,10 @@ dependencies = [ [[package]] name = "veilid-tools" -version = "0.3.3" +version = "0.3.4" dependencies = [ "android_logger 0.13.3", - "async-lock 2.8.0", + "async-lock 3.4.0", "async-std", "async_executors", "backtrace", @@ -6110,7 +6393,7 @@ dependencies = [ "range-set-blaze", "rtnetlink", "send_wrapper 0.6.0", - "serial_test", + "serial_test 2.0.0", "simplelog", "static_assertions", "stop-token", @@ -6132,7 +6415,7 @@ dependencies = [ [[package]] name = "veilid-wasm" -version = "0.3.3" +version = "0.3.4" dependencies = [ "cfg-if 1.0.0", "console_error_panic_hook", @@ -6160,9 +6443,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "waker-fn" @@ -6218,7 +6501,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -6252,7 +6535,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6285,7 +6568,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -6315,6 +6598,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki" version = "0.22.4" @@ -6695,9 +6988,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -6825,13 +7118,34 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zerocopy" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +dependencies = [ + "byteorder", + "zerocopy-derive 0.6.6", +] + [[package]] name = "zerocopy" version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "zerocopy-derive", + "zerocopy-derive 0.7.35", +] + +[[package]] +name = "zerocopy-derive" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] @@ -6842,7 +7156,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] @@ -6862,7 +7176,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.72", ] [[package]] diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index ba1ec0af4d92..a6bc86f4aed4 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -6,17 +6,18 @@ , rustPlatform , protobuf , capnproto +, cmake }: rustPlatform.buildRustPackage rec { pname = "veilid"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitLab { owner = "veilid"; repo = pname; rev = "v${version}"; - hash = "sha256-Gm65fvLImbsAU8kMYQv5VFEjkBQnhBFDqwheddRbtU8="; + hash = "sha256-nEJxiox2aoQBV83vlpiBB4In59+lfHF6/a8HqDYcFT4="; }; cargoLock = { @@ -31,6 +32,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ capnproto + cmake protobuf ]; @@ -40,6 +42,8 @@ rustPlatform.buildRustPackage rec { "--workspace" ]; + RUSTFLAGS = "--cfg tokio_unstable"; + doCheck = false; outputs = [ "out" "lib" "dev" ]; From 217c61a1d718f9449a1823f14fb72de28e7ca66f Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 09:57:03 -0700 Subject: [PATCH 223/481] freshBootstrapTools: remove top-level `with` statement --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 135 +++++++++++--------- 1 file changed, 72 insertions(+), 63 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 95a083419286..ff8299d139b8 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,25 +1,34 @@ -{ pkgspath ? ../../.., test-pkgspath ? pkgspath -, localSystem ? { system = builtins.currentSystem; } -, crossSystem ? null -, bootstrapFiles ? null +{ + pkgspath ? ../../.., + test-pkgspath ? pkgspath, + localSystem ? { + system = builtins.currentSystem; + }, + crossSystem ? null, + bootstrapFiles ? null, }: -let cross = if crossSystem != null - then { inherit crossSystem; } - else {}; - custom-bootstrap = if bootstrapFiles != null - then { stdenvStages = args: - let args' = args // { bootstrapFiles = bootstrapFiles; }; - in (import "${pkgspath}/pkgs/stdenv/darwin" args'); - } - else {}; -in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); +let + cross = if crossSystem != null + then { inherit crossSystem; } + else {}; + + custom-bootstrap = if bootstrapFiles != null + then { stdenvStages = args: + let args' = args // { bootstrapFiles = bootstrapFiles; }; + in (import "${pkgspath}/pkgs/stdenv/darwin" args'); + } + else {}; + + pkgs = import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); + inherit (pkgs) lib stdenv darwin; +in rec { build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; - nativeBuildInputs = [ dumpnar nukeReferences ]; + nativeBuildInputs = [ pkgs.dumpnar pkgs.nukeReferences ]; buildCommand = let inherit (lib) @@ -28,7 +37,7 @@ rec { getLib ; - coreutils_ = (coreutils.override (args: { + coreutils_ = (pkgs.coreutils.override (args: { # We want coreutils without ACL support. aclSupport = false; # Cannot use a single binary build, or it gets dynamically linked against gmp. @@ -41,13 +50,13 @@ rec { }); # Avoid messing with libkrb5 and libnghttp2. - curl_ = curlMinimal.override (args: { + curl_ = pkgs.curlMinimal.override (args: { gssSupport = false; http2Support = false; scpSupport = false; }); - unpackScript = writeText "bootstrap-tools-unpack.sh" '' + unpackScript = pkgs.writeText "bootstrap-tools-unpack.sh" '' set -euo pipefail echo Unpacking the bootstrap tools... >&2 @@ -104,8 +113,8 @@ rec { cp -rL ${getDev darwin.Libsystem}/include $out chmod -R u+w $out/include - cp -rL ${getDev libiconv}/include/* $out/include - cp -rL ${getDev gnugrep.pcre2}/include/* $out/include + cp -rL ${getDev pkgs.libiconv}/include/* $out/include + cp -rL ${getDev pkgs.gnugrep.pcre2}/include/* $out/include mv $out/include $out/include-Libsystem # Copy binutils. @@ -118,58 +127,58 @@ rec { cp ${getBin coreutils_}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - cp -d ${getBin bash}/bin/{ba,}sh $out/bin - cp -d ${getBin diffutils}/bin/* $out/bin - cp ${getBin findutils}/bin/{find,xargs} $out/bin - cp -d ${getBin gawk}/bin/{g,}awk $out/bin - cp -d ${getBin gnugrep}/bin/grep $out/bin - cp -d ${getBin gnumake}/bin/* $out/bin - cp -d ${getBin gnused}/bin/* $out/bin - cp -d ${getBin patch}/bin/* $out/bin + cp -d ${getBin pkgs.bash}/bin/{ba,}sh $out/bin + cp -d ${getBin pkgs.diffutils}/bin/* $out/bin + cp ${getBin pkgs.findutils}/bin/{find,xargs} $out/bin + cp -d ${getBin pkgs.gawk}/bin/{g,}awk $out/bin + cp -d ${getBin pkgs.gnugrep}/bin/grep $out/bin + cp -d ${getBin pkgs.gnumake}/bin/* $out/bin + cp -d ${getBin pkgs.gnused}/bin/* $out/bin + cp -d ${getBin pkgs.patch}/bin/* $out/bin - cp -d ${getLib gettext}/lib/libintl*.dylib $out/lib - cp -d ${getLib gnugrep.pcre2}/lib/libpcre2*.dylib $out/lib - cp -d ${getLib libiconv}/lib/lib*.dylib $out/lib - cp -d ${getLib libxml2}/lib/libxml2*.dylib $out/lib - cp -d ${getLib ncurses}/lib/libncurses*.dylib $out/lib + cp -d ${getLib pkgs.gettext}/lib/libintl*.dylib $out/lib + cp -d ${getLib pkgs.gnugrep.pcre2}/lib/libpcre2*.dylib $out/lib + cp -d ${getLib pkgs.libiconv}/lib/lib*.dylib $out/lib + cp -d ${getLib pkgs.libxml2}/lib/libxml2*.dylib $out/lib + cp -d ${getLib pkgs.ncurses}/lib/libncurses*.dylib $out/lib # copy package extraction tools - cp -d ${getBin bzip2}/bin/b{,un}zip2 $out/bin - cp ${getBin cpio}/bin/cpio $out/bin - cp ${getBin gnutar}/bin/tar $out/bin - cp ${getBin gzip}/bin/.gzip-wrapped $out/bin/gzip - cp ${getBin pbzx}/bin/pbzx $out/bin - cp ${getBin xz}/bin/xz $out/bin - cp -d ${getLib bzip2}/lib/libbz2*.dylib $out/lib - cp -d ${getLib gmpxx}/lib/libgmp*.dylib $out/lib - cp -d ${getLib xar}/lib/libxar*.dylib $out/lib - cp -d ${getLib xz}/lib/liblzma*.dylib $out/lib - cp -d ${getLib zlib}/lib/libz*.dylib $out/lib + cp -d ${getBin pkgs.bzip2}/bin/b{,un}zip2 $out/bin + cp ${getBin pkgs.cpio}/bin/cpio $out/bin + cp ${getBin pkgs.gnutar}/bin/tar $out/bin + cp ${getBin pkgs.gzip}/bin/.gzip-wrapped $out/bin/gzip + cp ${getBin pkgs.pbzx}/bin/pbzx $out/bin + cp ${getBin pkgs.xz}/bin/xz $out/bin + cp -d ${getLib pkgs.bzip2}/lib/libbz2*.dylib $out/lib + cp -d ${getLib pkgs.gmpxx}/lib/libgmp*.dylib $out/lib + cp -d ${getLib pkgs.xar}/lib/libxar*.dylib $out/lib + cp -d ${getLib pkgs.xz}/lib/liblzma*.dylib $out/lib + cp -d ${getLib pkgs.zlib}/lib/libz*.dylib $out/lib # This used to be in-nixpkgs, but now is in the bundle # because I can't be bothered to make it partially static cp ${getBin curl_}/bin/curl $out/bin cp -d ${getLib curl_}/lib/libcurl*.dylib $out/lib - cp -d ${getLib openssl}/lib/*.dylib $out/lib + cp -d ${getLib pkgs.openssl}/lib/*.dylib $out/lib # Copy what we need of clang - cp -d ${getBin llvmPackages.clang-unwrapped}/bin/clang{,++,-cl,-cpp,-[0-9]*} $out/bin - cp -d ${getLib llvmPackages.clang-unwrapped}/lib/libclang-cpp*.dylib $out/lib - cp -rd ${getLib llvmPackages.clang-unwrapped}/lib/clang $out/lib + cp -d ${getBin pkgs.llvmPackages.clang-unwrapped}/bin/clang{,++,-cl,-cpp,-[0-9]*} $out/bin + cp -d ${getLib pkgs.llvmPackages.clang-unwrapped}/lib/libclang-cpp*.dylib $out/lib + cp -rd ${getLib pkgs.llvmPackages.clang-unwrapped}/lib/clang $out/lib - cp -d ${getLib llvmPackages.libcxx}/lib/libc++*.dylib $out/lib + cp -d ${getLib pkgs.llvmPackages.libcxx}/lib/libc++*.dylib $out/lib mkdir -p $out/lib/darwin - cp -d ${getLib llvmPackages.compiler-rt}/lib/darwin/libclang_rt.{,profile_}osx.a $out/lib/darwin - cp -d ${getLib llvmPackages.compiler-rt}/lib/libclang_rt.{,profile_}osx.a $out/lib - cp -d ${getLib llvmPackages.llvm}/lib/libLLVM.dylib $out/lib - cp -d ${getLib libffi}/lib/libffi*.dylib $out/lib + cp -d ${getLib pkgs.llvmPackages.compiler-rt}/lib/darwin/libclang_rt.{,profile_}osx.a $out/lib/darwin + cp -d ${getLib pkgs.llvmPackages.compiler-rt}/lib/libclang_rt.{,profile_}osx.a $out/lib + cp -d ${getLib pkgs.llvmPackages.llvm}/lib/libLLVM.dylib $out/lib + cp -d ${getLib pkgs.libffi}/lib/libffi*.dylib $out/lib mkdir $out/include - cp -rd ${getDev llvmPackages.libcxx}/include/c++ $out/include + cp -rd ${getDev pkgs.llvmPackages.libcxx}/include/c++ $out/include # copy .tbd assembly utils cp ${getBin darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin - cp -d ${getLib libyaml}/lib/libyaml*.dylib $out/lib + cp -d ${getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib # copy sigtool cp -d ${getBin darwin.sigtool}/bin/{codesign,sigtool} $out/bin @@ -178,13 +187,13 @@ rec { # tools needed to unpack bootstrap archive mkdir -p unpack/bin unpack/lib - cp -d ${getBin bash}/bin/{bash,sh} unpack/bin + cp -d ${getBin pkgs.bash}/bin/{bash,sh} unpack/bin cp ${getBin coreutils_}/bin/mkdir unpack/bin - cp ${getBin gnutar}/bin/tar unpack/bin - cp ${getBin xz}/bin/xz unpack/bin - cp -d ${getLib gettext}/lib/libintl*.dylib unpack/lib - cp -d ${getLib libiconv}/lib/lib*.dylib unpack/lib - cp -d ${getLib xz}/lib/liblzma*.dylib unpack/lib + cp ${getBin pkgs.gnutar}/bin/tar unpack/bin + cp ${getBin pkgs.xz}/bin/xz unpack/bin + cp -d ${getLib pkgs.gettext}/lib/libintl*.dylib unpack/lib + cp -d ${getLib pkgs.libiconv}/lib/lib*.dylib unpack/lib + cp -d ${getLib pkgs.xz}/lib/liblzma*.dylib unpack/lib cp ${unpackScript} unpack/bootstrap-tools-unpack.sh # @@ -277,7 +286,7 @@ rec { bootstrapFiles = { bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz"; - unpack = runCommand "unpack" { allowedReferences = []; } '' + unpack = pkgs.runCommand "unpack" { allowedReferences = []; } '' cp -r ${build}/unpack $out ''; }; @@ -383,7 +392,7 @@ rec { clang++ -Wl,-flat_namespace -idirafter $tools/include-Libsystem -isystem$tools/include/c++/v1 \ --sysroot=$tools -L./libtest -L$PWD/libSystem-boot hello3.cc - tar xvf ${hello.src} + tar xvf ${pkgs.hello.src} cd hello-* # hello configure detects -liconv is needed but doesn't add to the link step LDFLAGS=-liconv ./configure --prefix=$out From 003725a97d50b3a9c918168f907d366bf4bac4ad Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 10:11:42 -0700 Subject: [PATCH 224/481] freshBootstrapTools.bootstrapTools: extract as a package --- pkgs/stdenv/darwin/bootstrap-tools.nix | 25 +++++++++++++++++++++ pkgs/stdenv/darwin/make-bootstrap-tools.nix | 19 ++-------------- 2 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 pkgs/stdenv/darwin/bootstrap-tools.nix diff --git a/pkgs/stdenv/darwin/bootstrap-tools.nix b/pkgs/stdenv/darwin/bootstrap-tools.nix new file mode 100644 index 000000000000..a3a9f17fb809 --- /dev/null +++ b/pkgs/stdenv/darwin/bootstrap-tools.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + bootstrapTools, + unpack, +}: + +builtins.derivation { + inherit (stdenv.hostPlatform) system; + + name = "bootstrap-tools"; + builder = "${unpack}/bin/bash"; + + args = [ + "${unpack}/bootstrap-tools-unpack.sh" + bootstrapTools + ]; + + PATH = lib.makeBinPath [ + (builtins.placeholder "out") + unpack + ]; + + allowedReferences = [ "out" ]; +} diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index ff8299d139b8..0e47fbd8c4de 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -291,23 +291,8 @@ rec { ''; }; - bootstrapTools = derivation { - inherit (stdenv.hostPlatform) system; - - name = "bootstrap-tools"; - builder = "${bootstrapFiles.unpack}/bin/bash"; - - args = [ - "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh" - bootstrapFiles.bootstrapTools - ]; - - PATH = lib.makeBinPath [ - (placeholder "out") - bootstrapFiles.unpack - ]; - - allowedReferences = [ "out" ]; + bootstrapTools = pkgs.callPackage ./bootstrap-tools.nix { + inherit (bootstrapFiles) bootstrapTools unpack; }; test = derivation { From 1cd5d6843aa6ca1b40714a9487e5ef2f7c2754d5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 10:17:11 -0700 Subject: [PATCH 225/481] freshBootstrapTools.test: extract as a package --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 92 +---------------- pkgs/stdenv/darwin/test-bootstrap-tools.nix | 109 ++++++++++++++++++++ 2 files changed, 110 insertions(+), 91 deletions(-) create mode 100644 pkgs/stdenv/darwin/test-bootstrap-tools.nix diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 0e47fbd8c4de..b921333f1bf7 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -295,97 +295,7 @@ rec { inherit (bootstrapFiles) bootstrapTools unpack; }; - test = derivation { - name = "test-bootstrap-tools"; - inherit (stdenv.hostPlatform) system; - builder = "${bootstrapTools}/bin/bash"; - args = [ "-euo" "pipefail" "-c" "eval \"$buildCommand\"" ]; - PATH = lib.makeBinPath [ bootstrapTools ]; - tools = bootstrapTools; - "${stdenv.cc.darwinMinVersionVariable}" = stdenv.cc.darwinMinVersion; - - # Create a pure environment where we use just what's in the bootstrap tools. - buildCommand = '' - mkdir -p $out/bin - - for exe in $tools/bin/*; do - [[ $exe =~ bunzip2|codesign.*|false|install_name_tool|ld|lipo|pbzx|ranlib|rewrite-tbd|sigtool ]] && continue - $exe --version > /dev/null || { echo $exe failed >&2; exit 1; } - done - - # run all exes that don't take a --version flag - bunzip2 -h - codesign --help - codesign_allocate -i $tools/bin/true -r -o true - false || (($? == 1)) - install_name_tool -id true true - ld -v - lipo -info true - pbzx -v - # ranlib gets tested bulding hello - rewrite-tbd ' >> hello1.c - echo '#include ' >> hello1.c - echo '#include ' >> hello1.c - echo 'int main() { printf("Hello World\n"); return 0; }' >> hello1.c - $CC -o hello1 hello1.c - cp hello1 $out/bin/ - $out/bin/hello1 - - echo '#include ' >> hello3.cc - echo 'int main() { std::cout << "Hello World\n"; }' >> hello3.cc - $CXX -v -o hello3 hello3.cc - cp hello3 $out/bin/ - $out/bin/hello3 - - # test that libc++.dylib rpaths are correct so it can reference libc++abi.dylib when linked. - # using -Wl,-flat_namespace is required to generate an error - mkdir libtest/ - ln -s $tools/lib/libc++.dylib libtest/ - clang++ -Wl,-flat_namespace -idirafter $tools/include-Libsystem -isystem$tools/include/c++/v1 \ - --sysroot=$tools -L./libtest -L$PWD/libSystem-boot hello3.cc - - tar xvf ${pkgs.hello.src} - cd hello-* - # hello configure detects -liconv is needed but doesn't add to the link step - LDFLAGS=-liconv ./configure --prefix=$out - make - make install - $out/bin/hello - ''; - }; + test = pkgs.callPackage ./test-bootstrap-tools.nix { inherit bootstrapTools; }; # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it # eg: nix-build -A freshBootstrapTools.test-pkgs.stdenv diff --git a/pkgs/stdenv/darwin/test-bootstrap-tools.nix b/pkgs/stdenv/darwin/test-bootstrap-tools.nix new file mode 100644 index 000000000000..84a4ca76566a --- /dev/null +++ b/pkgs/stdenv/darwin/test-bootstrap-tools.nix @@ -0,0 +1,109 @@ +{ + lib, + stdenv, + bootstrapTools, + hello, +}: + +builtins.derivation { + name = "test-bootstrap-tools"; + + inherit (stdenv.hostPlatform) system; + + builder = "${bootstrapTools}/bin/bash"; + + args = [ + "-euo" + "pipefail" + "-c" + "eval \"$buildCommand\"" + ]; + + PATH = lib.makeBinPath [ bootstrapTools ]; + + tools = bootstrapTools; + + "${stdenv.cc.darwinMinVersionVariable}" = stdenv.cc.darwinMinVersion; + + # Create a pure environment where we use just what's in the bootstrap tools. + buildCommand = '' + mkdir -p $out/bin + + for exe in $tools/bin/*; do + [[ $exe =~ bunzip2|codesign.*|false|install_name_tool|ld|lipo|pbzx|ranlib|rewrite-tbd|sigtool ]] && continue + $exe --version > /dev/null || { echo $exe failed >&2; exit 1; } + done + + # run all exes that don't take a --version flag + bunzip2 -h + codesign --help + codesign_allocate -i $tools/bin/true -r -o true + false || (($? == 1)) + install_name_tool -id true true + ld -v + lipo -info true + pbzx -v + # ranlib gets tested bulding hello + rewrite-tbd ' >> hello1.c + echo '#include ' >> hello1.c + echo '#include ' >> hello1.c + echo 'int main() { printf("Hello World\n"); return 0; }' >> hello1.c + $CC -o hello1 hello1.c + cp hello1 $out/bin/ + $out/bin/hello1 + + echo '#include ' >> hello3.cc + echo 'int main() { std::cout << "Hello World\n"; }' >> hello3.cc + $CXX -v -o hello3 hello3.cc + cp hello3 $out/bin/ + $out/bin/hello3 + + # test that libc++.dylib rpaths are correct so it can reference libc++abi.dylib when linked. + # using -Wl,-flat_namespace is required to generate an error + mkdir libtest/ + ln -s $tools/lib/libc++.dylib libtest/ + clang++ -Wl,-flat_namespace -idirafter $tools/include-Libsystem -isystem$tools/include/c++/v1 \ + --sysroot=$tools -L./libtest -L$PWD/libSystem-boot hello3.cc + + tar xvf ${hello.src} + cd hello-* + # hello configure detects -liconv is needed but doesn't add to the link step + LDFLAGS=-liconv ./configure --prefix=$out + make + make install + $out/bin/hello + ''; +} From ef150d021c094f83f77f52d70e7958419e31216a Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 21 Jul 2024 13:58:10 +0100 Subject: [PATCH 226/481] bombono: 1.2.4 -> 1.2.4-unstable-2022-02-06 Includes all the fixes we previously bundled AUR patches for, and with another PR from the same author, works with FFmpeg 6. --- pkgs/applications/video/bombono/default.nix | 41 ++++++++------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 73471a7564d2..ebbdf9dbeb08 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -2,13 +2,14 @@ , fetchFromGitHub , pkg-config , fetchpatch +, fetchpatch2 , scons , boost , dvdauthor , dvdplusrwtools , enca , cdrkit -, ffmpeg_4 +, ffmpeg_6 , gettext , gtk2 , gtkmm2 @@ -18,22 +19,15 @@ , wrapGAppsHook3 }: -let - fetchPatchFromAur = {name, sha256}: - fetchpatch { - inherit name sha256; - url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=766dd4ba1715fc921fe26ce1bdcf22c30f4fc073"; - }; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bombono"; - version = "1.2.4"; + version = "1.2.4-unstable-2022-02-06"; src = fetchFromGitHub { owner = "bombono-dvd"; repo = "bombono-dvd"; - rev = version; - sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM="; + rev = "8680f5803314e4bcfbdae44f555c47ad345dae72"; + hash = "sha256-8AxXIvShH4HwlPZWAszku33rts13HiNoRsHiLYdZAHA="; }; patches = [ @@ -42,17 +36,14 @@ stdenv.mkDerivation rec { url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457"; sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA="; }) - ] ++ (map fetchPatchFromAur [ - {name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";} - {name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";} - {name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";} - {name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";} - {name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";} - {name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";} - {name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";} - {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} - {name="inc_boost_header.patch"; sha256="sha256-76vjkf62VsNJ5FmBEs+X7ZBqjvJ372mjSIreBxNQym8=";} - ]); + + # Fix compilation errors having ffmpeg 2:5.1 + # https://github.com/bombono-dvd/bombono-dvd/pull/28 + (fetchpatch2 { + url = "https://github.com/bombono-dvd/bombono-dvd/commit/9f2cde1ddc22705bf58264739685086755b2138b.patch?full_index=1"; + hash = "sha256-ks6c04HEYF4nPfSOjzG+dUt9v7ZmNBb0XH6byPYqX5I="; + }) + ]; postPatch = '' substituteInPlace src/mbase/SConscript \ @@ -66,7 +57,7 @@ stdenv.mkDerivation rec { dvdauthor dvdplusrwtools enca - ffmpeg_4 + ffmpeg_6 gtk2 gtkmm2 libdvdread @@ -82,7 +73,7 @@ stdenv.mkDerivation rec { # fix iso authoring install -Dt $out/share/bombono/resources/scons_authoring tools/scripts/SConsTwin.py - wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_4 dvdauthor cdrkit ]} + wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_6 dvdauthor cdrkit ]} ''; meta = with lib; { From d7c66f099624a966e5b2d0fbe0c047392e76a8b6 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 10:28:17 -0700 Subject: [PATCH 227/481] freshBootstrapTools.build: extract as a package --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 261 +-------------- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 296 ++++++++++++++++++ 2 files changed, 297 insertions(+), 260 deletions(-) create mode 100644 pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index b921333f1bf7..075e3aeec1d1 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -21,269 +21,10 @@ let else {}; pkgs = import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); - inherit (pkgs) lib stdenv darwin; in rec { - build = stdenv.mkDerivation { - name = "stdenv-bootstrap-tools"; - - nativeBuildInputs = [ pkgs.dumpnar pkgs.nukeReferences ]; - - buildCommand = let - inherit (lib) - getBin - getDev - getLib - ; - - coreutils_ = (pkgs.coreutils.override (args: { - # We want coreutils without ACL support. - aclSupport = false; - # Cannot use a single binary build, or it gets dynamically linked against gmp. - singleBinary = false; - })).overrideAttrs (oa: { - # Increase header size to be able to inject extra RPATHs. Otherwise - # x86_64-darwin build fails as: - # https://cache.nixos.org/log/g5wyq9xqshan6m3kl21bjn1z88hx48rh-stdenv-bootstrap-tools.drv - NIX_LDFLAGS = (oa.NIX_LDFLAGS or "") + " -headerpad_max_install_names"; - }); - - # Avoid messing with libkrb5 and libnghttp2. - curl_ = pkgs.curlMinimal.override (args: { - gssSupport = false; - http2Support = false; - scpSupport = false; - }); - - unpackScript = pkgs.writeText "bootstrap-tools-unpack.sh" '' - set -euo pipefail - - echo Unpacking the bootstrap tools... >&2 - mkdir $out - tar xf "$1" -C $out - - updateInstallName() { - local path="$1" - - cp "$path" "$path.new" - install_name_tool -id "$path" "$path.new" - codesign -f -i "$(basename "$path")" -s - "$path.new" - mv -f "$path.new" "$path" - } - - find $out/lib -type f -name '*.dylib' -print0 | while IFS= read -r -d $'\0' lib; do - updateInstallName "$lib" - done - - # as is a wrapper around clang. need to replace the nuked store paths - sed -i 's|/.*/bin/|'"$out"'/bin/|' $out/bin/as - - # Provide a gunzip script. - cat > $out/bin/gunzip < $out/bin/egrep - echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep - echo "#! $out/bin/sh" > $out/bin/fgrep - echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep - - cat >$out/bin/dsymutil << EOF - #!$out/bin/sh - EOF - - chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil - ''; - - in - '' - mkdir -p $out/bin $out/lib $out/lib/darwin - - ${lib.optionalString stdenv.targetPlatform.isx86_64 '' - # Copy libSystem's .o files for various low-level boot stuff. - cp -d ${getLib darwin.Libsystem}/lib/*.o $out/lib - - # Resolv is actually a link to another package, so let's copy it properly - cp -L ${getLib darwin.Libsystem}/lib/libresolv.9.dylib $out/lib - ''} - - cp -rL ${getDev darwin.Libsystem}/include $out - chmod -R u+w $out/include - cp -rL ${getDev pkgs.libiconv}/include/* $out/include - cp -rL ${getDev pkgs.gnugrep.pcre2}/include/* $out/include - mv $out/include $out/include-Libsystem - - # Copy binutils. - for i in as ld ar ranlib nm strip otool install_name_tool lipo codesign_allocate; do - cp ${getBin darwin.binutils-unwrapped}/bin/$i $out/bin - done - cp -d ${getLib ld64}/lib/libcodedirectory*.dylib $out/lib - - # Copy coreutils, bash, etc. - cp ${getBin coreutils_}/bin/* $out/bin - (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - - cp -d ${getBin pkgs.bash}/bin/{ba,}sh $out/bin - cp -d ${getBin pkgs.diffutils}/bin/* $out/bin - cp ${getBin pkgs.findutils}/bin/{find,xargs} $out/bin - cp -d ${getBin pkgs.gawk}/bin/{g,}awk $out/bin - cp -d ${getBin pkgs.gnugrep}/bin/grep $out/bin - cp -d ${getBin pkgs.gnumake}/bin/* $out/bin - cp -d ${getBin pkgs.gnused}/bin/* $out/bin - cp -d ${getBin pkgs.patch}/bin/* $out/bin - - cp -d ${getLib pkgs.gettext}/lib/libintl*.dylib $out/lib - cp -d ${getLib pkgs.gnugrep.pcre2}/lib/libpcre2*.dylib $out/lib - cp -d ${getLib pkgs.libiconv}/lib/lib*.dylib $out/lib - cp -d ${getLib pkgs.libxml2}/lib/libxml2*.dylib $out/lib - cp -d ${getLib pkgs.ncurses}/lib/libncurses*.dylib $out/lib - - # copy package extraction tools - cp -d ${getBin pkgs.bzip2}/bin/b{,un}zip2 $out/bin - cp ${getBin pkgs.cpio}/bin/cpio $out/bin - cp ${getBin pkgs.gnutar}/bin/tar $out/bin - cp ${getBin pkgs.gzip}/bin/.gzip-wrapped $out/bin/gzip - cp ${getBin pkgs.pbzx}/bin/pbzx $out/bin - cp ${getBin pkgs.xz}/bin/xz $out/bin - cp -d ${getLib pkgs.bzip2}/lib/libbz2*.dylib $out/lib - cp -d ${getLib pkgs.gmpxx}/lib/libgmp*.dylib $out/lib - cp -d ${getLib pkgs.xar}/lib/libxar*.dylib $out/lib - cp -d ${getLib pkgs.xz}/lib/liblzma*.dylib $out/lib - cp -d ${getLib pkgs.zlib}/lib/libz*.dylib $out/lib - - # This used to be in-nixpkgs, but now is in the bundle - # because I can't be bothered to make it partially static - cp ${getBin curl_}/bin/curl $out/bin - cp -d ${getLib curl_}/lib/libcurl*.dylib $out/lib - cp -d ${getLib pkgs.openssl}/lib/*.dylib $out/lib - - # Copy what we need of clang - cp -d ${getBin pkgs.llvmPackages.clang-unwrapped}/bin/clang{,++,-cl,-cpp,-[0-9]*} $out/bin - cp -d ${getLib pkgs.llvmPackages.clang-unwrapped}/lib/libclang-cpp*.dylib $out/lib - cp -rd ${getLib pkgs.llvmPackages.clang-unwrapped}/lib/clang $out/lib - - cp -d ${getLib pkgs.llvmPackages.libcxx}/lib/libc++*.dylib $out/lib - mkdir -p $out/lib/darwin - cp -d ${getLib pkgs.llvmPackages.compiler-rt}/lib/darwin/libclang_rt.{,profile_}osx.a $out/lib/darwin - cp -d ${getLib pkgs.llvmPackages.compiler-rt}/lib/libclang_rt.{,profile_}osx.a $out/lib - cp -d ${getLib pkgs.llvmPackages.llvm}/lib/libLLVM.dylib $out/lib - cp -d ${getLib pkgs.libffi}/lib/libffi*.dylib $out/lib - - mkdir $out/include - cp -rd ${getDev pkgs.llvmPackages.libcxx}/include/c++ $out/include - - # copy .tbd assembly utils - cp ${getBin darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin - cp -d ${getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib - - # copy sigtool - cp -d ${getBin darwin.sigtool}/bin/{codesign,sigtool} $out/bin - - cp -d ${getLib darwin.libtapi}/lib/libtapi*.dylib $out/lib - - # tools needed to unpack bootstrap archive - mkdir -p unpack/bin unpack/lib - cp -d ${getBin pkgs.bash}/bin/{bash,sh} unpack/bin - cp ${getBin coreutils_}/bin/mkdir unpack/bin - cp ${getBin pkgs.gnutar}/bin/tar unpack/bin - cp ${getBin pkgs.xz}/bin/xz unpack/bin - cp -d ${getLib pkgs.gettext}/lib/libintl*.dylib unpack/lib - cp -d ${getLib pkgs.libiconv}/lib/lib*.dylib unpack/lib - cp -d ${getLib pkgs.xz}/lib/liblzma*.dylib unpack/lib - cp ${unpackScript} unpack/bootstrap-tools-unpack.sh - - # - # All files copied. Perform processing to update references to point into - # the archive - # - - chmod -R u+w $out unpack - - # - change nix store library paths to use @rpath/library - # - if needed add an rpath containing lib/ - # - strip executable - rpathify() { - local libs=$(${stdenv.cc.targetPrefix}otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*" || true) - local lib rpath - for lib in $libs; do - ${stdenv.cc.targetPrefix}install_name_tool -change $lib "@rpath/$(basename "$lib")" "$1" - done - - case "$(dirname "$1")" in - */bin) - # Strip executables even further - ${stdenv.cc.targetPrefix}strip "$i" - rpath='@executable_path/../lib' - ;; - */lib) - # the '/.' suffix is required - rpath='@loader_path/.' - ;; - */lib/darwin) - rpath='@loader_path/..' - ;; - *) - echo unkown executable $1 >&2 - exit 1 - ;; - esac - - # if shared object contains references add an rpath to lib/ - if ${stdenv.cc.targetPrefix}otool -l "$1"| grep -q '@rpath/'; then - ${stdenv.cc.targetPrefix}install_name_tool -add_rpath "$rpath" "$1" - fi - } - - # check that linked library paths exist in lib - # must be run after rpathify is performed - checkDeps() { - local deps=$(${stdenv.cc.targetPrefix}otool -l "$1"| grep -o '@rpath/[^ ]*' || true) - local lib - shopt -s extglob - for lib in $deps; do - local root="''${1/\/@(lib|bin)\/*}" - if [[ ! -e $root/''${lib/@rpath/lib} ]]; then - echo "error: $1 missing lib for $lib" >&2 - exit 1 - fi - done - shopt -u extglob - } - - for i in {unpack,$out}/bin/* {unpack,$out}/lib{,/darwin}/*.dylib; do - if [[ ! -L $i ]] && isMachO "$i"; then - rpathify "$i" - checkDeps "$i" - fi - done - - nuke-refs {unpack,$out}/bin/* - nuke-refs {unpack,$out}/lib/* - nuke-refs $out/lib/darwin/* - - mkdir $out/.pack - mv $out/* $out/.pack - mv $out/.pack $out/pack - - mkdir $out/on-server - cp -r unpack $out - - XZ_OPT="-9 -T $NIX_BUILD_CORES" tar cvJf $out/on-server/bootstrap-tools.tar.xz \ - --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . - dumpnar $out/unpack | xz -9 -T $NIX_BUILD_CORES > $out/on-server/unpack.nar.xz - ''; - - allowedReferences = []; - - meta = { - maintainers = [ lib.maintainers.copumpkin ]; - }; - }; - + build = pkgs.callPackage ./stdenv-bootstrap-tools.nix { }; bootstrapFiles = { bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz"; unpack = pkgs.runCommand "unpack" { allowedReferences = []; } '' diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix new file mode 100644 index 000000000000..0aa15d526f9f --- /dev/null +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -0,0 +1,296 @@ +{ + lib, + stdenv, + bash, + bzip2, + coreutils, + cpio, + curlMinimal, + darwin, + diffutils, + dumpnar, + findutils, + gawk, + gettext, + gmpxx, + gnugrep, + gnumake, + gnused, + gnutar, + gzip, + ld64, + libffi, + libiconv, + libxml2, + libyaml, + llvmPackages, + ncurses, + nukeReferences, + openssl, + patch, + pbzx, + writeText, + xar, + xz, + zlib, +}: +stdenv.mkDerivation { + name = "stdenv-bootstrap-tools"; + + nativeBuildInputs = [ + dumpnar + nukeReferences + ]; + + buildCommand = + let + inherit (lib) getBin getDev getLib; + + coreutils_ = + (coreutils.override (prevArgs: { + # We want coreutils without ACL support. + aclSupport = false; + # Cannot use a single binary build, or it gets dynamically linked against gmp. + singleBinary = false; + })).overrideAttrs + (prevAttrs: { + # Increase header size to be able to inject extra RPATHs. Otherwise + # x86_64-darwin build fails as: + # https://cache.nixos.org/log/g5wyq9xqshan6m3kl21bjn1z88hx48rh-stdenv-bootstrap-tools.drv + NIX_LDFLAGS = (prevAttrs.NIX_LDFLAGS or "") + " -headerpad_max_install_names"; + }); + + # Avoid messing with libkrb5 and libnghttp2. + curl_ = curlMinimal.override (prevArgs: { + gssSupport = false; + http2Support = false; + scpSupport = false; + }); + + unpackScript = writeText "bootstrap-tools-unpack.sh" '' + set -euo pipefail + + echo Unpacking the bootstrap tools... >&2 + mkdir $out + tar xf "$1" -C $out + + updateInstallName() { + local path="$1" + + cp "$path" "$path.new" + install_name_tool -id "$path" "$path.new" + codesign -f -i "$(basename "$path")" -s - "$path.new" + mv -f "$path.new" "$path" + } + + find $out/lib -type f -name '*.dylib' -print0 | while IFS= read -r -d $'\0' lib; do + updateInstallName "$lib" + done + + # as is a wrapper around clang. need to replace the nuked store paths + sed -i 's|/.*/bin/|'"$out"'/bin/|' $out/bin/as + + # Provide a gunzip script. + cat > $out/bin/gunzip < $out/bin/egrep + echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep + echo "#! $out/bin/sh" > $out/bin/fgrep + echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep + + cat >$out/bin/dsymutil << EOF + #!$out/bin/sh + EOF + + chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil + ''; + + in + '' + mkdir -p $out/bin $out/lib $out/lib/darwin + + ${lib.optionalString stdenv.targetPlatform.isx86_64 '' + # Copy libSystem's .o files for various low-level boot stuff. + cp -d ${getLib darwin.Libsystem}/lib/*.o $out/lib + + # Resolv is actually a link to another package, so let's copy it properly + cp -L ${getLib darwin.Libsystem}/lib/libresolv.9.dylib $out/lib + ''} + + cp -rL ${getDev darwin.Libsystem}/include $out + chmod -R u+w $out/include + cp -rL ${getDev libiconv}/include/* $out/include + cp -rL ${getDev gnugrep.pcre2}/include/* $out/include + mv $out/include $out/include-Libsystem + + # Copy binutils. + for i in as ld ar ranlib nm strip otool install_name_tool lipo codesign_allocate; do + cp ${getBin darwin.binutils-unwrapped}/bin/$i $out/bin + done + cp -d ${getLib ld64}/lib/libcodedirectory*.dylib $out/lib + + # Copy coreutils, bash, etc. + cp ${getBin coreutils_}/bin/* $out/bin + (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) + + cp -d ${getBin bash}/bin/{ba,}sh $out/bin + cp -d ${getBin diffutils}/bin/* $out/bin + cp ${getBin findutils}/bin/{find,xargs} $out/bin + cp -d ${getBin gawk}/bin/{g,}awk $out/bin + cp -d ${getBin gnugrep}/bin/grep $out/bin + cp -d ${getBin gnumake}/bin/* $out/bin + cp -d ${getBin gnused}/bin/* $out/bin + cp -d ${getBin patch}/bin/* $out/bin + + cp -d ${getLib gettext}/lib/libintl*.dylib $out/lib + cp -d ${getLib gnugrep.pcre2}/lib/libpcre2*.dylib $out/lib + cp -d ${getLib libiconv}/lib/lib*.dylib $out/lib + cp -d ${getLib libxml2}/lib/libxml2*.dylib $out/lib + cp -d ${getLib ncurses}/lib/libncurses*.dylib $out/lib + + # copy package extraction tools + cp -d ${getBin bzip2}/bin/b{,un}zip2 $out/bin + cp ${getBin cpio}/bin/cpio $out/bin + cp ${getBin gnutar}/bin/tar $out/bin + cp ${getBin gzip}/bin/.gzip-wrapped $out/bin/gzip + cp ${getBin pbzx}/bin/pbzx $out/bin + cp ${getBin xz}/bin/xz $out/bin + cp -d ${getLib bzip2}/lib/libbz2*.dylib $out/lib + cp -d ${getLib gmpxx}/lib/libgmp*.dylib $out/lib + cp -d ${getLib xar}/lib/libxar*.dylib $out/lib + cp -d ${getLib xz}/lib/liblzma*.dylib $out/lib + cp -d ${getLib zlib}/lib/libz*.dylib $out/lib + + # This used to be in-nixpkgs, but now is in the bundle + # because I can't be bothered to make it partially static + cp ${getBin curl_}/bin/curl $out/bin + cp -d ${getLib curl_}/lib/libcurl*.dylib $out/lib + cp -d ${getLib openssl}/lib/*.dylib $out/lib + + # Copy what we need of clang + cp -d ${getBin llvmPackages.clang-unwrapped}/bin/clang{,++,-cl,-cpp,-[0-9]*} $out/bin + cp -d ${getLib llvmPackages.clang-unwrapped}/lib/libclang-cpp*.dylib $out/lib + cp -rd ${getLib llvmPackages.clang-unwrapped}/lib/clang $out/lib + + cp -d ${getLib llvmPackages.libcxx}/lib/libc++*.dylib $out/lib + mkdir -p $out/lib/darwin + cp -d ${getLib llvmPackages.compiler-rt}/lib/darwin/libclang_rt.{,profile_}osx.a $out/lib/darwin + cp -d ${getLib llvmPackages.compiler-rt}/lib/libclang_rt.{,profile_}osx.a $out/lib + cp -d ${getLib llvmPackages.llvm}/lib/libLLVM.dylib $out/lib + cp -d ${getLib libffi}/lib/libffi*.dylib $out/lib + + mkdir $out/include + cp -rd ${getDev llvmPackages.libcxx}/include/c++ $out/include + + # copy .tbd assembly utils + cp ${getBin darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin + cp -d ${getLib libyaml}/lib/libyaml*.dylib $out/lib + + # copy sigtool + cp -d ${getBin darwin.sigtool}/bin/{codesign,sigtool} $out/bin + + cp -d ${getLib darwin.libtapi}/lib/libtapi*.dylib $out/lib + + # tools needed to unpack bootstrap archive + mkdir -p unpack/bin unpack/lib + cp -d ${getBin bash}/bin/{bash,sh} unpack/bin + cp ${getBin coreutils_}/bin/mkdir unpack/bin + cp ${getBin gnutar}/bin/tar unpack/bin + cp ${getBin xz}/bin/xz unpack/bin + cp -d ${getLib gettext}/lib/libintl*.dylib unpack/lib + cp -d ${getLib libiconv}/lib/lib*.dylib unpack/lib + cp -d ${getLib xz}/lib/liblzma*.dylib unpack/lib + cp ${unpackScript} unpack/bootstrap-tools-unpack.sh + + # + # All files copied. Perform processing to update references to point into + # the archive + # + + chmod -R u+w $out unpack + + # - change nix store library paths to use @rpath/library + # - if needed add an rpath containing lib/ + # - strip executable + rpathify() { + local libs=$(${stdenv.cc.targetPrefix}otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*" || true) + local lib rpath + for lib in $libs; do + ${stdenv.cc.targetPrefix}install_name_tool -change $lib "@rpath/$(basename "$lib")" "$1" + done + + case "$(dirname "$1")" in + */bin) + # Strip executables even further + ${stdenv.cc.targetPrefix}strip "$i" + rpath='@executable_path/../lib' + ;; + */lib) + # the '/.' suffix is required + rpath='@loader_path/.' + ;; + */lib/darwin) + rpath='@loader_path/..' + ;; + *) + echo unkown executable $1 >&2 + exit 1 + ;; + esac + + # if shared object contains references add an rpath to lib/ + if ${stdenv.cc.targetPrefix}otool -l "$1"| grep -q '@rpath/'; then + ${stdenv.cc.targetPrefix}install_name_tool -add_rpath "$rpath" "$1" + fi + } + + # check that linked library paths exist in lib + # must be run after rpathify is performed + checkDeps() { + local deps=$(${stdenv.cc.targetPrefix}otool -l "$1"| grep -o '@rpath/[^ ]*' || true) + local lib + shopt -s extglob + for lib in $deps; do + local root="''${1/\/@(lib|bin)\/*}" + if [[ ! -e $root/''${lib/@rpath/lib} ]]; then + echo "error: $1 missing lib for $lib" >&2 + exit 1 + fi + done + shopt -u extglob + } + + for i in {unpack,$out}/bin/* {unpack,$out}/lib{,/darwin}/*.dylib; do + if [[ ! -L $i ]] && isMachO "$i"; then + rpathify "$i" + checkDeps "$i" + fi + done + + nuke-refs {unpack,$out}/bin/* + nuke-refs {unpack,$out}/lib/* + nuke-refs $out/lib/darwin/* + + mkdir $out/.pack + mv $out/* $out/.pack + mv $out/.pack $out/pack + + mkdir $out/on-server + cp -r unpack $out + + XZ_OPT="-9 -T $NIX_BUILD_CORES" tar cvJf $out/on-server/bootstrap-tools.tar.xz \ + --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . + dumpnar $out/unpack | xz -9 -T $NIX_BUILD_CORES > $out/on-server/unpack.nar.xz + ''; + + allowedReferences = [ ]; + + meta = { + maintainers = [ lib.maintainers.copumpkin ]; + }; +} From d0d5a7a112ac7c836dc8c6811107e047b162d0b9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 10:41:59 -0700 Subject: [PATCH 228/481] freshBootstrapTools: extract bootstrapFiles as a passthru on its core derivation --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 7 +------ pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 075e3aeec1d1..0a81b86be5ea 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -25,12 +25,7 @@ in rec { build = pkgs.callPackage ./stdenv-bootstrap-tools.nix { }; - bootstrapFiles = { - bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz"; - unpack = pkgs.runCommand "unpack" { allowedReferences = []; } '' - cp -r ${build}/unpack $out - ''; - }; + inherit (build) bootstrapFiles; bootstrapTools = pkgs.callPackage ./bootstrap-tools.nix { inherit (bootstrapFiles) bootstrapTools unpack; diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index 0aa15d526f9f..0ad585ebd354 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -29,12 +29,13 @@ openssl, patch, pbzx, + runCommand, writeText, xar, xz, zlib, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { name = "stdenv-bootstrap-tools"; nativeBuildInputs = [ @@ -290,7 +291,16 @@ stdenv.mkDerivation { allowedReferences = [ ]; + passthru = { + bootstrapFiles = { + bootstrapTools = "${finalAttrs.finalPackage}/on-server/bootstrap-tools.tar.xz"; + unpack = runCommand "unpack" { allowedReferences = [ ]; } '' + cp -r ${finalAttrs.finalPackage}/unpack $out + ''; + }; + }; + meta = { maintainers = [ lib.maintainers.copumpkin ]; }; -} +}) From 91e1f1c9d6dc7c80e6940e73d43b66aba6e4d2a9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 10:45:45 -0700 Subject: [PATCH 229/481] freshBootstrapTools: nixfmt make-bootstrap-tools.nix --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 35 ++++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 0a81b86be5ea..b8189ccf2456 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -9,16 +9,22 @@ }: let - cross = if crossSystem != null - then { inherit crossSystem; } - else {}; + cross = if crossSystem != null then { inherit crossSystem; } else { }; - custom-bootstrap = if bootstrapFiles != null - then { stdenvStages = args: - let args' = args // { bootstrapFiles = bootstrapFiles; }; - in (import "${pkgspath}/pkgs/stdenv/darwin" args'); - } - else {}; + custom-bootstrap = + if bootstrapFiles != null then + { + stdenvStages = + args: + let + args' = args // { + bootstrapFiles = bootstrapFiles; + }; + in + (import "${pkgspath}/pkgs/stdenv/darwin" args'); + } + else + { }; pkgs = import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); in @@ -40,8 +46,13 @@ rec { # that platform. localSystem = if crossSystem != null then crossSystem else localSystem; - stdenvStages = args: let - args' = args // { inherit bootstrapFiles; }; - in (import (test-pkgspath + "/pkgs/stdenv/darwin") args'); + stdenvStages = + args: + let + args' = args // { + inherit bootstrapFiles; + }; + in + (import (test-pkgspath + "/pkgs/stdenv/darwin") args'); }; } From 1441f48d9952de0dcff900bfb943b87a9d0120a7 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 10:48:42 -0700 Subject: [PATCH 230/481] freshBootstrapTools: remove rec in favor of explicit attrset building --- pkgs/stdenv/darwin/make-bootstrap-tools.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index b8189ccf2456..49ea90cda7bd 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -27,14 +27,11 @@ let { }; pkgs = import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); -in -rec { build = pkgs.callPackage ./stdenv-bootstrap-tools.nix { }; - inherit (build) bootstrapFiles; bootstrapTools = pkgs.callPackage ./bootstrap-tools.nix { - inherit (bootstrapFiles) bootstrapTools unpack; + inherit (build.bootstrapFiles) bootstrapTools unpack; }; test = pkgs.callPackage ./test-bootstrap-tools.nix { inherit bootstrapTools; }; @@ -50,9 +47,19 @@ rec { args: let args' = args // { - inherit bootstrapFiles; + inherit (build) bootstrapFiles; }; in (import (test-pkgspath + "/pkgs/stdenv/darwin") args'); }; +in +{ + inherit + build + bootstrapTools + test + test-pkgs + ; + + inherit (build) bootstrapFiles; } From 5cbe9df983e107f96fab9f2227527eae6e2b78e1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 3 Aug 2024 01:20:45 +0200 Subject: [PATCH 231/481] fzf-make: 0.35.0 -> 0.36.0 --- pkgs/by-name/fz/fzf-make/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 0061ad81bbcd..0dd3feaa7caf 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-hrPBuNCtwYOynv0JUcEq0lVZ9k3iVPNyn04l8zVbkN4="; + hash = "sha256-IlPkJK4pYszrJ43HSTq9Xwpz3K9XnUpoF0Ry7ox85KE="; }; - cargoHash = "sha256-O7rQp70ukw7LiC+m7rlqEGHVJw3Lo93WEmL3PFD7kBM="; + cargoHash = "sha256-mMDPpiIWhGMl0a4v1msNfcQqmq5ziB+ppw7RxYNAPaI="; nativeBuildInputs = [ makeBinaryWrapper ]; From ed4cd6ab512b4d49cc8e5eb5d80b5539a2f183a9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 12:52:31 -0700 Subject: [PATCH 232/481] freshBootstrapTools.build: extract a package --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 171 +-------------- pkgs/stdenv/linux/stdenv-bootstrap-tools.nix | 211 +++++++++++++++++++ 2 files changed, 214 insertions(+), 168 deletions(-) create mode 100644 pkgs/stdenv/linux/stdenv-bootstrap-tools.nix diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 874330331bb8..57b8f9cd4d91 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -43,174 +43,9 @@ in with pkgs; rec { enableShared = false; }; - build = - let - # ${libc.src}/sysdeps/unix/sysv/linux/loongarch/lp64/libnsl.abilist does not exist! - withLibnsl = !stdenv.hostPlatform.isLoongArch64; - in - stdenv.mkDerivation { - name = "stdenv-bootstrap-tools"; - - meta = { - # Increase priority to unblock nixpkgs-unstable - # https://github.com/NixOS/nixpkgs/pull/104679#issuecomment-732267288 - schedulingPriority = 200; - }; - - nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ]; - - buildCommand = '' - set -x - mkdir -p $out/bin $out/lib $out/libexec - - '' + (if (stdenv.hostPlatform.libc == "glibc") then '' - # Copy what we need of Glibc. - cp -d ${libc.out}/lib/ld*.so* $out/lib - cp -d ${libc.out}/lib/libc*.so* $out/lib - cp -d ${libc.out}/lib/libc_nonshared.a $out/lib - cp -d ${libc.out}/lib/libm*.so* $out/lib - cp -d ${libc.out}/lib/libdl*.so* $out/lib - cp -d ${libc.out}/lib/librt*.so* $out/lib - cp -d ${libc.out}/lib/libpthread*.so* $out/lib - '' + lib.optionalString withLibnsl '' - cp -d ${libc.out}/lib/libnsl*.so* $out/lib - '' + '' - cp -d ${libc.out}/lib/libutil*.so* $out/lib - cp -d ${libc.out}/lib/libnss*.so* $out/lib - cp -d ${libc.out}/lib/libresolv*.so* $out/lib - # Copy all runtime files to enable non-PIE, PIE, static PIE and profile-generated builds - cp -d ${libc.out}/lib/*.o $out/lib - - # Hacky compat with our current unpack-bootstrap-tools.sh - ln -s librt.so "$out"/lib/librt-dummy.so - - cp -rL ${libc.dev}/include $out - chmod -R u+w "$out" - - # libc can contain linker scripts: find them, copy their deps, - # and get rid of absolute paths (nuke-refs would make them useless) - local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib") - cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${libc.out}' | sort -u) - for f in $lScripts; do - substituteInPlace "$f" --replace '${libc.out}/lib/' "" - done - - # Hopefully we won't need these. - rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video - find $out/include -name .install -exec rm {} \; - find $out/include -name ..install.cmd -exec rm {} \; - mv $out/include $out/include-glibc - '' else if (stdenv.hostPlatform.libc == "musl") then '' - # Copy what we need from musl - cp ${libc.out}/lib/* $out/lib - cp -rL ${libc.dev}/include $out - chmod -R u+w "$out" - - rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video - find $out/include -name .install -exec rm {} \; - find $out/include -name ..install.cmd -exec rm {} \; - mv $out/include $out/include-libc - '' else throw "unsupported libc for bootstrap tools") - + '' - # Copy coreutils, bash, etc. - cp -d ${coreutilsMinimal.out}/bin/* $out/bin - (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - - cp ${bash.out}/bin/bash $out/bin - cp ${findutils.out}/bin/find $out/bin - cp ${findutils.out}/bin/xargs $out/bin - cp -d ${diffutils.out}/bin/* $out/bin - cp -d ${gnused.out}/bin/* $out/bin - cp -d ${gnugrep.out}/bin/grep $out/bin - cp ${gawk.out}/bin/gawk $out/bin - cp -d ${gawk.out}/bin/awk $out/bin - cp ${tarMinimal.out}/bin/tar $out/bin - cp ${gzip.out}/bin/.gzip-wrapped $out/bin/gzip - cp ${bzip2.bin}/bin/bzip2 $out/bin - cp -d ${gnumake.out}/bin/* $out/bin - cp -d ${patch}/bin/* $out/bin - cp ${patchelf}/bin/* $out/bin - - cp -d ${gnugrep.pcre2.out}/lib/libpcre2*.so* $out/lib # needed by grep - - # Copy what we need of GCC. - cp -d ${bootGCC.out}/bin/gcc $out/bin - cp -d ${bootGCC.out}/bin/cpp $out/bin - cp -d ${bootGCC.out}/bin/g++ $out/bin - cp ${bootGCC.lib}/lib/libgcc_s.so* $out/lib - cp -d ${bootGCC.lib}/lib/libstdc++.so* $out/lib - cp -d ${bootGCC.out}/lib/libssp.a* $out/lib - cp -d ${bootGCC.out}/lib/libssp_nonshared.a $out/lib - cp -rd ${bootGCC.out}/lib/gcc $out/lib - chmod -R u+w $out/lib - rm -f $out/lib/gcc/*/*/include*/linux - rm -f $out/lib/gcc/*/*/include*/sound - rm -rf $out/lib/gcc/*/*/include*/root - rm -f $out/lib/gcc/*/*/include-fixed/asm - rm -rf $out/lib/gcc/*/*/plugin - #rm -f $out/lib/gcc/*/*/*.a - cp -rd ${bootGCC.out}/libexec/* $out/libexec - chmod -R u+w $out/libexec - rm -rf $out/libexec/gcc/*/*/plugin - mkdir -p $out/include - cp -rd ${bootGCC.out}/include/c++ $out/include - chmod -R u+w $out/include - rm -rf $out/include/c++/*/ext/pb_ds - rm -rf $out/include/c++/*/ext/parallel - - cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib - cp -d ${isl.out}/lib/libisl*.so* $out/lib - cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib - cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib - cp -d ${zlib.out}/lib/libz.so* $out/lib - - '' + lib.optionalString (stdenv.hostPlatform.isRiscV) '' - # libatomic is required on RiscV platform for C/C++ atomics and pthread - # even though they may be translated into native instructions. - cp -d ${bootGCC.out}/lib/libatomic.a* $out/lib - - '' + '' - cp -d ${bzip2.out}/lib/libbz2.so* $out/lib - - # Copy binutils. - for i in as ld ar ranlib nm strip readelf objdump; do - cp ${bootBinutils.out}/bin/$i $out/bin - done - cp -r '${lib.getLib binutils.bintools}'/lib/* "$out/lib/" - - chmod -R u+w $out - - # Strip executables even further. - for i in $out/bin/* $out/libexec/gcc/*/*/*; do - if test -x $i -a ! -L $i; then - chmod +w $i - $STRIP -s $i || true - fi - done - - nuke-refs $out/bin/* - nuke-refs $out/lib/* - nuke-refs $out/lib/*/* - nuke-refs $out/libexec/gcc/*/*/* - nuke-refs $out/lib/gcc/*/*/* - nuke-refs $out/lib/gcc/*/*/include-fixed/*{,/*} - - mkdir $out/.pack - mv $out/* $out/.pack - mv $out/.pack $out/pack - - mkdir $out/on-server - XZ_OPT="-9 -e" tar cvJf $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . - cp ${busyboxMinimal}/bin/busybox $out/on-server - chmod u+w $out/on-server/busybox - nuke-refs $out/on-server/busybox - ''; # */ - - # The result should not contain any references (store paths) so - # that we can safely copy them out of the store and to other - # locations in the store. - allowedReferences = []; - }; + build = callPackage ./stdenv-bootstrap-tools.nix { + inherit bootBinutils coreutilsMinimal tarMinimal busyboxMinimal bootGCC libc patchelf; + }; bootstrapFiles = { # Make them their own store paths to test that busybox still works when the binary is named /nix/store/HASH-busybox diff --git a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix new file mode 100644 index 000000000000..a1bad3ee31d3 --- /dev/null +++ b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix @@ -0,0 +1,211 @@ +{ + lib, + stdenv, + bash, + binutils, + bootBinutils, + bootGCC, + buildPackages, + busyboxMinimal, + bzip2, + coreutilsMinimal, + diffutils, + findutils, + gawk, + gmpxx, + gnugrep, + gnumake, + gnused, + gzip, + isl, + libc, + libmpc, + mpfr, + patch, + patchelf, + tarMinimal, + zlib, +}: +let + # ${libc.src}/sysdeps/unix/sysv/linux/loongarch/lp64/libnsl.abilist does not exist! + withLibnsl = !stdenv.hostPlatform.isLoongArch64; +in +stdenv.mkDerivation { + name = "stdenv-bootstrap-tools"; + + meta = { + # Increase priority to unblock nixpkgs-unstable + # https://github.com/NixOS/nixpkgs/pull/104679#issuecomment-732267288 + schedulingPriority = 200; + }; + + nativeBuildInputs = [ + buildPackages.nukeReferences + buildPackages.cpio + ]; + + buildCommand = + '' + set -x + mkdir -p $out/bin $out/lib $out/libexec + + '' + + ( + if (stdenv.hostPlatform.libc == "glibc") then + '' + # Copy what we need of Glibc. + cp -d ${libc.out}/lib/ld*.so* $out/lib + cp -d ${libc.out}/lib/libc*.so* $out/lib + cp -d ${libc.out}/lib/libc_nonshared.a $out/lib + cp -d ${libc.out}/lib/libm*.so* $out/lib + cp -d ${libc.out}/lib/libdl*.so* $out/lib + cp -d ${libc.out}/lib/librt*.so* $out/lib + cp -d ${libc.out}/lib/libpthread*.so* $out/lib + '' + + lib.optionalString withLibnsl '' + cp -d ${libc.out}/lib/libnsl*.so* $out/lib + '' + + '' + cp -d ${libc.out}/lib/libutil*.so* $out/lib + cp -d ${libc.out}/lib/libnss*.so* $out/lib + cp -d ${libc.out}/lib/libresolv*.so* $out/lib + # Copy all runtime files to enable non-PIE, PIE, static PIE and profile-generated builds + cp -d ${libc.out}/lib/*.o $out/lib + + # Hacky compat with our current unpack-bootstrap-tools.sh + ln -s librt.so "$out"/lib/librt-dummy.so + + cp -rL ${libc.dev}/include $out + chmod -R u+w "$out" + + # libc can contain linker scripts: find them, copy their deps, + # and get rid of absolute paths (nuke-refs would make them useless) + local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib") + cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${libc.out}' | sort -u) + for f in $lScripts; do + substituteInPlace "$f" --replace '${libc.out}/lib/' "" + done + + # Hopefully we won't need these. + rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video + find $out/include -name .install -exec rm {} \; + find $out/include -name ..install.cmd -exec rm {} \; + mv $out/include $out/include-glibc + '' + else if (stdenv.hostPlatform.libc == "musl") then + '' + # Copy what we need from musl + cp ${libc.out}/lib/* $out/lib + cp -rL ${libc.dev}/include $out + chmod -R u+w "$out" + + rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video + find $out/include -name .install -exec rm {} \; + find $out/include -name ..install.cmd -exec rm {} \; + mv $out/include $out/include-libc + '' + else + throw "unsupported libc for bootstrap tools" + ) + + '' + # Copy coreutils, bash, etc. + cp -d ${coreutilsMinimal.out}/bin/* $out/bin + (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) + + cp ${bash.out}/bin/bash $out/bin + cp ${findutils.out}/bin/find $out/bin + cp ${findutils.out}/bin/xargs $out/bin + cp -d ${diffutils.out}/bin/* $out/bin + cp -d ${gnused.out}/bin/* $out/bin + cp -d ${gnugrep.out}/bin/grep $out/bin + cp ${gawk.out}/bin/gawk $out/bin + cp -d ${gawk.out}/bin/awk $out/bin + cp ${tarMinimal.out}/bin/tar $out/bin + cp ${gzip.out}/bin/.gzip-wrapped $out/bin/gzip + cp ${bzip2.bin}/bin/bzip2 $out/bin + cp -d ${gnumake.out}/bin/* $out/bin + cp -d ${patch}/bin/* $out/bin + cp ${patchelf}/bin/* $out/bin + + cp -d ${gnugrep.pcre2.out}/lib/libpcre2*.so* $out/lib # needed by grep + + # Copy what we need of GCC. + cp -d ${bootGCC.out}/bin/gcc $out/bin + cp -d ${bootGCC.out}/bin/cpp $out/bin + cp -d ${bootGCC.out}/bin/g++ $out/bin + cp ${bootGCC.lib}/lib/libgcc_s.so* $out/lib + cp -d ${bootGCC.lib}/lib/libstdc++.so* $out/lib + cp -d ${bootGCC.out}/lib/libssp.a* $out/lib + cp -d ${bootGCC.out}/lib/libssp_nonshared.a $out/lib + cp -rd ${bootGCC.out}/lib/gcc $out/lib + chmod -R u+w $out/lib + rm -f $out/lib/gcc/*/*/include*/linux + rm -f $out/lib/gcc/*/*/include*/sound + rm -rf $out/lib/gcc/*/*/include*/root + rm -f $out/lib/gcc/*/*/include-fixed/asm + rm -rf $out/lib/gcc/*/*/plugin + #rm -f $out/lib/gcc/*/*/*.a + cp -rd ${bootGCC.out}/libexec/* $out/libexec + chmod -R u+w $out/libexec + rm -rf $out/libexec/gcc/*/*/plugin + mkdir -p $out/include + cp -rd ${bootGCC.out}/include/c++ $out/include + chmod -R u+w $out/include + rm -rf $out/include/c++/*/ext/pb_ds + rm -rf $out/include/c++/*/ext/parallel + + cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib + cp -d ${isl.out}/lib/libisl*.so* $out/lib + cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib + cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib + cp -d ${zlib.out}/lib/libz.so* $out/lib + + '' + + lib.optionalString (stdenv.hostPlatform.isRiscV) '' + # libatomic is required on RiscV platform for C/C++ atomics and pthread + # even though they may be translated into native instructions. + cp -d ${bootGCC.out}/lib/libatomic.a* $out/lib + + '' + + '' + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib + + # Copy binutils. + for i in as ld ar ranlib nm strip readelf objdump; do + cp ${bootBinutils.out}/bin/$i $out/bin + done + cp -r '${lib.getLib binutils.bintools}'/lib/* "$out/lib/" + + chmod -R u+w $out + + # Strip executables even further. + for i in $out/bin/* $out/libexec/gcc/*/*/*; do + if test -x $i -a ! -L $i; then + chmod +w $i + $STRIP -s $i || true + fi + done + + nuke-refs $out/bin/* + nuke-refs $out/lib/* + nuke-refs $out/lib/*/* + nuke-refs $out/libexec/gcc/*/*/* + nuke-refs $out/lib/gcc/*/*/* + nuke-refs $out/lib/gcc/*/*/include-fixed/*{,/*} + + mkdir $out/.pack + mv $out/* $out/.pack + mv $out/.pack $out/pack + + mkdir $out/on-server + XZ_OPT="-9 -e" tar cvJf $out/on-server/bootstrap-tools.tar.xz --hard-dereference --sort=name --numeric-owner --owner=0 --group=0 --mtime=@1 -C $out/pack . + cp ${busyboxMinimal}/bin/busybox $out/on-server + chmod u+w $out/on-server/busybox + nuke-refs $out/on-server/busybox + ''; # */ + + # The result should not contain any references (store paths) so + # that we can safely copy them out of the store and to other + # locations in the store. + allowedReferences = [ ]; +} From 67a5dcdc4124b886759baf3ed5c813c206cdc713 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 12:58:16 -0700 Subject: [PATCH 233/481] freshBootstrapTools.test: extract a package --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 54 +--------------- pkgs/stdenv/linux/test-bootstrap-tools.nix | 71 ++++++++++++++++++++++ 2 files changed, 74 insertions(+), 51 deletions(-) create mode 100644 pkgs/stdenv/linux/test-bootstrap-tools.nix diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 57b8f9cd4d91..6bf42fe0f9ca 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -74,56 +74,8 @@ in with pkgs; rec { } else throw "unsupported libc"; - test = derivation { - name = "test-bootstrap-tools"; - inherit (stdenv.hostPlatform) system; # We cannot "cross test" - builder = bootstrapFiles.busybox; - args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ]; - - buildCommand = '' - export PATH=${bootstrapTools}/bin - - ls -l - mkdir $out - mkdir $out/bin - sed --version - find --version - diff --version - patch --version - make --version - awk --version - grep --version - gcc --version - - '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext /* only basename */ (builtins.baseNameOf binutils.dynamicLinker)}) - libc_includes=${bootstrapTools}/include-glibc - '' + lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) - libc_includes=${bootstrapTools}/include-libc - '' + '' - # path to version-specific libraries, like libstdc++.so - cxx_libs=$(echo ${bootstrapTools}/lib/gcc/*/*) - export CPP="cpp -idirafter $libc_includes -B${bootstrapTools}" - export CC="gcc -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" - export CXX="g++ -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" - - echo '#include ' >> foo.c - echo '#include ' >> foo.c - echo 'int main() { printf("Hello World\\n"); return 0; }' >> foo.c - $CC -o $out/bin/foo foo.c - $out/bin/foo - - echo '#include ' >> bar.cc - echo 'int main() { std::cout << "Hello World\\n"; }' >> bar.cc - $CXX -v -o $out/bin/bar bar.cc - $out/bin/bar - - tar xvf ${hello.src} - cd hello-* - ./configure --prefix=$out - make - make install - ''; + test = callPackage ./test-bootstrap-tools.nix { + inherit bootstrapTools; + inherit (bootstrapFiles) busybox; }; } diff --git a/pkgs/stdenv/linux/test-bootstrap-tools.nix b/pkgs/stdenv/linux/test-bootstrap-tools.nix new file mode 100644 index 000000000000..e199e5159195 --- /dev/null +++ b/pkgs/stdenv/linux/test-bootstrap-tools.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + binutils, + busybox, + bootstrapTools, + hello, +}: + +builtins.derivation { + name = "test-bootstrap-tools"; + inherit (stdenv.hostPlatform) system; # We cannot "cross test" + builder = busybox; + args = [ + "ash" + "-e" + "-c" + "eval \"$buildCommand\"" + ]; + + buildCommand = + '' + export PATH=${bootstrapTools}/bin + + ls -l + mkdir $out + mkdir $out/bin + sed --version + find --version + diff --version + patch --version + make --version + awk --version + grep --version + gcc --version + + '' + + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' + rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext # only basename + (builtins.baseNameOf binutils.dynamicLinker)}) + libc_includes=${bootstrapTools}/include-glibc + '' + + lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) + libc_includes=${bootstrapTools}/include-libc + '' + + '' + # path to version-specific libraries, like libstdc++.so + cxx_libs=$(echo ${bootstrapTools}/lib/gcc/*/*) + export CPP="cpp -idirafter $libc_includes -B${bootstrapTools}" + export CC="gcc -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" + export CXX="g++ -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" + + echo '#include ' >> foo.c + echo '#include ' >> foo.c + echo 'int main() { printf("Hello World\\n"); return 0; }' >> foo.c + $CC -o $out/bin/foo foo.c + $out/bin/foo + + echo '#include ' >> bar.cc + echo 'int main() { std::cout << "Hello World\\n"; }' >> bar.cc + $CXX -v -o $out/bin/bar bar.cc + $out/bin/bar + + tar xvf ${hello.src} + cd hello-* + ./configure --prefix=$out + make + make install + ''; +} From fd5887f5d07b63e3913ec4e5659e8885249c1030 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 13:02:16 -0700 Subject: [PATCH 234/481] freshBootstrapTools.build: put bootstrapFiles into stdenv-bootstrap-tools.nix --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 6 +----- pkgs/stdenv/linux/stdenv-bootstrap-tools.nix | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 6bf42fe0f9ca..1dafc924454b 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -47,11 +47,7 @@ in with pkgs; rec { inherit bootBinutils coreutilsMinimal tarMinimal busyboxMinimal bootGCC libc patchelf; }; - bootstrapFiles = { - # Make them their own store paths to test that busybox still works when the binary is named /nix/store/HASH-busybox - busybox = runCommand "busybox" {} "cp ${build}/on-server/busybox $out"; - bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; - }; + inherit (build) bootstrapFiles; bootstrapTools = let extraAttrs = lib.optionalAttrs diff --git a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix index a1bad3ee31d3..894c70389267 100644 --- a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix @@ -23,6 +23,7 @@ mpfr, patch, patchelf, + runCommand, tarMinimal, zlib, }: @@ -30,7 +31,7 @@ let # ${libc.src}/sysdeps/unix/sysv/linux/loongarch/lp64/libnsl.abilist does not exist! withLibnsl = !stdenv.hostPlatform.isLoongArch64; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { name = "stdenv-bootstrap-tools"; meta = { @@ -208,4 +209,14 @@ stdenv.mkDerivation { # that we can safely copy them out of the store and to other # locations in the store. allowedReferences = [ ]; -} + + passthru = { + bootstrapFiles = { + # Make them their own store paths to test that busybox still works when the binary is named /nix/store/HASH-busybox + busybox = runCommand "busybox" { } "cp ${finalAttrs.finalPackage}/on-server/busybox $out"; + bootstrapTools = + runCommand "bootstrap-tools.tar.xz" { } + "cp ${finalAttrs.finalPackage}/on-server/bootstrap-tools.tar.xz $out"; + }; + }; +}) From 0a8120ff7d864a6575425ae8655b9d21f88aa8fc Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 17:51:59 -0700 Subject: [PATCH 235/481] freshBootstrapTools: avoid top-level with --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 1dafc924454b..192496e549d2 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,15 +1,15 @@ { pkgs ? import ../../.. {} }: let + inherit (pkgs) lib stdenv config; libc = pkgs.stdenv.cc.libc; patchelf = pkgs.patchelf.overrideAttrs(previousAttrs: { NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or []) ++ [ "-static-libgcc" "-static-libstdc++" ]; NIX_CFLAGS_LINK = (previousAttrs.NIX_CFLAGS_LINK or []) ++ [ "-static-libgcc" "-static-libstdc++" ]; }); -in with pkgs; rec { - - - coreutilsMinimal = coreutils.override (args: { +in +rec { + coreutilsMinimal = pkgs.coreutils.override (args: { # We want coreutils without ACL/attr support. aclSupport = false; attrSupport = false; @@ -17,10 +17,10 @@ in with pkgs; rec { singleBinary = "symlinks"; }); - tarMinimal = gnutar.override { acl = null; }; + tarMinimal = pkgs.gnutar.override { acl = null; }; - busyboxMinimal = busybox.override { - useMusl = lib.meta.availableOn stdenv.hostPlatform musl; + busyboxMinimal = pkgs.busybox.override { + useMusl = lib.meta.availableOn stdenv.hostPlatform pkgs.musl; enableStatic = true; enableMinimal = true; extraConfig = '' @@ -34,8 +34,8 @@ in with pkgs; rec { ''; }; - bootGCC = gcc.cc.override { enableLTO = false; }; - bootBinutils = binutils.bintools.override { + bootGCC = pkgs.gcc.cc.override { enableLTO = false; }; + bootBinutils = pkgs.binutils.bintools.override { withAllTargets = false; # Don't need two linkers, disable whatever's not primary/default. enableGold = false; @@ -43,7 +43,7 @@ in with pkgs; rec { enableShared = false; }; - build = callPackage ./stdenv-bootstrap-tools.nix { + build = pkgs.callPackage ./stdenv-bootstrap-tools.nix { inherit bootBinutils coreutilsMinimal tarMinimal busyboxMinimal bootGCC libc patchelf; }; @@ -70,7 +70,7 @@ in with pkgs; rec { } else throw "unsupported libc"; - test = callPackage ./test-bootstrap-tools.nix { + test = pkgs.callPackage ./test-bootstrap-tools.nix { inherit bootstrapTools; inherit (bootstrapFiles) busybox; }; From 052ecdbfaebcaf63dcad2b43c7b97991906a01bb Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 27 Jul 2024 19:44:59 -0700 Subject: [PATCH 236/481] freshBootstrapTools: unify glibc and musl into the same directory CI required that I `nixfmt` them at the same time. --- .../linux/bootstrap-tools-musl/default.nix | 19 ---------- pkgs/stdenv/linux/bootstrap-tools/default.nix | 24 ------------- pkgs/stdenv/linux/bootstrap-tools/glibc.nix | 35 +++++++++++++++++++ .../unpack-bootstrap-tools.sh | 0 pkgs/stdenv/linux/bootstrap-tools/musl.nix | 34 ++++++++++++++++++ .../musl}/unpack-bootstrap-tools.sh | 0 pkgs/stdenv/linux/default.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 +-- 8 files changed, 72 insertions(+), 46 deletions(-) delete mode 100644 pkgs/stdenv/linux/bootstrap-tools-musl/default.nix delete mode 100644 pkgs/stdenv/linux/bootstrap-tools/default.nix create mode 100644 pkgs/stdenv/linux/bootstrap-tools/glibc.nix rename pkgs/stdenv/linux/bootstrap-tools/{scripts => glibc}/unpack-bootstrap-tools.sh (100%) create mode 100644 pkgs/stdenv/linux/bootstrap-tools/musl.nix rename pkgs/stdenv/linux/{bootstrap-tools-musl/scripts => bootstrap-tools/musl}/unpack-bootstrap-tools.sh (100%) diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix deleted file mode 100644 index 6d2490acfa47..000000000000 --- a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ system, bootstrapFiles, extraAttrs }: - -derivation ({ - name = "bootstrap-tools"; - - builder = bootstrapFiles.busybox; - - args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; - - tarball = bootstrapFiles.bootstrapTools; - - inherit system; - - # Needed by the GCC wrapper. - langC = true; - langCC = true; - isGNU = true; - hardeningUnsupportedFlags = [ "fortify3" "zerocallusedregs" "trivialautovarinit" ]; -} // extraAttrs) diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix deleted file mode 100644 index 4450679983ff..000000000000 --- a/pkgs/stdenv/linux/bootstrap-tools/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ system, bootstrapFiles, extraAttrs }: - -derivation ({ - name = "bootstrap-tools"; - - builder = bootstrapFiles.busybox; - - args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; - - tarball = bootstrapFiles.bootstrapTools; - - inherit system; - - # Needed by the GCC wrapper. - langC = true; - langCC = true; - isGNU = true; - hardeningUnsupportedFlags = [ - "fortify3" - "stackclashprotection" - "trivialautovarinit" - "zerocallusedregs" - ]; -} // extraAttrs) diff --git a/pkgs/stdenv/linux/bootstrap-tools/glibc.nix b/pkgs/stdenv/linux/bootstrap-tools/glibc.nix new file mode 100644 index 000000000000..68a1438e3804 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-tools/glibc.nix @@ -0,0 +1,35 @@ +{ + system, + bootstrapFiles, + extraAttrs, +}: + +derivation ( + { + name = "bootstrap-tools"; + + builder = bootstrapFiles.busybox; + + args = [ + "ash" + "-e" + ./glibc/unpack-bootstrap-tools.sh + ]; + + tarball = bootstrapFiles.bootstrapTools; + + inherit system; + + # Needed by the GCC wrapper. + langC = true; + langCC = true; + isGNU = true; + hardeningUnsupportedFlags = [ + "fortify3" + "stackclashprotection" + "trivialautovarinit" + "zerocallusedregs" + ]; + } + // extraAttrs +) diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/glibc/unpack-bootstrap-tools.sh similarity index 100% rename from pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh rename to pkgs/stdenv/linux/bootstrap-tools/glibc/unpack-bootstrap-tools.sh diff --git a/pkgs/stdenv/linux/bootstrap-tools/musl.nix b/pkgs/stdenv/linux/bootstrap-tools/musl.nix new file mode 100644 index 000000000000..a3fdcc320718 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-tools/musl.nix @@ -0,0 +1,34 @@ +{ + system, + bootstrapFiles, + extraAttrs, +}: + +derivation ( + { + name = "bootstrap-tools"; + + builder = bootstrapFiles.busybox; + + args = [ + "ash" + "-e" + ./musl/unpack-bootstrap-tools.sh + ]; + + tarball = bootstrapFiles.bootstrapTools; + + inherit system; + + # Needed by the GCC wrapper. + langC = true; + langCC = true; + isGNU = true; + hardeningUnsupportedFlags = [ + "fortify3" + "zerocallusedregs" + "trivialautovarinit" + ]; + } + // extraAttrs +) diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/musl/unpack-bootstrap-tools.sh similarity index 100% rename from pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh rename to pkgs/stdenv/linux/bootstrap-tools/musl/unpack-bootstrap-tools.sh diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e1801abcb485..7b6718ae2d80 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -139,7 +139,7 @@ let # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). - bootstrapTools = (import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { + bootstrapTools = (import (if localSystem.libc == "musl" then ./bootstrap-tools/musl.nix else ./bootstrap-tools/glibc.nix) { inherit system bootstrapFiles; extraAttrs = lib.optionalAttrs config.contentAddressedByDefault { __contentAddressed = true; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 192496e549d2..5796154b6b53 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -59,12 +59,12 @@ rec { }; in if (stdenv.hostPlatform.libc == "glibc") then - import ./bootstrap-tools { + import ./bootstrap-tools/glibc.nix { inherit (stdenv.buildPlatform) system; # Used to determine where to build inherit bootstrapFiles extraAttrs; } else if (stdenv.hostPlatform.libc == "musl") then - import ./bootstrap-tools-musl { + import ./bootstrap-tools/musl.nix { inherit (stdenv.buildPlatform) system; # Used to determine where to build inherit bootstrapFiles extraAttrs; } From 2587d88ee89b4b29870703d94090f37c97d9f3af Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 2 Aug 2024 17:16:29 -0700 Subject: [PATCH 237/481] freshBootstrapTools.bootstrapTools: extract as a sort of package --- pkgs/stdenv/linux/bootstrap-tools/default.nix | 35 +++++++++++++++++++ pkgs/stdenv/linux/default.nix | 13 +++---- pkgs/stdenv/linux/make-bootstrap-tools.nix | 25 +++---------- 3 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 pkgs/stdenv/linux/bootstrap-tools/default.nix diff --git a/pkgs/stdenv/linux/bootstrap-tools/default.nix b/pkgs/stdenv/linux/bootstrap-tools/default.nix new file mode 100644 index 000000000000..2314fe84d9d0 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix @@ -0,0 +1,35 @@ +{ + lib, + libc, + config, + system, + bootstrapFiles, + isFromBootstrapFiles ? false, +}: + +let + maybeDenoteProvenance = lib.optionalAttrs isFromBootstrapFiles { + passthru = { + inherit isFromBootstrapFiles; + }; + }; + + maybeContentAddressed = lib.optionalAttrs config.contentAddressedByDefault { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + + args = { + inherit system bootstrapFiles; + extraAttrs = maybeContentAddressed; + }; + result = + if libc == "glibc" then + import ./glibc.nix args + else if libc == "musl" then + import ./musl.nix args + else + throw "unsupported libc"; +in +result // maybeDenoteProvenance diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 7b6718ae2d80..1f1c4771d167 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -139,14 +139,11 @@ let # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). - bootstrapTools = (import (if localSystem.libc == "musl" then ./bootstrap-tools/musl.nix else ./bootstrap-tools/glibc.nix) { - inherit system bootstrapFiles; - extraAttrs = lib.optionalAttrs config.contentAddressedByDefault { - __contentAddressed = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }; - }) // { passthru.isFromBootstrapFiles = true; }; + bootstrapTools = import ./bootstrap-tools { + inherit (localSystem) libc system; + inherit lib bootstrapFiles config; + isFromBootstrapFiles = true; + }; getLibc = stage: stage.${localSystem.libc}; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 5796154b6b53..31e16ab6ad7e 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -49,26 +49,11 @@ rec { inherit (build) bootstrapFiles; - bootstrapTools = - let extraAttrs = lib.optionalAttrs - config.contentAddressedByDefault - { - __contentAddressed = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }; - in - if (stdenv.hostPlatform.libc == "glibc") then - import ./bootstrap-tools/glibc.nix { - inherit (stdenv.buildPlatform) system; # Used to determine where to build - inherit bootstrapFiles extraAttrs; - } - else if (stdenv.hostPlatform.libc == "musl") then - import ./bootstrap-tools/musl.nix { - inherit (stdenv.buildPlatform) system; # Used to determine where to build - inherit bootstrapFiles extraAttrs; - } - else throw "unsupported libc"; + bootstrapTools = import ./bootstrap-tools { + inherit (stdenv.buildPlatform) system; # Used to determine where to build + inherit (stdenv.hostPlatform) libc; + inherit lib bootstrapFiles config; + }; test = pkgs.callPackage ./test-bootstrap-tools.nix { inherit bootstrapTools; From e915f6b32ee29405e803cd67e0c80cbfafd61319 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 2 Aug 2024 17:19:37 -0700 Subject: [PATCH 238/481] freshBootstrapTools: run nixfmt --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 29 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 31e16ab6ad7e..77834e55f66a 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,11 +1,21 @@ -{ pkgs ? import ../../.. {} }: +{ + pkgs ? import ../../.. { }, +}: let inherit (pkgs) lib stdenv config; + libc = pkgs.stdenv.cc.libc; - patchelf = pkgs.patchelf.overrideAttrs(previousAttrs: { - NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or []) ++ [ "-static-libgcc" "-static-libstdc++" ]; - NIX_CFLAGS_LINK = (previousAttrs.NIX_CFLAGS_LINK or []) ++ [ "-static-libgcc" "-static-libstdc++" ]; + + patchelf = pkgs.patchelf.overrideAttrs (previousAttrs: { + NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or [ ]) ++ [ + "-static-libgcc" + "-static-libstdc++" + ]; + NIX_CFLAGS_LINK = (previousAttrs.NIX_CFLAGS_LINK or [ ]) ++ [ + "-static-libgcc" + "-static-libstdc++" + ]; }); in rec { @@ -35,6 +45,7 @@ rec { }; bootGCC = pkgs.gcc.cc.override { enableLTO = false; }; + bootBinutils = pkgs.binutils.bintools.override { withAllTargets = false; # Don't need two linkers, disable whatever's not primary/default. @@ -44,7 +55,15 @@ rec { }; build = pkgs.callPackage ./stdenv-bootstrap-tools.nix { - inherit bootBinutils coreutilsMinimal tarMinimal busyboxMinimal bootGCC libc patchelf; + inherit + bootBinutils + coreutilsMinimal + tarMinimal + busyboxMinimal + bootGCC + libc + patchelf + ; }; inherit (build) bootstrapFiles; From 4b111056cf46e08c76f329a3c9716b83dfefaa25 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 2 Aug 2024 18:22:41 -0700 Subject: [PATCH 239/481] pkgs/top-level/aliases.nix: move llvmPackages_git back in --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0b4ad43fbe1..4fb40e6104d6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -874,6 +874,8 @@ mapAliases ({ linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; + llvmPackages_git = (recurseIntoAttrs (callPackages ../development/compilers/llvm { })).git; + lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 lld_8 = throw "lld_8 has been removed from nixpkgs"; # Added 2024-01-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 553bb6794a9d..295b3e6edfb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15973,8 +15973,6 @@ with pkgs; lldb_19 = llvmPackages_19.lldb; llvm_19 = llvmPackages_19.llvm; bolt_19 = llvmPackages_19.bolt; - - llvmPackages_git = llvmPackagesSet.git; }) llvmPackages_13 llvmPackages_14 llvmPackages_15 @@ -15990,8 +15988,7 @@ with pkgs; lld_19 lldb_19 llvm_19 - bolt_19 - llvmPackages_git; + bolt_19; lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; From daadebae3e610fd757c2e569b870183eeaf8165d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 01:23:51 +0000 Subject: [PATCH 240/481] kubedock: 0.16.0 -> 0.17.0 --- pkgs/development/tools/kubedock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/development/tools/kubedock/default.nix index 975905f5588f..b7103c18a223 100644 --- a/pkgs/development/tools/kubedock/default.nix +++ b/pkgs/development/tools/kubedock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubedock"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = version; - hash = "sha256-nShiBTkUNBshDDNuDvl0nnGy4BoFrn8hmtFKYOWjfpU="; + hash = "sha256-UfOFehpN9Qj4LKH61akSidikPytZS4QSFOUzDDw3OCI="; }; - vendorHash = "sha256-BYd45oaJjAr2xctp1Ew8xdwtiTASNElXzQg47xUI7yU="; + vendorHash = "sha256-qPBqKDn6NFa35+f+s2iCeHKdLI7ihK1DUMlq2mldNEI="; # config.Build not defined as it would break r-ryantm ldflags = [ From 01890a284a0902246e00f3bfda54715e0a8e6981 Mon Sep 17 00:00:00 2001 From: Riley Bruins Date: Fri, 2 Aug 2024 18:27:52 -0700 Subject: [PATCH 241/481] lua-language-server: 3.9.3 -> 3.10.1 --- .../tools/language-servers/lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 8bdcd20cdb53..56d01b585bf3 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.9.3"; + version = "3.10.1"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-o3NRiJF9Cl420TYOZXC3JplKW5MYo/6nc0XPdukaly4="; + hash = "sha256-05b/NUpM6LASihZuMEduMCvh6ss44yHcA20gOQDMPAQ="; fetchSubmodules = true; }; From 9913cedc5b4fd6384aacce3eb6e15687f956ef29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 02:21:53 +0000 Subject: [PATCH 242/481] nest: 3.7 -> 3.8 --- pkgs/applications/science/biology/nest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 0b2dcbf9af3c..96418346eeb9 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "nest"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "nest"; repo = "nest-simulator"; rev = "v${version}"; - hash = "sha256-EwhpsfRmBLJnPiH6hXQXgG9jSNoC2oqq5lZ6t038VpI="; + hash = "sha256-hysOe1ZZpCClVOGo0+UeCP7imAakXrZlnJ4V95zfiyA="; }; postPatch = '' From 7f3849b3bec37b9b452b79d081a333028d13028a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 02:22:34 +0000 Subject: [PATCH 243/481] hcledit: 0.2.11 -> 0.2.13 --- pkgs/tools/text/hcledit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/hcledit/default.nix b/pkgs/tools/text/hcledit/default.nix index 86c1e226fd0e..9c48e5c6729e 100644 --- a/pkgs/tools/text/hcledit/default.nix +++ b/pkgs/tools/text/hcledit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hcledit"; - version = "0.2.11"; + version = "0.2.13"; src = fetchFromGitHub { owner = "minamijoyo"; repo = pname; rev = "v${version}"; - hash = "sha256-UtZ59S8Cn29HNE9UpmJFtPkB8TMpDUOzlLMf78a+Vd4="; + hash = "sha256-AKNvbvRfy5QpbR1WLBlf4YcbTdX9rTGS/bovDWQXYZo="; }; - vendorHash = "sha256-huDM8kPA6vQcoJTxiWzVFZKHrTKw1ip32hMZJYZM0og="; + vendorHash = "sha256-G6jmdosQHBA+n7MgVAlzdSTqPYb5d+k4b4EzAI384FQ="; meta = with lib; { description = "Command line editor for HCL"; From f4dbe80c4d069a5cf5abc992e4a612b73be71d00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 02:40:36 +0000 Subject: [PATCH 244/481] pfetch-rs: 2.10.0 -> 2.11.0 --- pkgs/tools/misc/pfetch-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/tools/misc/pfetch-rs/default.nix index e5cb03d01dc1..0a2e3c9ec38d 100644 --- a/pkgs/tools/misc/pfetch-rs/default.nix +++ b/pkgs/tools/misc/pfetch-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pfetch-rs"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "Gobidev"; repo = pname; rev = "v${version}"; - hash = "sha256-Sq5bHbUxZxgbCmekKVNlgVAXTAxY2sSPgUeFJ/nzkU4="; + hash = "sha256-1Br/mO7hisTFxiPJs5vOC+idENYMqfzJEmPBXOFGc58="; }; - cargoHash = "sha256-nEI2boe7bP/c5WKl7LifQNA2VxMvpxGeCyHcwr3aG7E="; + cargoHash = "sha256-/gYL32kUA4gKTGogMrOghQ3XYFjw3GsDhzynUC/OyXY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit From 6b309be9a661d680f7c3daa0d8524aa3b135d0f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 02:48:27 +0000 Subject: [PATCH 245/481] src-cli: 5.4.0 -> 5.5.0 --- pkgs/development/tools/misc/src-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/development/tools/misc/src-cli/default.nix index 9d7978211ce0..44b8cc62145d 100644 --- a/pkgs/development/tools/misc/src-cli/default.nix +++ b/pkgs/development/tools/misc/src-cli/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-EFt/CnQcwtcm8Yr8e03+cSP5hgWwamtA2dILjD/QcMM="; + hash = "sha256-3hj/nY66z3AjdvmdvkKTAXD8E6A4qPtLOuY7U6sKw9U="; }; - vendorHash = "sha256-QR/Gcyx+QYK9cmCfotYOTcmcPOC+2ZA2+OQOUmNNmQE="; + vendorHash = "sha256-F6TEw9hk8Fu7uY8/KW4etyZMqOb/GL/g4NV87JjfAsY="; subPackages = [ "cmd/src" From 9221b42b43881053ca26cf535cc9f71041297206 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 03:24:27 +0000 Subject: [PATCH 246/481] rehex: 0.62.0 -> 0.62.1 --- pkgs/applications/editors/rehex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 5bbad94a71b0..55e737a78039 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.62.0"; + version = "0.62.1"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - hash = "sha256-YHecsYEgVBiisz/GKHBBA4qEcRFGWTDAptljDdoLS9A="; + hash = "sha256-RlYpg3aon1d25n8K/bbHGVLn5/iOOUSlvjT8U0fp9hA="; }; nativeBuildInputs = [ pkg-config which zip ] From 60d35394e3555be44e15f46649890b74f300afe7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 03:28:13 +0000 Subject: [PATCH 247/481] sqlx-cli: 0.7.4 -> 0.8.0 --- pkgs/development/tools/rust/sqlx-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index fed8c02a5eaf..ef98fb9bd23b 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - hash = "sha256-q1o2pNKfvenpRwiYgIKkOYNcajgIhrhCjFC7bbEyLE4="; + hash = "sha256-amccPHkgtBm52PG6Lnv5Hyqff2O56GH6mVTmK5oi3ao="; }; - cargoHash = "sha256-sMyK1v4pJmmlN47mvgUkpLBjcpmT346VSp984IpvVWY="; + cargoHash = "sha256-ywKYq36G19jLg/H/OAHJv6VNSTcJ8gYUTJzE2zulKfc="; buildNoDefaultFeatures = true; buildFeatures = [ From e787df99a3d80c4efd3dd162b23cb760bc492378 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 03:29:24 +0000 Subject: [PATCH 248/481] grafana-agent: 0.41.1 -> 0.42.0 --- pkgs/servers/monitoring/grafana-agent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 910c8d6558e8..98a26fa5a9f5 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,21 +15,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.41.1"; + version = "0.42.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-A/h8Mwtor4VUT7e7TsNiE/0OOXCSq38GAf9j7c8ZDKk="; + hash = "sha256-qSxm00zC1Ms9C5R077Zn5FKluEqFs8KYUPnDUaMvMs8="; }; - vendorHash = "sha256-W29GZoZfgjdSwGiFz4udGA9gXgmM0xIDEGld7ZE1ycQ="; + vendorHash = "sha256-rC8iqCZ6tzXVCOHNqH+jAMDh2yTAR88zj45HcgJ2lSg="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/internal/web/ui/yarn.lock"; - hash = "sha256-WqbIg18qUNcs9O2wh7DAzwXKb60iEuPL8zFCIgScqI0="; + hash = "sha256-FvrfWcuKld242YfZ8CixF5GGFRp8iFWZ3Vkef3Kf4ag="; }; ldflags = let From 373e23053ac7196d274058b19fffd881a5df7146 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 03:51:59 +0000 Subject: [PATCH 249/481] python312Packages.outlines: 0.0.45 -> 0.0.46 --- pkgs/development/python-modules/outlines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index e93ce65e23ad..52ba16676fd0 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "outlines"; - version = "0.0.45"; + version = "0.0.46"; pyproject = true; src = fetchFromGitHub { owner = "outlines-dev"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VJ/q3NBNatBv3gsV637sciiOHdDJRnMlcisu5GRmWM0="; + hash = "sha256-6VH9BcMRVRf2xvLcK3GNA1pGgAOs95UOlFQ6KxHXwKo="; }; nativeBuildInputs = [ From 1130d8c4bc7b6776501808a72529cda5a28ed888 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 23:57:05 -0400 Subject: [PATCH 250/481] dotenv-cli: remove usage of mkYarnPackage --- pkgs/by-name/do/dotenv-cli/package.json | 26 ------------------------- pkgs/by-name/do/dotenv-cli/package.nix | 19 +++++++++++++----- 2 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 pkgs/by-name/do/dotenv-cli/package.json diff --git a/pkgs/by-name/do/dotenv-cli/package.json b/pkgs/by-name/do/dotenv-cli/package.json deleted file mode 100644 index 3ad9bff441a1..000000000000 --- a/pkgs/by-name/do/dotenv-cli/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "dotenv-cli", - "description": "A global executable to run applications with the ENV variables loaded by dotenv", - "version": "7.4.3", - "author": "entropitor", - "bin": { - "dotenv": "./cli.js" - }, - "dependencies": { - "cross-spawn": "^7.0.3", - "dotenv": "^16.3.0", - "dotenv-expand": "^10.0.0", - "minimist": "^1.2.6" - }, - "devDependencies": { - "standard": "^16.0.4" - }, - "license": "MIT", - "main": "index.js", - "preferGlobal": true, - "repository": "entropitor/dotenv-cli", - "scripts": { - "lint": "standard" - }, - "resolutions": {} -} diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix index 298fb07118c1..8ca6297020bc 100644 --- a/pkgs/by-name/do/dotenv-cli/package.nix +++ b/pkgs/by-name/do/dotenv-cli/package.nix @@ -1,10 +1,14 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, - nix-update-script -}: mkYarnPackage rec { + yarnConfigHook, + npmHooks, + nodejs, + nix-update-script, +}: +stdenv.mkDerivation rec { pname = "dotenv-cli"; version = "7.4.3"; @@ -15,12 +19,17 @@ hash = "sha256-kR9LSHvbvKLuJBGrsmYMeqF3s8SF+/99OeNlKp9azI8="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { + yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-Sx5DHUAXquqMqJgvhvHcRPqkfWN49+6icUQIos6OHCg="; }; + nativeBuildInputs = [ + yarnConfigHook + npmHooks.npmInstallHook + nodejs + ]; + passthru.updateScript = nix-update-script { }; meta = { From b71a4af0075f888103f4e8eea8799418ee23ca6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 04:00:03 +0000 Subject: [PATCH 251/481] python312Packages.anthropic: 0.31.2 -> 0.32.0 --- pkgs/development/python-modules/anthropic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index ed26deaabdec..1cdc8595e296 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.31.2"; + version = "0.32.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-cKXOIVpF+CZ542JX9flQYKSrdYkSVeNESUztB6yaATQ="; + hash = "sha256-en2vaHI+fE4Jrh91EtFyWRBr+k6KVPanwiOXkZBi3Ts="; }; build-system = [ From 624e692ae1b4af2da682041ee326e542ec623b74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 04:07:55 +0000 Subject: [PATCH 252/481] python312Packages.strawberry-graphql: 0.236.0 -> 0.237.3 --- .../development/python-modules/strawberry-graphql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 05a7f8fc4003..1e3a816d6572 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.236.0"; + version = "0.237.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-k5BzU2VQ5r5nPduJL8DKQSOFYqfgFECtkkEzQB01sq4="; + hash = "sha256-w9ADHKpYijUtN/tB9ANN2ebTMNw8wvqMuYP9fNkisQw="; }; patches = [ From 6f13ea465a2496f4139b61263e97bbe1977b6bbc Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 3 Aug 2024 00:22:18 -0400 Subject: [PATCH 253/481] railway: 3.11.1 -> 3.11.2 Diff: https://github.com/railwayapp/cli/compare/v3.11.1...v3.11.2 Changelog: https://github.com/railwayapp/cli/releases/tag/v3.11.2 --- pkgs/development/tools/railway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index afa5b0d9630b..45527ab0c899 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-96CfSRe6Myzk03xn+d8+d5i37g4FTYryaC+Bfn9qfL0="; + hash = "sha256-uYe/8FwiMFwxpKF3wz+EOz7OUjYV37RUG7kf1ZCZX1c="; }; - cargoHash = "sha256-EmmOI0jfd+IUFl7cU1nLkHX99u9XpaWBKy9TcEtMzYM="; + cargoHash = "sha256-3CjKI3lIIa2H8F9Kc34NZr0D99D0aypFNwh+YPN/EZQ="; nativeBuildInputs = [ pkg-config ]; From b3ddca49aa745add8a1529291e2113f57e3f80be Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 3 Aug 2024 00:27:18 -0400 Subject: [PATCH 254/481] railway: nixfmt --- pkgs/development/tools/railway/default.nix | 27 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 45527ab0c899..a7bf54716aaa 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -1,5 +1,14 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices -, Security, SystemConfiguration }: +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + CoreServices, + Security, + SystemConfiguration, +}: rustPlatform.buildRustPackage rec { pname = "railway"; @@ -16,8 +25,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + CoreServices + Security + SystemConfiguration + ]; OPENSSL_NO_VENDOR = 1; @@ -27,6 +41,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/railwayapp/cli"; changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Crafter techknowlogick ]; + maintainers = with maintainers; [ + Crafter + techknowlogick + ]; }; } From 9246489a8af4a093f60460ce0e07e63072edcdfd Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 3 Aug 2024 00:29:12 -0400 Subject: [PATCH 255/481] railway: move to pkgs/by-name --- .../default.nix => by-name/ra/railway/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{development/tools/railway/default.nix => by-name/ra/railway/package.nix} (90%) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/by-name/ra/railway/package.nix similarity index 90% rename from pkgs/development/tools/railway/default.nix rename to pkgs/by-name/ra/railway/package.nix index a7bf54716aaa..5656ed8457ae 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -1,15 +1,15 @@ { lib, + darwin, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, - CoreServices, - Security, - SystemConfiguration, }: - +let + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; +in rustPlatform.buildRustPackage rec { pname = "railway"; version = "3.11.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 553bb6794a9d..c495cf3f1d2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12045,10 +12045,6 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; - railway = callPackage ../development/tools/railway { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; - quota = if stdenv.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; From c19698cb744ed60e447b2cab4667fd294488cb0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 05:32:41 +0000 Subject: [PATCH 256/481] telepresence2: 2.19.0 -> 2.19.1 --- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 8dfcf19e5274..47c9f6dc1bca 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.19.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-hszaYU0bKd6gtQE57YaorAIZ4IKqoa2+PAgENUCBoVA="; + hash = "sha256-gOoIvPvCc4wcTNhfsOGqYsvM2eibtDcvp986Dkx099A="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-MMI44rfOk8BXxyxhb/OLKjwwe0Zc6UY3xkCbbBL4MS8="; + vendorHash = "sha256-3FJ7doC+KIkSY3DZ7ObtlOtDZy0MsPp+Oh9zX1xmhKI="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" From 943635f1b87a2b9087a4d2b95377d144695074da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 06:12:26 +0000 Subject: [PATCH 257/481] syshud: 0-unstable-2024-07-16 -> 0-unstable-2024-07-29 --- pkgs/by-name/sy/syshud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index e70a64bf8518..885942d9ead2 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-07-16"; + version = "0-unstable-2024-07-29"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "d60c3bb6c8eefba743478fe7c183055fa057e69e"; - hash = "sha256-2aVqCXUZYGtv6xIqbZ1yk3SZK45igZVgPl0byxTXu8E="; + rev = "f245db6bcd2278cfae6d296c152bfc526f1f7601"; + hash = "sha256-XxyYLRPIWNsCJFTI7ZoIEvJ0gt2Ok9EgK2fhRf2VWZQ="; }; postPatch = '' From 6b618f7371f11d30a22d13000a4667e90280337f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 06:15:10 +0000 Subject: [PATCH 258/481] remnote: 1.16.72 -> 1.16.93 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index b0a3fc50d88b..48c0dc688471 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.16.72"; + version = "1.16.93"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-BoKxQ8ngfShm7tC+ojgIR8krq82gJOdbGy8/K7yDRLM="; + hash = "sha256-2TyOEzB21RE/Ymz7LSyI5bnbiVXGos6vngbiphTEDSw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 23aa9f6c5e71d37ba8029320e33d3c4b6e3c1769 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 3 Aug 2024 09:46:01 +0200 Subject: [PATCH 259/481] pdf-sign: 0-unstable-2023-08-08 -> 0-unstable-2024-07-16 --- pkgs/by-name/pd/pdf-sign/package.nix | 38 ++++++++++++++++------------ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/pd/pdf-sign/package.nix b/pkgs/by-name/pd/pdf-sign/package.nix index 9ec4f32ec4c4..f226c2cb315f 100644 --- a/pkgs/by-name/pd/pdf-sign/package.nix +++ b/pkgs/by-name/pd/pdf-sign/package.nix @@ -1,27 +1,33 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, -, python3 -, ghostscript -, pdftk -, poppler_utils -, makeBinaryWrapper + python3, + ghostscript, + qpdf, + poppler_utils, + makeBinaryWrapper, }: let python = python3.withPackages (ps: with ps; [ tkinter ]); - binPath = lib.makeBinPath [ ghostscript pdftk poppler_utils ]; + + binPath = lib.makeBinPath [ + ghostscript + qpdf + poppler_utils + ]; in stdenv.mkDerivation { pname = "pdf-sign"; - version = "0-unstable-2023-08-08"; + version = "0-unstable-2024-07-16"; src = fetchFromGitHub { owner = "svenssonaxel"; repo = "pdf-sign"; - rev = "98742c6b12ebe2ca3ba375c695f43b52fe38b362"; - hash = "sha256-5GRk0T1iLqmvWI8zvZE3OWEHPS0/zN/Ie9brjZiFpqc="; + rev = "6c373e3df2ac53af74ea84c3b5f299b13d7dae9c"; + hash = "sha256-yx1ff1JMTydCd5sCIoiT30zRwxNEwFbgEM9++nkJKY4="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -31,9 +37,10 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - install -Dm755 pdf-sign pdf-create-empty -t $out/bin - wrapProgram $out/bin/pdf-sign --prefix PATH : ${binPath} - wrapProgram $out/bin/pdf-create-empty --prefix PATH : ${binPath} + for exe in "pdf-sign" "pdf-create-empty" "pdf-from-text"; do + install -Dm755 $exe -t $out/bin + wrapProgram $out/bin/$exe --prefix PATH : ${binPath} + done runHook postInstall ''; @@ -47,4 +54,3 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; }; } - From 1a3d77522d8b995851ca07b59ebb5d068eab0d69 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 16:11:30 +0800 Subject: [PATCH 260/481] =?UTF-8?q?cambalache:=200.90.2=20=E2=86=92=200.90?= =?UTF-8?q?.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/jpu/cambalache/-/compare/0.90.2...0.90.4 buildPythonApplication appends pythonPath to buildInputs so dependency('pygobject-3.0') works here without changes. --- pkgs/development/tools/cambalache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix index f25d7247369c..6af8672e03e3 100644 --- a/pkgs/development/tools/cambalache/default.nix +++ b/pkgs/development/tools/cambalache/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.90.2"; + version = "0.90.4"; format = "other"; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jpu"; repo = "cambalache"; rev = version; - hash = "sha256-m3rearoCFQUzdZMXY2xyKf4dgdq7G4QlUbetrIqW83U="; + hash = "sha256-XS6JBJuifmN2ElCGk5hITbotZ+fqEdjopL6VqmMP2y4="; }; nativeBuildInputs = [ From 9c9107c7cb4e54cea7edf909e044586f6c32a075 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 03:37:30 +0000 Subject: [PATCH 261/481] =?UTF-8?q?eog:=2045.3=20=E2=86=92=2045.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/45.3...45.4 --- pkgs/by-name/eo/eog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index ec1e7f61ee51..27aa4149e6c5 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "45.3"; + version = "45.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hlD2YtSSHYOnkE9rucokW69zX3F7R/rFs38NkOXokag="; + sha256 = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4="; }; patches = [ From 0c3b6fc89870b2a6787469a97014608e6c093a27 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 03:39:20 +0000 Subject: [PATCH 262/481] =?UTF-8?q?evince:=2046.3=20=E2=86=92=2046.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/46.3...46.3.1 --- pkgs/by-name/ev/evince/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix index a9192f33d000..d9a4d4337db5 100644 --- a/pkgs/by-name/ev/evince/package.nix +++ b/pkgs/by-name/ev/evince/package.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "evince"; - version = "46.3"; + version = "46.3.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major finalAttrs.version}/evince-${finalAttrs.version}.tar.xz"; - hash = "sha256-vA0dQbnX/8di6Z0qv6+sv3RRgvCzHYbbXuyMZ/XzAGs="; + hash = "sha256-lFwgpvI4ObDVMycpFxRY6QaA2oJk6Zxvn0HCGcfu7nw="; }; depsBuildBuild = [ From b68a4382941c5eed7f4a2782b9b3ef175ce8d8cb Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 3 Aug 2024 08:44:50 +0000 Subject: [PATCH 263/481] podman-tui: move to by-name --- .../default.nix => by-name/po/podman-tui/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/virtualization/podman-tui/default.nix => by-name/po/podman-tui/package.nix} (100%) diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/by-name/po/podman-tui/package.nix similarity index 100% rename from pkgs/applications/virtualization/podman-tui/default.nix rename to pkgs/by-name/po/podman-tui/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81c91856d6d9..b89589b1a40c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11708,8 +11708,6 @@ with pkgs; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { }; - podman-tui = callPackage ../applications/virtualization/podman-tui { }; - podman-desktop = callPackage ../applications/virtualization/podman-desktop {}; pods = callPackage ../applications/virtualization/pods { }; From d465c58549dc48721728bc20d4be00ccc8cf1e59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 08:49:13 +0000 Subject: [PATCH 264/481] lief: 0.15.0 -> 0.15.1 --- pkgs/development/libraries/lief/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 3e64ea356084..1f7e8fdf2c49 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "lief"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-YpED7Bm+WjO+N0h08VhiRWXOVWscBTK3lcf6BIjcZ9Y="; + sha256 = "sha256-2W/p6p7YXqSNaVs8yPAnLQhbBVIQWEbUVnhx9edV5gI="; }; outputs = [ "out" "py" ]; From ec601990ce07fba09064949c17441e6a5056b40b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 3 Aug 2024 08:47:33 +0000 Subject: [PATCH 265/481] podman-tui: 1.1.0 -> 1.2.0 --- pkgs/by-name/po/podman-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix index 0d7947a3f251..b1825cb1a0de 100644 --- a/pkgs/by-name/po/podman-tui/package.nix +++ b/pkgs/by-name/po/podman-tui/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-my/y2cgF7F0wk5VJKfmqotBrV3HPmRQGPjlSdMe7wXk="; + hash = "sha256-+YY7pq+jLwfdWBT5Ug5KtvMVy8DRWQ7kfC5U2bzYWAs="; }; vendorHash = null; @@ -21,7 +21,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; preCheck = '' - export USER=$(whoami) + export USER="$(whoami)" export HOME="$(mktemp -d)" ''; From 2573d1b095b0b7b5d41de911552c0a10518346eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 08:55:43 +0000 Subject: [PATCH 266/481] apx-gui: 1.0.2 -> 1.0.3 --- pkgs/by-name/ap/apx-gui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apx-gui/package.nix b/pkgs/by-name/ap/apx-gui/package.nix index 038b2042c626..0034181cc9da 100644 --- a/pkgs/by-name/ap/apx-gui/package.nix +++ b/pkgs/by-name/ap/apx-gui/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "apx-gui"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = "apx-gui"; rev = "v${finalAttrs.version}"; - hash = "sha256-Web2ErqJ2Wx/wK1lNvy6dD9JK7RIYSOycrXWgoVT1po="; + hash = "sha256-UgDBDk4ChgWFUoz5BAXbn0b4Bngs9/hTmcu1Y4FXLU0="; }; strictDeps = true; From 648fefc4ddb9909ac18305db0890d4f799a7daeb Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 3 Aug 2024 17:01:27 +0800 Subject: [PATCH 267/481] alpaca: 1.0.1 -> 1.0.5 --- .../al/alpaca/fix_xdg_path_flatpak.patch | 26 --- .../al/alpaca/flatpak_path_fixes.patch | 159 ++++++++++++++++++ pkgs/by-name/al/alpaca/package.nix | 14 +- 3 files changed, 163 insertions(+), 36 deletions(-) delete mode 100644 pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch create mode 100644 pkgs/by-name/al/alpaca/flatpak_path_fixes.patch diff --git a/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch b/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch deleted file mode 100644 index ebb0a44e6575..000000000000 --- a/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/alpaca.in b/src/alpaca.in -index cb883c8..a9822cc 100755 ---- a/src/alpaca.in -+++ b/src/alpaca.in -@@ -35,7 +35,21 @@ locale.bindtextdomain('alpaca', localedir) - locale.textdomain('alpaca') - gettext.install('alpaca', localedir) - -+# Use the right XDG paths outside flatpak -+def set_xdg_path(env, default): -+ app_id = "com.jeffser.Alpaca" -+ base = os.getenv(env) or os.path.expanduser(default) -+ path = os.path.join(base, app_id) -+ if not os.path.exists(path): -+ os.makedirs(path) -+ os.environ[env] = path -+ return -+ - if __name__ == '__main__': -+ set_xdg_path("XDG_CONFIG_HOME", "~/.config") -+ set_xdg_path("XDG_DATA_HOME", "~/.local/share") -+ set_xdg_path("XDG_CACHE_HOME", "~/.cache") -+ - import gi - - from gi.repository import Gio diff --git a/pkgs/by-name/al/alpaca/flatpak_path_fixes.patch b/pkgs/by-name/al/alpaca/flatpak_path_fixes.patch new file mode 100644 index 000000000000..ad04310e70ca --- /dev/null +++ b/pkgs/by-name/al/alpaca/flatpak_path_fixes.patch @@ -0,0 +1,159 @@ +diff --git a/src/internal.py b/src/internal.py +new file mode 100644 +index 0000000..b41e415 +--- /dev/null ++++ b/src/internal.py +@@ -0,0 +1,22 @@ ++import os ++ ++app_id = "com.jeffser.Alpaca" ++ ++in_flatpak = True if os.getenv("FLATPAK_ID") else False ++ ++def get_xdg_home(env, default): ++ if in_flatpak: ++ return os.getenv(env) ++ else: ++ base = os.getenv(env) or os.path.expanduser(default) ++ path = os.path.join(base, app_id) ++ if not os.path.exists(path): ++ os.makedirs(path) ++ return path ++ ++ ++data_dir = get_xdg_home("XDG_DATA_HOME", "~/.local/share") ++config_dir = get_xdg_home("XDG_CONFIG_HOME", "~/.config") ++cache_dir = get_xdg_home("XDG_CACHE_HOME", "~/.cache") ++ ++source_dir = os.path.abspath(os.path.dirname(__file__)) +diff --git a/src/local_instance.py b/src/local_instance.py +index cb3ee51..1866f83 100644 +--- a/src/local_instance.py ++++ b/src/local_instance.py +@@ -2,24 +2,24 @@ + import subprocess, os, threading + from time import sleep + from logging import getLogger ++from .internal import data_dir, cache_dir + + + logger = getLogger(__name__) + + instance = None + port = 11435 +-data_dir = os.getenv("XDG_DATA_HOME") + overrides = {} + + def start(): +- if not os.path.isdir(os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp/ollama')): +- os.mkdir(os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp/ollama')) ++ if not os.path.isdir(os.path.join(cache_dir, 'tmp/ollama')): ++ os.mkdir(os.path.join(cache_dir, 'tmp/ollama')) + global instance, overrides + params = overrides.copy() + params["OLLAMA_HOST"] = f"127.0.0.1:{port}" # You can't change this directly sorry :3 + params["HOME"] = data_dir +- params["TMPDIR"] = os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp/ollama') +- instance = subprocess.Popen(["/app/bin/ollama", "serve"], env={**os.environ, **params}, stderr=subprocess.PIPE, text=True) ++ params["TMPDIR"] = os.path.join(cache_dir, 'tmp/ollama') ++ instance = subprocess.Popen(["ollama", "serve"], env={**os.environ, **params}, stderr=subprocess.PIPE, text=True) + logger.info("Starting Alpaca's Ollama instance...") + logger.debug(params) + sleep(1) +diff --git a/src/main.py b/src/main.py +index 278914f..eeb54cd 100644 +--- a/src/main.py ++++ b/src/main.py +@@ -27,6 +27,7 @@ gi.require_version('Adw', '1') + + from gi.repository import Gtk, Gio, Adw, GLib + from .window import AlpacaWindow ++from .internal import cache_dir, data_dir + + + logger = logging.getLogger(__name__) +@@ -63,7 +64,7 @@ class AlpacaApplication(Adw.Application): + issue_url='https://github.com/Jeffser/Alpaca/issues', + license_type=3, + website="https://jeffser.com/alpaca", +- debug_info=open(os.path.join(os.getenv("XDG_DATA_HOME"), 'tmp.log'), 'r').read()) ++ debug_info=open(os.path.join(data_dir, 'tmp.log'), 'r').read()) + about.present(parent=self.props.active_window) + + def create_action(self, name, callback, shortcuts=None): +@@ -75,16 +76,16 @@ class AlpacaApplication(Adw.Application): + + + def main(version): +- if os.path.isfile(os.path.join(os.getenv("XDG_DATA_HOME"), 'tmp.log')): +- os.remove(os.path.join(os.getenv("XDG_DATA_HOME"), 'tmp.log')) +- if os.path.isdir(os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp')): +- os.system('rm -rf ' + os.path.join(os.getenv("XDG_CACHE_HOME"), "tmp/*")) ++ if os.path.isfile(os.path.join(data_dir, 'tmp.log')): ++ os.remove(os.path.join(data_dir, 'tmp.log')) ++ if os.path.isdir(os.path.join(cache_dir, 'tmp')): ++ os.system('rm -rf ' + os.path.join(cache_dir, "tmp/*")) + else: +- os.mkdir(os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp')) ++ os.mkdir(os.path.join(cache_dir, 'tmp')) + logging.basicConfig( + format="%(levelname)s\t[%(filename)s | %(funcName)s] %(message)s", + level=logging.INFO, +- handlers=[logging.FileHandler(filename=os.path.join(os.getenv("XDG_DATA_HOME"), 'tmp.log')), logging.StreamHandler(stream=sys.stdout)] ++ handlers=[logging.FileHandler(filename=os.path.join(data_dir, 'tmp.log')), logging.StreamHandler(stream=sys.stdout)] + ) + app = AlpacaApplication(version) + logger.info(f"Alpaca version: {app.version}") +diff --git a/src/meson.build b/src/meson.build +index 1781b7a..b212cbf 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -44,7 +44,8 @@ alpaca_sources = [ + 'local_instance.py', + 'available_models.json', + 'available_models_descriptions.py', +- 'table_widget.py' ++ 'table_widget.py', ++ 'internal.py' + ] + + install_data(alpaca_sources, install_dir: moduledir) +diff --git a/src/window.py b/src/window.py +index 0771919..0f3b892 100644 +--- a/src/window.py ++++ b/src/window.py +@@ -29,20 +29,21 @@ from pypdf import PdfReader + from datetime import datetime + from . import dialogs, local_instance, connection_handler, available_models_descriptions + from .table_widget import TableWidget ++from .internal import config_dir, data_dir, cache_dir, source_dir + + logger = logging.getLogger(__name__) + + + @Gtk.Template(resource_path='/com/jeffser/Alpaca/window.ui') + class AlpacaWindow(Adw.ApplicationWindow): +- config_dir = os.getenv("XDG_CONFIG_HOME") +- data_dir = os.getenv("XDG_DATA_HOME") + app_dir = os.getenv("FLATPAK_DEST") +- cache_dir = os.getenv("XDG_CACHE_HOME") ++ config_dir = config_dir ++ data_dir = data_dir ++ cache_dir = cache_dir + + __gtype_name__ = 'AlpacaWindow' + +- localedir = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'locale') ++ localedir = os.path.join(source_dir, 'locale') + + gettext.bindtextdomain('com.jeffser.Alpaca', localedir) + gettext.textdomain('com.jeffser.Alpaca') +@@ -1602,7 +1603,7 @@ Generate a title following these rules: + def __init__(self, **kwargs): + super().__init__(**kwargs) + GtkSource.init() +- with open('/app/share/Alpaca/alpaca/available_models.json', 'r') as f: ++ with open(os.path.join(source_dir, 'available_models.json'), 'r') as f: + self.available_models = json.load(f) + if not os.path.exists(os.path.join(self.data_dir, "chats")): + os.makedirs(os.path.join(self.data_dir, "chats")) diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index d19e97eac30a..93e2f0e64450 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -17,28 +17,22 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "1.0.1"; + version = "1.0.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; rev = version; - hash = "sha256-GxnYPnrjaJ47/i+pigw+on2dmbHwQSX+STasvqnAtuQ="; + hash = "sha256-xNQLaMvZaJq7Bmz+c8OQhta3IdFXpVB2bSNwXCRj6rY="; }; patches = [ # Change the way XDG paths are handled so it makes sense outside of flatpak - ./fix_xdg_path_flatpak.patch + # https://github.com/Jeffser/Alpaca/pull/187 + ./flatpak_path_fixes.patch ]; - postPatch = '' - substituteInPlace src/local_instance.py \ - --replace-fail '/app/bin/ollama' 'ollama' - substituteInPlace src/window.py \ - --replace-fail '/app/share' "$out/share" - ''; - nativeBuildInputs = [ appstream meson From d2be09bc893776bb76257711ed3959eb1754ad06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 09:17:19 +0000 Subject: [PATCH 268/481] application-title-bar: 0.6.8 -> 0.6.9 --- pkgs/by-name/ap/application-title-bar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index b8a7da2b27a3..eef68c1d8f84 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "application-title-bar"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; rev = "v${finalAttrs.version}"; - hash = "sha256-pwCmkFEhxz7ZtNZNnIK2cTo+GDlIRIZ3VQ76n6qJ0Ac="; + hash = "sha256-49QZ2/77mj05xIJ9bVrxiNLzlfF1zURYr34kqt6tNzg="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; From ef3859991abc6811ee1bb1f4bc9f18bdd2de6eb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 09:20:41 +0000 Subject: [PATCH 269/481] python312Packages.pyvista: 0.44.0 -> 0.44.1 --- pkgs/development/python-modules/pyvista/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 1514d4ed709c..19c5051f9493 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.44.0"; + version = "0.44.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyvista"; repo = "pyvista"; rev = "refs/tags/v${version}"; - hash = "sha256-V6Ez9lwO6Oy2V1dIK802S5Fd41TZV/Ck/53ZUd0uUVE="; + hash = "sha256-P4kmsaeZqwEUdLJmfTRHkh8zdlOGLw+YLp9fa05xLXU="; }; build-system = [ setuptools ]; From 3ad3b5c925fa7e9d33692daeb1cc290c6036f118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 09:20:43 +0000 Subject: [PATCH 270/481] fluent-bit: 3.1.3 -> 3.1.4 --- pkgs/by-name/fl/fluent-bit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index cc0370de6858..d640a7da023f 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-bRgRpCnMt20JEuKqW5VetW8HyMgjNuqEgoeBG7sm++Y="; + hash = "sha256-TXFVvnjEitEFwQAuqNCgV0xbABcDxGS9KfCUenKN448="; }; # optional only to avoid linux rebuild From 28c45bac2efbe44b63bd8ae8a8fd9fdf538f3c86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 10:11:46 +0000 Subject: [PATCH 271/481] qownnotes: 24.7.2 -> 24.8.2 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index b596a8c861cd..381edfc1eaba 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.7.2"; + version = "24.8.2"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-MzZxZ6n0TQ6ZDAdJRIwg7pyrxf/Y5iS/4mRUkg3jzH4="; + hash = "sha256-aNsfDpO11VaT0SpGxc8V+8cgsPKrBKDKociIgZd3SdA="; }; nativeBuildInputs = [ From 3d46ea7eaa3cf40a0d9c78c59f2a7fe7db3e6370 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 18:06:12 +0800 Subject: [PATCH 272/481] evince, papers: Remove broken supportXPS option I don't see a reason to override this and with -Dauto_features=enabled (from our meson setup-hook) the build breaks without explicitly passing -Dxps=disabled. --- pkgs/by-name/ev/evince/package.nix | 6 ++---- pkgs/by-name/pa/papers/package.nix | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix index d9a4d4337db5..065613a6d7af 100644 --- a/pkgs/by-name/ev/evince/package.nix +++ b/pkgs/by-name/ev/evince/package.nix @@ -21,6 +21,7 @@ , djvulibre , libspectre , libarchive +, libgxps , libhandy , libsecret , wrapGAppsHook3 @@ -35,8 +36,6 @@ , gst_all_1 , gi-docgen , supportMultimedia ? true # PDF multimedia -, libgxps -, supportXPS ? true # Open XML Paper Specification via libgxps , withLibsecret ? true }: @@ -81,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { gspell gtk3 libarchive + libgxps libhandy librsvg libspectre @@ -90,8 +90,6 @@ stdenv.mkDerivation (finalAttrs: { texlive.bin.core # kpathsea for DVI support ] ++ lib.optionals withLibsecret [ libsecret - ] ++ lib.optionals supportXPS [ - libgxps ] ++ lib.optionals supportMultimedia (with gst_all_1; [ gstreamer gst-plugins-base diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index c0de8348e838..efab205c5a8b 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -27,7 +27,6 @@ , dbus , gi-docgen , libgxps -, supportXPS ? true # Open XML Paper Specification via libgxps , withLibsecret ? true , supportNautilus ? (!stdenv.isDarwin) , libadwaita @@ -87,14 +86,13 @@ stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas libadwaita libarchive + libgxps librsvg libspectre pango poppler ] ++ lib.optionals withLibsecret [ libsecret - ] ++ lib.optionals supportXPS [ - libgxps ] ++ lib.optionals supportNautilus [ nautilus ] ++ lib.optionals stdenv.isDarwin [ From 54d521ee09e55d2948948d6a2be9ce7c0e857f92 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 03:40:35 +0000 Subject: [PATCH 273/481] =?UTF-8?q?evolution:=203.52.3=20=E2=86=92=203.52.?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.52.3...3.52.4 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index dbebc978d209..fd8d214d5ea6 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.52.3"; + version = "3.52.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-HCL1O1VU4mCkjpF/PWaYNNJOTTrVoSTL4EKipKzkQcU="; + hash = "sha256-9XkpgB1uQBphHWUh71kiTYGzBQA1ekuePkYkXslGGBk="; }; nativeBuildInputs = [ From 57cc14d39080659f219ed468792e567ee0288c4d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 03:46:06 +0000 Subject: [PATCH 274/481] =?UTF-8?q?evolution-data-server:=203.52.3=20?= =?UTF-8?q?=E2=86=92=203.52.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.52.3...3.52.4 --- .../ev/evolution-data-server/hardcode-gsettings.patch | 6 +++--- pkgs/by-name/ev/evolution-data-server/package.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index dad575c05bbf..a98612382f1f 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -152,10 +152,10 @@ index 5b4debf..77c8d9c 100644 if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index 43bd383..4dce824 100644 +index 047fb97..960f44c 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c -@@ -1369,7 +1369,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) +@@ -1333,7 +1333,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) (GDestroyNotify) g_free, (GDestroyNotify) contact_record_free); @@ -202,7 +202,7 @@ index 2525856..7ecc1a8 100644 g_clear_object (&settings); } diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index 44ba49c..dfac2a2 100644 +index a83d3d3..dc7acac 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c @@ -2826,8 +2826,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher) diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 4fb4c39bad6f..fce52129f0ac 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.52.3"; + version = "3.52.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-6fbIDBQgM7GAG8yqYiHEU9406tTqCJsghrGQhvmpwuQ="; + hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc="; }; patches = [ From 6e97411a7a63cecdf75cc363af6522bee93e45d3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 03:48:32 +0000 Subject: [PATCH 275/481] =?UTF-8?q?evolution-ews:=203.52.3=20=E2=86=92=203?= =?UTF-8?q?.52.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.52.3...3.52.4 --- .../mailreaders/evolution/evolution-ews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 5cd6608cbb6d..3ad8b21567b0 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.52.3"; + version = "3.52.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-H9Y4L9X9MAQ4Rc/F3Ew0/gErzINRK2AwFUJQvGGAaMA="; + hash = "sha256-QI1VBWyA5K1kR+PHeINodYIfbCYdNepxF1YocPAvY7o="; }; patches = [ From c17e6425756167ab3e960e20419beb912545e5ad Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 03:49:59 +0000 Subject: [PATCH 276/481] =?UTF-8?q?gnome.gnome-bluetooth:=2046.0=20?= =?UTF-8?q?=E2=86=92=2046.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/compare/46.0...46.1 --- pkgs/desktops/gnome/core/gnome-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 8b1fd59d3f8c..f06954aec2fd 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "46.0"; + version = "46.1"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-E/4edfMXrNvfXoDJAp0uBjLWCpzPcqQ64263VFAh++8="; + hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw="; }; nativeBuildInputs = [ From b56b289f6185ba05c72cfc2c2ebf5aeb31b5f785 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 04:01:36 +0000 Subject: [PATCH 277/481] =?UTF-8?q?gnome-builder:=2046.2=20=E2=86=92=2046.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-builder/-/compare/46.2...46.3 --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 9bcbbe32d1c1..769d5c68cbf7 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "46.2"; + version = "46.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-DIV7iQA7JHh/Kx0qrhLSdaB0xmhLSIA7SMACdtk3GWM="; + hash = "sha256-EvJ8DipKcxb59+IYWd9r8bd1cNKWb5V6QzBvaZ7FRhI="; }; patches = [ From 637051873183ce529d60308e8606ac5ed0837c9b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 04:16:12 +0000 Subject: [PATCH 278/481] =?UTF-8?q?gnome.gnome-music:=2046.0=20=E2=86=92?= =?UTF-8?q?=2046.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-music/-/compare/46.0...46.1 --- pkgs/desktops/gnome/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 7def9a535d86..8808d5f32186 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "46.0"; + version = "46.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-pFDVzgFokvavL4q3H8fDlDguIse2ILqSpuFc9mvF7F8="; + hash = "sha256-Eb4tbCib5NxDOwxPtZo9rDvtAcf1oorualRBl6NTv/0="; }; nativeBuildInputs = [ From 5adfa811afa06876b3653beedf7a5bad88ae8c38 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 3 Aug 2024 04:17:24 +0000 Subject: [PATCH 279/481] =?UTF-8?q?libshumate:=201.2.2=20=E2=86=92=201.2.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libshumate/-/compare/1.2.2...1.2.3 --- pkgs/development/libraries/libshumate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index d0e6e95ad0c7..17783999b53c 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-b1h1effy1gs40/RyfrGo0v6snL3AGOU/9fdyqGCPpEs="; + hash = "sha256-TMbNc/bYcVX2J2arY+WqzEc72aDONZBpMqz8g56WTAw="; }; depsBuildBuild = [ From 3412c2fad41481077c1bf7f46dd064d557ad3d64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 10:17:04 +0000 Subject: [PATCH 280/481] python312Packages.scancode-toolkit: 32.2.0 -> 32.2.1 --- pkgs/development/python-modules/scancode-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 62115a629637..24badfd1d1de 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.2.0"; + version = "32.2.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P5Lmosa8PrqDYEbdoDLnby0ET4KsfbLWzXHmWHhy8ss="; + hash = "sha256-o+c2aB9oAI5xyHj2xtQowSP4Wjq6RAAmasXjrzXR5ko="; }; dontConfigure = true; From 18b035363b08f50c55f94fbcaf9d6e43746241a5 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sat, 3 Aug 2024 18:57:19 +0800 Subject: [PATCH 281/481] tdlib: 1.8.33 -> 1.8.34 --- pkgs/development/libraries/tdlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index e725c5893f2f..3b341cb2eae0 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.33"; + version = "1.8.34"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "cb164927417f22811c74cd8678ed4a5ab7cb80ba"; - hash = "sha256-917w8KZPkgW4O5ftONi9UzpbNIPm9YBgSz11OPFX6lw="; + rev = "1fa2a372a88c26369dcac2ce476166531df74a77"; + hash = "sha256-7I2hm3KFtiJwz1tOxh+kSPItFnUcE4ALT865wAyASCA="; }; buildInputs = [ gperf openssl readline zlib ]; From 54d0da017b1d065ed6f0ff4ebf3a371a5ba718d5 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 31 Jul 2024 22:12:49 +0200 Subject: [PATCH 282/481] python312Packages.tinytag: init at 1.10.1 --- .../python-modules/tinytag/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/tinytag/default.nix diff --git a/pkgs/development/python-modules/tinytag/default.nix b/pkgs/development/python-modules/tinytag/default.nix new file mode 100644 index 000000000000..c15501951792 --- /dev/null +++ b/pkgs/development/python-modules/tinytag/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "tinytag"; + version = "1.10.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tinytag"; + repo = "tinytag"; + rev = "refs/tags/${version}"; + hash = "sha256-Kg67EwDIi/Io7KKnNiqPzQKginrfuE6FAeOCjFgEJkY="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "tinytag" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Read audio file metadata"; + homepage = "https://github.com/tinytag/tinytag"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58b2f56152b0..02facf38e876 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15553,6 +15553,8 @@ self: super: with self; { tinysegmenter = callPackage ../development/python-modules/tinysegmenter { }; + tinytag = callPackage ../development/python-modules/tinytag { }; + tinytuya = callPackage ../development/python-modules/tinytuya { }; titlecase = callPackage ../development/python-modules/titlecase { }; From d8a7e169ea3274632ddb9221d1f72b6d57b324ff Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 3 Aug 2024 13:03:52 +0200 Subject: [PATCH 283/481] calibre: 7.15.0 -> 7.16.0 https://github.com/kovidgoyal/calibre/releases/tag/v7.16.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 4b1c2657ab29..61a0b3b3e81a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.15.0"; + version = "7.16.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-03CRYdi5dX3+S+o4wDehsFzI36AGLAF5e/TtfmYmBis="; + hash = "sha256-EWQfaoTwO9BdZQgJQrxfj6b8tmtukvlW5hFo/USjNhU="; }; patches = [ From 00b9996c9ad5726c49dfdb0974a75fe7a2f03b0a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 3 Aug 2024 23:10:26 +1200 Subject: [PATCH 284/481] stdenv: Take nested env.NIX_CFLAGS_LINK into account when making static binaries https://github.com/NixOS/nixpkgs/pull/315998/files#diff-2828f66a476875b1160e3c241960db085c2a3933211cc187bcd1fb456fb95e7fL213-R216 moved NIX_CFLAGS_LINK from a top-level `mkDerivation` argument to the nested `env` attribute. This doesn't play nicely with how `stdenv/adapters.nix` adds it's NIX_CFLAGS_LINK in the top-level. This changes the stdenv adapter to check for the presence of `env.NIX_CFLAGS_LINK`, and override that one if present, and only otherwise override on the top-level drv attrset. --- pkgs/stdenv/adapters.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 6a8b07b633ef..7e1ce67539b4 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -99,8 +99,12 @@ rec { mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: if stdenv.hostPlatform.isDarwin then throw "Cannot build fully static binaries on Darwin/macOS" - else (mkDerivationSuper args).overrideAttrs (args: { - NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; + else (mkDerivationSuper args).overrideAttrs (args: if args ? env.NIX_CFLAGS_LINK then { + env = args.env // { + NIX_CFLAGS_LINK = toString args.env.NIX_CFLAGS_LINK + " -static"; + }; + } else { + NIX_CFLAGS_LINK = toString (args.env.NIX_CFLAGS_LINK or "") + " -static"; } // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { configureFlags = (args.configureFlags or []) ++ [ "--disable-shared" # brrr... From cca7b43071a9088b8212b6fc499a46779c0d97e9 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sat, 3 Aug 2024 13:35:13 +0200 Subject: [PATCH 285/481] libnvme: 1.9 -> 1.10 --- pkgs/os-specific/linux/libnvme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index 4d86812698e5..3209539f020f 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnvme"; - version = "1.9"; + version = "1.10"; outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ]; @@ -26,12 +26,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "linux-nvme"; repo = "libnvme"; rev = "v${finalAttrs.version}"; - hash = "sha256-nXzYbj4BDxFii30yR+aTgqjQfyYMFiAIcV/OHI2y5Ws="; + hash = "sha256-guNABLpDKdWDE79gxoNq0ukAUE7CnMw5QRXA3rl3Dk4="; }; postPatch = '' patchShebangs scripts - substituteInPlace test/sysfs/sysfs-tree-diff.sh \ + substituteInPlace test/sysfs/tree-diff.sh test/config/config-diff.sh \ --replace-fail /bin/bash ${bash}/bin/bash ''; From 927fc72f6a5e35823543b194b6aa14a57fcfc8b2 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sat, 3 Aug 2024 13:35:47 +0200 Subject: [PATCH 286/481] nvme-cli: 2.9.1 -> 2.10 --- pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index a39c26ac7c19..88959851c545 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "2.9.1"; + version = "2.10"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - hash = "sha256-zs7UksB5QkvCP29iELDGMJeObvMdKrs6ajQkEzCPzzQ="; + hash = "sha256-pFSVCbGiJ+8T2Eeew1M6TZC5Vh46OJDmf7hfU9M26Iw="; }; mesonFlags = [ From df67de074785eca6a45767221c2307a85c283783 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 3 Aug 2024 07:58:26 -0400 Subject: [PATCH 287/481] nushellPlugins.query: fix build --- pkgs/shells/nushell/plugins/query.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index defc80275a44..34bf253a5590 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -7,6 +7,7 @@ , nix-update-script , pkg-config , openssl +, curl }: rustPlatform.buildRustPackage { @@ -16,7 +17,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; - buildInputs = [ openssl ] + buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; From 96a9c815086fe9a517112c59d8e89f5669fb07b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 14:06:34 +0200 Subject: [PATCH 288/481] python312Packages.azure-mgmt-resource: 23.0.1 -> 23.1.1 --- .../python-modules/azure-mgmt-resource/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index ffb31fbfbbdb..abbf8d344348 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -6,22 +6,24 @@ azure-mgmt-common, msrest, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-resource"; - version = "23.0.1"; - format = "setuptools"; + version = "23.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-wrps/ZnflfVfNurcQkXj3HEyVzAqH9And1bZS9jLKOA="; + hash = "sha256-ILawBrVE/bGWB/P2o4EQViXgu2D78wNvOYhcRkbTND4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-mgmt-common azure-mgmt-core msrest From 2dd798f27beab6522862fa78efa706cee199d0db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 14:12:19 +0200 Subject: [PATCH 289/481] python312Packages.azure-mgmt-powerbiembedded: 2.0.0 -> 3.0.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-powerbiembedded_3.0.0/sdk/powerbiembedded/azure-mgmt-powerbiembedded/CHANGELOG.md --- .../azure-mgmt-powerbiembedded/default.nix | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix index 664d6e905fa9..b3db9d16407b 100644 --- a/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-powerbiembedded/default.nix @@ -1,37 +1,41 @@ { lib, + azure-common, + azure-mgmt-core, buildPythonPackage, fetchPypi, - msrest, - msrestazure, - azure-common, - azure-mgmt-nspkg, + isodate, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-powerbiembedded"; - version = "2.0.0"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "2f05be73f2a086c579a78fc900e3b2ae14ccde5bcec54e29dfc73e626b377476"; + hash = "sha256-yz2D3WfQKEdkTm10ZKIhZMi4y6GF6yz+L1+nB/VFofo="; }; - propagatedBuildInputs = [ - msrest - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common - azure-mgmt-nspkg + azure-mgmt-core + isodate ]; - # has no tests + # Module has only tests in mono-repo doCheck = false; meta = with lib; { description = "This is the Microsoft Azure Power BI Embedded Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/powerbiembedded/azure-mgmt-powerbiembedded"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-powerbiembedded_${version}/sdk/powerbiembedded/azure-mgmt-powerbiembedded/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; From 865e755a38209deb3750a7112d5a2f7e4db61fc2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 14:14:27 +0200 Subject: [PATCH 290/481] python312Packages.pyenphase: 1.21.0 -> 1.22.0 Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.21.0...v1.22.0 Changelog: https://github.com/pyenphase/pyenphase/blob/v1.22.0/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index d494d95fad13..613fb911c85e 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.21.0"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-ZMua6mBedMdTBed/mDoK9h3HXbyf+3/Uo6CZJMxBlf0="; + hash = "sha256-letF0s/zJKdMT2nGnZpMFufja0bsL0zlwG+dCSK5BA4="; }; postPatch = '' From 8a5184b51f449368db552406a762eccd5079a959 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 2 Aug 2024 13:01:11 -0600 Subject: [PATCH 291/481] freetube: 0.21.2 -> 0.21.3 --- pkgs/applications/video/freetube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index ed8b702c6e32..ffe9beea5cd8 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.21.2"; + version = "0.21.3"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - hash = "sha256-Mk8qHDiUs2Nd8APMR8q1wZhTtxyzRhBAeXew9ogC3nk="; + hash = "sha256-sg/ycFo4roOJ2sW4naRCE6dwGXVQFzF8uwAZQkS2EY4="; }; passthru.tests = nixosTests.freetube; From c335872786f8c1a8f038ec46d372435a41f32f9d Mon Sep 17 00:00:00 2001 From: Utkarsh Gupta Date: Sat, 3 Aug 2024 13:31:11 +0100 Subject: [PATCH 292/481] cargo-deny: 0.15.0 -> 0.16.0 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index b76b0a2f38ac..ef7a06006cd7 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-utgafrYBm9UCHmvJtxEPHMjXZ0luFUUEDrgLO6i3CJg="; + hash = "sha256-EaCG9KbL+4N0fFj69N66xqOFaVnu+8EOV1dpAjTRcgI="; }; - cargoHash = "sha256-XdBcFtt7LJq6um3QiX2VBQTIMVuOAqfpy0dY3GLIXmM="; + cargoHash = "sha256-JphmHW/KxKZmcskLDUKu7hVA7m2AUAi0fYMJaeMqyaE="; nativeBuildInputs = [ pkg-config From c9d2f9ea12cfb6a3c1a1dd57aa8ac8a3f6882d17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 13:01:21 +0000 Subject: [PATCH 293/481] python312Packages.dns-lexicon: 3.16.1 -> 3.17.0 --- pkgs/development/python-modules/dns-lexicon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix index 225a04ee5342..a06d367cdb65 100644 --- a/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "dns_lexicon"; - version = "3.16.1"; + version = "3.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Analogj"; repo = "lexicon"; rev = "refs/tags/v${version}"; - hash = "sha256-79/zz0TOCpx26TEo6gi9JDBQeVW2azWnxAjWr/FGRLA="; + hash = "sha256-fTR3sXMdpcI6/Vch59XHff0h1SgnvQzYeKWHv3FUsXY="; }; nativeBuildInputs = [ poetry-core ]; From 5d78a0185ea191e430cf33c06f7687fc1c103f1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 13:13:15 +0000 Subject: [PATCH 294/481] kubelogin-oidc: 1.28.1 -> 1.28.2 --- .../networking/cluster/kubelogin-oidc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index 6a9666682961..17822e687f7e 100644 --- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.28.1"; + version = "1.28.2"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sFEFvWizQeQp9VE1guO9xMZl9+cFk6jV43TVCbD8pas="; + sha256 = "sha256-hWGP3/WAS2+/jylytZWo7+N/bWmrkaJDHZ0tYbElLSs="; }; subPackages = ["."]; - vendorHash = "sha256-Mel9fH13iXSpB2kClJsH0SM+/gIzu2rPt2q0fjQwumw="; + vendorHash = "sha256-r9WaS3J0b2yerjOgVLu0g95fwETqOFWoUvSC30gDzH0="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin From 30d807f937f5943db8d04b98960060f5981a2fc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 13:31:02 +0000 Subject: [PATCH 295/481] rqlite: 8.26.7 -> 8.26.8 --- pkgs/servers/sql/rqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index f3c1d76da55e..af4e21103379 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "rqlite"; - version = "8.26.7"; + version = "8.26.8"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LiYPubQF5eGJwSDzy+0zhO6YeMNhti0CoOg7+rR1DOU="; + sha256 = "sha256-1mwrI3OAhkk7VSNxy47g5xt5PcWiHUCSjFw9UtDeqTM="; }; vendorHash = "sha256-Hxo5pFz8IGvHoB5N2S6VOWVu4U/Fwit1x1WpbckKCeU="; From a6b29ac954b428f06b9f59b5b24d0527a556e859 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 13:47:34 +0000 Subject: [PATCH 296/481] ryujinx: 1.1.1358 -> 1.1.1364 --- pkgs/by-name/ry/ryujinx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 7e5078b9edec..3590649efaf7 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -26,13 +26,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1358"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1364"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "add681144bd1ab8eb5094f38ec71292a33958aff"; - sha256 = "02jrh5134jjh5zk2d160a7fzhc2i4v4yqhyixs1bh88352ynf23z"; + rev = "d97e995e5943aaddd8de88837b2dbfdf4d1616f4"; + sha256 = "03yzdypb58ypqwib8lyf2g222k2znvck7ashhgfd2fpr3c4k0dl3"; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; From af69223f4666c1f9dd4f68c375727415838f1376 Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 3 Aug 2024 15:49:33 +0200 Subject: [PATCH 297/481] nixos/flatpak: add package option this patch adds the `services.flatpak.package` option to allow overriding the package added by this module to `environment.systemPackages` and the likes. This is useful in scenarios where applications call the flatpak binary to query information like writable directories and there is a custom package returning different results from the vanilla binary. See https://github.com/crabdancing/nixpak-flatpak-wrapper --- nixos/modules/services/desktops/flatpak.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index cda0a17d0475..b386bafcfe6f 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -15,6 +15,8 @@ in { options = { services.flatpak = { enable = mkEnableOption "flatpak"; + + package = mkPackageOption pkgs "flatpak" { }; }; }; @@ -28,16 +30,16 @@ in { } ]; - environment.systemPackages = [ pkgs.flatpak ]; + environment.systemPackages = [ cfg.package ]; security.polkit.enable = true; fonts.fontDir.enable = true; - services.dbus.packages = [ pkgs.flatpak ]; + services.dbus.packages = [ cfg.package ]; - systemd.packages = [ pkgs.flatpak ]; - systemd.tmpfiles.packages = [ pkgs.flatpak ]; + systemd.packages = [ cfg.package ]; + systemd.tmpfiles.packages = [ cfg.package ]; environment.profiles = [ "$HOME/.local/share/flatpak/exports" From 460b0d97e1a9793fded723f1a42d7ebfd3220f52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 13:50:53 +0000 Subject: [PATCH 298/481] gitlab-ci-local: 4.52.1 -> 4.52.2 --- pkgs/by-name/gi/gitlab-ci-local/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 89a6354f050a..5f53540cde4a 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.52.1"; + version = "4.52.2"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-yNOlcb1I8BiR9rbqxeE7PEshEAudw62M77QBgTCBETg="; + hash = "sha256-x63am8FIfczA4CkoBkDeZTkp2sqc7nN5CV1hiq+vvjU="; }; - npmDepsHash = "sha256-8Fxkd3JPyspcZeENpvvuguPNXbnWL1WrcYL9c77+Gok="; + npmDepsHash = "sha256-t26QoIBw5XGqHn8FHSL2MSfFV2wGuQWf3GH2GvSYByg="; postPatch = '' # remove cleanup which runs git commands From 1e10026712a7700d7328966562cd212e6e051e35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 14:06:45 +0000 Subject: [PATCH 299/481] skaffold: 2.13.0 -> 2.13.1 --- pkgs/development/tools/skaffold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 4bf5f21ce104..13430e0e4c65 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-zcGMKxC2BIg2KPxmGG9UUJzpMdAQbZ8zDGtYyF1T7ZQ="; + hash = "sha256-/+19w3/jn3EjIX5SsCmMkJKdplRvgiduhTAbgaDz9b4="; }; vendorHash = null; From b091f9cb295ef6e5136466b686a29cf34fa1466e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 14:07:10 +0000 Subject: [PATCH 300/481] langgraph-cli: 0.1.49 -> 0.1.50 --- pkgs/development/python-modules/langgraph-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 4d8dd5bccc29..66c09ae1d2c6 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langgraph-cli"; - version = "0.1.49"; + version = "0.1.50"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/cli==${version}"; - hash = "sha256-yphXboJA/TLGIPggb2Cvsxn1+WUSYMzC0wPHft3TGvo="; + hash = "sha256-FCPYrs7WPDQ0CBkey4BCn0SWa9jRDcjlygDGIiRArWw="; }; sourceRoot = "${src.name}/libs/cli"; From ecea394b12b7e69e15641e5ef70893ff7556f517 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 14:15:03 +0000 Subject: [PATCH 301/481] gping: 1.17.1 -> 1.17.3 --- pkgs/tools/networking/gping/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 01fae05e2da5..fb8857afff72 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.17.1"; + version = "1.17.3"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - hash = "sha256-mdOzUiymXyiYspmH28O/p0y+gzTobA9jg2PlDEvkVzo="; + hash = "sha256-DJ+5WoizFF3K9drFc955bDMXnlW+okYrZos/+dRVtjw="; }; - cargoHash = "sha256-jan+sxD2wCsoM3kmm5a1uZUCihOD+OtQxzR4KqH2zNg="; + cargoHash = "sha256-pQ95sS2dGVzZUOyuUpJPamW7RLiUTGu9KgpWLg4wn/w="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 8a5f82d7bc1c1028b3a5c2f3c29a5e111e6f324b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 14:16:20 +0000 Subject: [PATCH 302/481] stgit: 2.4.8 -> 2.4.9 --- pkgs/applications/version-management/stgit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index 86adbba590a4..c572c2652f23 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.8"; + version = "2.4.9"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-9eMHYI7p81WidLjtwJzjBcyURoqbHmQvsWpwS+1Wqo0="; + hash = "sha256-b8uzekKnNAJGeDYI2puHUaxY6K0s5tWxAWGpufJi/jk="; }; - cargoHash = "sha256-kvD7dz23SIqH/N9RY3s+iivocUJVWJWzIII2jMSh5og="; + cargoHash = "sha256-0bbOAo48xRiCyivO3fuThXAIEFgFbxh6ZtFOPikZi88="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl From fec9ad5c37c2c5c493b7abe195dd6e16b4ed8791 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 14:21:09 +0000 Subject: [PATCH 303/481] python312Packages.borb: 2.1.24 -> 2.1.25 --- pkgs/development/python-modules/borb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/borb/default.nix b/pkgs/development/python-modules/borb/default.nix index 6c460da4da40..589eedcab9bf 100644 --- a/pkgs/development/python-modules/borb/default.nix +++ b/pkgs/development/python-modules/borb/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "borb"; - version = "2.1.24"; + version = "2.1.25"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jorisschellekens"; repo = "borb"; rev = "refs/tags/v${version}"; - hash = "sha256-3PZ3fHsq9pgJ4oK42Y4b/3ghuYELgRPe09fciOKknuE="; + hash = "sha256-eVxpcYL3ZgwidkSt6tUav3Bkne4lo1QCshdUFqkA0wI="; }; build-system = [ setuptools ]; From 91107bd5ef5a04b5625768e9edfaa20d3098f856 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 3 Aug 2024 10:28:47 -0400 Subject: [PATCH 304/481] neatvnc: 0.8.0 -> 0.8.1 Diff: https://github.com/any1/neatvnc/compare/v0.8.0...v0.8.1 Changelog: https://github.com/any1/neatvnc/releases/tag/v0.8.1 --- pkgs/development/libraries/neatvnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index d8b439847ad4..dbed519662fe 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - hash = "sha256-BArEaQa+CNGzIoENsZSj9seFx9qdCLWiejh6EvpTch8="; + hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg="; }; strictDeps = true; From 4fc54045c8b41d093dd815a7bbc0809f55a98098 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Aug 2024 09:18:58 +0200 Subject: [PATCH 305/481] linux_6_10: 6.10.2 -> 6.10.3 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3ed0e9a75e18..c1aa3634669f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,7 +36,7 @@ "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" }, "6.10": { - "version": "6.10.2", - "hash": "sha256:0w4vsb0c8bp34j90l89qms50nx6r6mmyf23jbvyar9fbv46m5n3k" + "version": "6.10.3", + "hash": "sha256:1666dypfg193l5460maadki4hc291hr7k9fw74nq21fxczyj4pzs" } } From 1b6d60d0901284433ded00f3667ee8262f37c505 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Aug 2024 09:19:11 +0200 Subject: [PATCH 306/481] linux_6_6: 6.6.43 -> 6.6.44 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c1aa3634669f..18af12318129 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0c7bhb31hpbbw1is1ykppk9lm0x025yyd4hrmlg1s6yg75rxqkal" }, "6.6": { - "version": "6.6.43", - "hash": "sha256:0pha226h5011kl5r2iiddxi0rib3xraslmcdjjnil2kq38d3pn0a" + "version": "6.6.44", + "hash": "sha256:1n6ckxx0i4dbq018b56q1wkwq944jhjy225swrpn65a9jfb848ck" }, "6.8": { "version": "6.8.12", From cb36f982f4858f1d24f64d615cd4227b67c9f411 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Aug 2024 09:19:19 +0200 Subject: [PATCH 307/481] linux_6_1: 6.1.102 -> 6.1.103 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 18af12318129..e7150612fbe1 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0c9an2xlils8lk9yx883jb3li6ylj4k1jpbqp5k0z71xifa5fxb1" }, "6.1": { - "version": "6.1.102", - "hash": "sha256:1v4p4i8pfg4i6v90dr7m65npkxjnqv3fxcj8zs3pbb8y84xzk98v" + "version": "6.1.103", + "hash": "sha256:0ws59jjd71vhwbzkn0wqaby3yb8kjbc4clgza8aqhl4gi5pp1d2y" }, "5.15": { "version": "5.15.164", From ac1932a7b1251ec7c8ca2b61196b79bd721011d1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Aug 2024 09:19:30 +0200 Subject: [PATCH 308/481] linux-rt_5_10: 5.10.221-rt113 -> 5.10.222-rt114 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 3d560d387ef9..11e85e749ffb 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.221-rt113"; # updated by ./update-rt.sh + version = "5.10.222-rt114"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs"; + sha256 = "1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1aaamfnlhzhi4lj1sk2m082fpgr3qxs3b3a1ikh8zwmy89kw9i9x"; + sha256 = "0ylq8ffl9ivd1rh1fidmviyhzvknfh46my8iiqyfyg7y5z0cl1pg"; }; }; in [ rt-patch ] ++ kernelPatches; From 9775520308ebc5fe9b7dccfe28049ac046e9dc8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 14:31:16 +0000 Subject: [PATCH 309/481] helm-ls: 0.0.19 -> 0.0.20 --- pkgs/development/tools/language-servers/helm-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 55ab439118e1..0a671ed2bac8 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.19"; + version = "0.0.20"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-mG3H7XvvXtckMjCSWkj1DqoJTUwVVQU02IQj7za1USw="; + hash = "sha256-E2I4gEcJQ1NJqpN5rJGyFuj/KfjJC4bG/5Ei9gjIKCY="; }; vendorHash = "sha256-jGC8JNlorw0FSc0HhFdUVZJDCNaX4PWPaFKRklufIsQ="; From 95a8a2436cbfcea5103a16974186978b9c263bb5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 3 Aug 2024 10:31:52 -0400 Subject: [PATCH 310/481] weston: raise neatvnc version bound to < 0.9.0 --- pkgs/applications/window-managers/weston/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index c67b760e4df3..e9f8f245dfa7 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { }; postPatch = '' - # raise neatvnc version bound to 0.8.0 + # raise neatvnc version bound to < 0.9.0 # https://gitlab.freedesktop.org/wayland/weston/-/issues/890 substituteInPlace libweston/backend-vnc/meson.build \ - --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']" + --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '< 0.9.0']" ''; depsBuildBuild = [ pkg-config ]; From 87798077cfdc6a8d139fd14d3f4031c49cfe4644 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 9 Apr 2024 22:53:41 -0500 Subject: [PATCH 311/481] fyne: init at 2.5.0 --- pkgs/by-name/fy/fyne/package.nix | 62 ++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/fy/fyne/package.nix diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix new file mode 100644 index 000000000000..76ea63dead12 --- /dev/null +++ b/pkgs/by-name/fy/fyne/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + + libGL, + libX11, + libXcursor, + libXinerama, + libXi, + libXrandr, + libXxf86vm, + pkg-config, + stdenv, + darwin, +}: + +buildGoModule rec { + pname = "fyne"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "fyne-io"; + repo = "fyne"; + rev = "refs/tags/v${version}"; + hash = "sha256-DUXCaPFMb6f7ROI8DC2RVCX12xf5F9MEtBJyi8CuoE4="; + }; + + vendorHash = "sha256-Mz+p2kpPtqFb/wDkwOdIUQ2fCvzWqTH49YRjWmSlF4M="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ + libGL + libX11 + libXcursor + libXinerama + libXi + libXrandr + libXxf86vm + ] + ++ (lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk_11_0.frameworks; + [ + Carbon + Cocoa + Kernel + UserNotifications + ] + )); + + doCheck = false; + + meta = with lib; { + homepage = "https://fyne.io"; + description = "Cross platform GUI toolkit in Go"; + license = licenses.bsd3; + maintainers = with maintainers; [ greg ]; + mainProgram = "fyne"; + }; +} From 5d0bff94ca75188ad609506db5bd5ba599b2ba4a Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 3 Aug 2024 16:38:03 +0200 Subject: [PATCH 312/481] laurel: fix compiling on aarch64-linux This solves the following build error: ~~~ error: linker `aarch64-linux-gnu-gcc` not found | = note: No such file or directory (os error 2) ~~~ Which happens on aarch64-linux and armv7-linux because upstream redirects the linker for that platform in https://github.com/threathunters-io/laurel/blob/v0.6.3/.cargo/config.toml Since there is nothing else besides linker redirects in there, we simply delete the whole file. --- pkgs/servers/monitoring/laurel/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 56bbfc09cb52..54d38a52c616 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -17,6 +17,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uQs+BUBWdbSoE3UqrSjqImVm5uwYf7XiTFtGG1BcFZI="; + postPatch = '' + # Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc + # for their CI which breaks compiling on aarch64 in nixpkgs: + # error: linker `aarch64-linux-gnu-gcc` not found + rm .cargo/config.toml + ''; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; From df74ebcabb0252fa5e0a8a5d803d1e9d042ad3fb Mon Sep 17 00:00:00 2001 From: Chris Maniewski Date: Mon, 13 Nov 2023 23:12:31 +0100 Subject: [PATCH 313/481] nixos/podman: use given package for dockerCompat Defining a package that isn't the default results in podman-compat linking to a different version of podman (always the default one). This PR changes the behavior so that the given alternative package is used for the dockerCompat option as well. This could technically break things for people who rely on this quirk, albeit the previous behavior is probably not what one would expect. Co-authored-by: Winter --- nixos/modules/virtualisation/podman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index d0f4ac7f66da..084981e04bbb 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -5,7 +5,7 @@ let inherit (lib) mkOption types; - podmanPackage = (pkgs.podman.override { + podmanPackage = (cfg.package.override { extraPackages = cfg.extraPackages # setuid shadow ++ [ "/run/wrappers" ] From 63d05d989e73c5a59bb1c4fd3b32e5e40136528d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 1 Aug 2024 01:59:21 +0200 Subject: [PATCH 314/481] pkgs/development: remove unused arguments --- .../ada-modules/gnatcoll/bindings.nix | 1 - .../development/ada-modules/gnatcoll/core.nix | 1 - pkgs/development/ada-modules/gnatcoll/db.nix | 1 - .../beam-modules/elvis-erlang/default.nix | 2 +- .../beam-modules/erlang-ls/default.nix | 2 +- pkgs/development/compilers/clasp/default.nix | 1 - pkgs/development/compilers/dotnet/stage0.nix | 1 - pkgs/development/compilers/dotnet/vmr.nix | 2 - pkgs/development/compilers/gambit/build.nix | 3 +- pkgs/development/compilers/gerbil/build.nix | 2 +- pkgs/development/compilers/gerbil/default.nix | 2 +- .../compilers/gerbil/gerbil-leveldb.nix | 2 +- .../compilers/gerbil/gerbil-libxml.nix | 2 +- .../compilers/gerbil/gerbil-libyaml.nix | 2 +- .../compilers/gerbil/gerbil-lmdb.nix | 2 +- .../compilers/gerbil/gerbil-mysql.nix | 2 +- .../development/compilers/gerbil/unstable.nix | 2 +- .../compilers/ghcjs/8.10/default.nix | 1 - pkgs/development/compilers/gmqcc/default.nix | 1 - .../compilers/gnu-cobol/default.nix | 1 - pkgs/development/compilers/go/binary.nix | 2 +- .../compilers/jetbrains-jdk/jcef.nix | 1 - pkgs/development/compilers/koka/default.nix | 1 - .../compilers/lingua-franca/default.nix | 2 +- .../compilers/llvm/common/libcxx/default.nix | 1 - .../compilers/llvm/common/openmp/default.nix | 1 - .../compilers/mrustc/bootstrap.nix | 1 - pkgs/development/compilers/rust/cargo.nix | 2 +- pkgs/development/compilers/rust/clippy.nix | 2 +- pkgs/development/compilers/terra/default.nix | 2 +- pkgs/development/compilers/tinygo/default.nix | 1 - .../coq-modules/compcert/default.nix | 2 +- .../coq-modules/coqprime/default.nix | 2 +- .../development/coq-modules/flocq/default.nix | 3 +- .../coq-modules/gappalib/default.nix | 2 +- .../development/coq-modules/ltac2/default.nix | 2 +- .../coq-modules/mathcomp/default.nix | 2 +- .../coq-modules/metacoq/default.nix | 4 +- .../coq-modules/smtcoq/default.nix | 2 +- .../coq-modules/topology/default.nix | 2 +- .../vscoq-language-server/default.nix | 2 +- .../generic-builders/manifest.nix | 1 - pkgs/development/embedded/bossa/arduino.nix | 2 +- .../gnuradio-modules/limesdr/default.nix | 1 - .../haskell-modules/package-list.nix | 2 +- .../interpreters/cling/default.nix | 1 - .../interpreters/octave/build-env.nix | 1 - .../interpreters/yex-lang/default.nix | 1 - pkgs/development/libraries/blst/default.nix | 2 +- pkgs/development/libraries/cegui/default.nix | 1 - pkgs/development/libraries/codec2/default.nix | 1 - .../libraries/dbus/make-dbus-conf.nix | 1 - .../development/libraries/doctest/default.nix | 2 +- pkgs/development/libraries/elpa/default.nix | 2 +- pkgs/development/libraries/folly/default.nix | 1 - .../libraries/gfbgraph/default.nix | 1 - pkgs/development/libraries/glib/default.nix | 2 +- .../gobject-introspection/default.nix | 1 - .../libraries/grilo-plugins/default.nix | 1 - pkgs/development/libraries/gtk/3.x.nix | 1 - pkgs/development/libraries/gtk/4.x.nix | 1 - pkgs/development/libraries/gtkd/default.nix | 2 +- pkgs/development/libraries/gvfs/default.nix | 1 - pkgs/development/libraries/hamlib/default.nix | 1 - pkgs/development/libraries/hpx/default.nix | 1 - pkgs/development/libraries/irrlicht/mac.nix | 2 +- .../kde-frameworks/kcalendarcore.nix | 1 - .../libraries/kde-frameworks/ki18n.nix | 2 +- .../libraries/kde-frameworks/kquickcharts.nix | 2 +- .../libraries/kerberos/heimdal.nix | 1 - .../development/libraries/lensfun/default.nix | 2 +- .../development/libraries/libagar/default.nix | 2 +- .../libraries/libdatachannel/default.nix | 1 - .../libraries/libdatrie/default.nix | 2 +- .../development/libraries/libdwarf/common.nix | 2 +- .../libraries/libfprint/default.nix | 1 - .../development/libraries/libgpod/default.nix | 1 - pkgs/development/libraries/libmx/default.nix | 2 +- pkgs/development/libraries/libpsl/default.nix | 1 - .../libraries/libsixel/default.nix | 1 - .../development/libraries/libthai/default.nix | 2 +- .../libraries/libusbgx/default.nix | 2 +- .../development/libraries/libvirt/default.nix | 1 - .../development/libraries/libwebp/default.nix | 1 - .../libraries/lpcnetfreedv/default.nix | 2 +- pkgs/development/libraries/lrdf/default.nix | 3 +- pkgs/development/libraries/lyra/default.nix | 2 +- .../libraries/maui-core/default.nix | 1 - .../libraries/mediastreamer/msopenh264.nix | 4 +- .../development/libraries/neardal/default.nix | 2 +- .../development/libraries/ocl-icd/default.nix | 1 - .../libraries/opencl-clang/default.nix | 1 - .../libraries/openjpeg/default.nix | 2 +- .../development/libraries/openmpi/default.nix | 2 +- .../libraries/openzwave/default.nix | 2 +- .../libraries/qgnomeplatform/default.nix | 1 - .../libraries/qt-6/modules/qtbase.nix | 4 -- .../libraries/qtfeedback/default.nix | 1 - .../libraries/retro-gtk/default.nix | 1 - .../libraries/rnnoise-plugin/default.nix | 2 - .../libraries/rustls-ffi/default.nix | 52 +++++++++++++++++++ .../libraries/safefile/default.nix | 2 +- .../chemistry/avogadrolibs/default.nix | 2 +- .../science/chemistry/simple-dftd3/python.nix | 2 - .../science/math/tensorflow-lite/default.nix | 1 - .../libraries/swiftshader/default.nix | 2 +- .../libraries/sycl-info/default.nix | 1 - .../libraries/usbredir/default.nix | 1 - pkgs/development/libraries/v8/default.nix | 2 +- .../libraries/vapoursynth/default.nix | 2 +- .../libraries/volume-key/default.nix | 1 - .../libraries/wxwidgets/wxGTK32.nix | 1 - .../development/libraries/xtensor/default.nix | 1 - pkgs/development/libraries/xtl/default.nix | 1 - pkgs/development/lua-modules/nfd/default.nix | 2 +- pkgs/development/misc/or1k/newlib.nix | 2 +- pkgs/development/misc/resholve/default.nix | 1 - .../mobile/androidenv/cmdline-tools.nix | 2 +- .../development/mobile/androidenv/patcher.nix | 2 +- .../ocaml-modules/ounit2/default.nix | 2 +- .../octave-modules/financial/default.nix | 2 - .../octave-modules/level-set/default.nix | 1 - .../php-packages/couchbase/default.nix | 2 - .../python-modules/cocotb/default.nix | 1 - .../python-modules/httpie/default.nix | 1 - .../python-modules/levenshtein/default.nix | 1 - .../python-modules/pillow/generic.nix | 1 - .../pytest-cov-stub/default.nix | 1 - .../python-modules/typer/default.nix | 1 - .../python2-modules/attrs/default.nix | 1 - .../rocm-modules/5/llvm/stage-3/mlir.nix | 1 - .../rocm-modules/5/rocblas/default.nix | 1 - .../rocm-modules/6/llvm/stage-3/mlir.nix | 1 - .../rocm-modules/6/rocblas/default.nix | 1 - .../ruby-modules/rbenv/default.nix | 2 +- .../sdnotify-wrapper/default.nix | 2 +- .../tools/analysis/hopper/default.nix | 1 - pkgs/development/tools/ashpd-demo/default.nix | 3 -- .../azure-functions-core-tools/default.nix | 1 - .../build-managers/bazel/bazel_5/default.nix | 6 +-- .../build-managers/bazel/bazel_6/default.nix | 4 +- pkgs/development/tools/cocogitto/default.nix | 2 +- .../tools/dbus-test-runner/default.nix | 1 - .../tools/haskell/ihaskell/wrapper.nix | 2 +- pkgs/development/tools/hover/default.nix | 1 - .../tools/java/visualvm/default.nix | 2 +- pkgs/development/tools/ldid/default.nix | 1 - .../tools/mblock-mlink/default.nix | 2 +- .../tools/misc/binutils/default.nix | 1 - pkgs/development/tools/misc/cvise/default.nix | 1 - .../development/tools/misc/hydra/unstable.nix | 1 - .../tools/misc/jscoverage/default.nix | 2 +- pkgs/development/tools/misc/ptags/default.nix | 1 - pkgs/development/tools/nap/default.nix | 2 +- pkgs/development/tools/ocaml/utop/default.nix | 2 +- .../tools/profiling/EZTrace/default.nix | 1 - .../tools/react-native-debugger/default.nix | 1 - .../tools/rust/bindgen/unwrapped.nix | 2 - .../tools/rust/cargo-espmonitor/default.nix | 2 - .../tools/rust/cargo-leptos/default.nix | 1 - .../tools/rust/duckscript/default.nix | 1 - pkgs/development/tools/smlfmt/default.nix | 2 +- .../tools/steamos-devkit/default.nix | 1 - .../development/tools/swiftformat/default.nix | 2 +- pkgs/development/tools/trunk/default.nix | 2 - pkgs/development/web/cypress/default.nix | 1 - pkgs/development/web/nodejs/v22.nix | 2 +- 167 files changed, 129 insertions(+), 190 deletions(-) create mode 100644 pkgs/development/libraries/rustls-ffi/default.nix diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix index c8896c14c32f..0b7efb60deb9 100644 --- a/pkgs/development/ada-modules/gnatcoll/bindings.nix +++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix @@ -9,7 +9,6 @@ , gmp , libiconv , xz -, gcc-unwrapped , readline , zlib , python3 diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix index 7fdd4e99d550..0180558e1b96 100644 --- a/pkgs/development/ada-modules/gnatcoll/core.nix +++ b/pkgs/development/ada-modules/gnatcoll/core.nix @@ -3,7 +3,6 @@ , gnat , gprbuild , fetchFromGitHub -, xmlada , which }: diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix index 6eacff1ddb82..017a51e2fb75 100644 --- a/pkgs/development/ada-modules/gnatcoll/db.nix +++ b/pkgs/development/ada-modules/gnatcoll/db.nix @@ -5,7 +5,6 @@ , gprbuild , which , gnatcoll-core -, xmlada , component # components built by this derivation other components depend on , gnatcoll-sql diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index 4dff6a21ed84..2a6322cec899 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchgit, fetchHex, rebar3WithPlugins, rebar3-nix, rebar3Relx +{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx , buildRebar3, writeScript, lib }: let diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 95b991cc7d82..a2ea7c8bd449 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper -, stdenv, writeScript, lib, erlang }: +, stdenv, writeScript, lib }: let version = "0.52.0"; owner = "erlang-ls"; diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 0d27b9f62c8a..d5d56546b576 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -9,7 +9,6 @@ , boost , libunwind , ninja -, cacert }: let diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index 6e336904a50f..a78f5a9c5c8d 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -1,5 +1,4 @@ { stdenv -, stdenvNoCC , callPackage , lib , writeShellScript diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index a443d31c499d..8fd7cce1aa94 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -1,5 +1,4 @@ { clangStdenv -, stdenvNoCC , lib , fetchurl , dotnetCorePackages @@ -20,7 +19,6 @@ , swiftPackages , openssl , getconf -, makeWrapper , python3 , xmlstarlet , nodejs diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 60b9fb792d2f..05d92d434faf 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,6 +1,5 @@ { gccStdenv, lib, pkgs, - git, openssl, autoconf, gcc, coreutils, gnused, gnugrep, - makeStaticLibraries, + git, openssl, autoconf, coreutils, src, version, git-version, stampYmd ? 0, stampHms ? 0, gambit-support, diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index af983be968b0..c71ea137eadc 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,4 +1,4 @@ -{ pkgs, gccStdenv, lib, coreutils, +{ gccStdenv, lib, coreutils, openssl, zlib, sqlite, version, git-version, src, gambit-support, diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 148bf7451675..ff35cee6c993 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix rec { version = "0.18.1"; diff --git a/pkgs/development/compilers/gerbil/gerbil-leveldb.nix b/pkgs/development/compilers/gerbil/gerbil-leveldb.nix index 811e677e9218..2938469d62b7 100644 --- a/pkgs/development/compilers/gerbil/gerbil-leveldb.nix +++ b/pkgs/development/compilers/gerbil/gerbil-leveldb.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, leveldb, ... }: +{ pkgs, lib, fetchFromGitHub, leveldb, ... }: { pname = "gerbil-leveldb"; diff --git a/pkgs/development/compilers/gerbil/gerbil-libxml.nix b/pkgs/development/compilers/gerbil/gerbil-libxml.nix index bbd33752670e..bee0d0f16f59 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libxml.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libxml.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, libxml2, ... }: +{ pkgs, lib, fetchFromGitHub, libxml2, ... }: { pname = "gerbil-libxml"; diff --git a/pkgs/development/compilers/gerbil/gerbil-libyaml.nix b/pkgs/development/compilers/gerbil/gerbil-libyaml.nix index 0a69537b365d..b88beb9f6986 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libyaml.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libyaml.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, libyaml, ... }: +{ pkgs, lib, fetchFromGitHub, libyaml, ... }: { pname = "gerbil-libyaml"; diff --git a/pkgs/development/compilers/gerbil/gerbil-lmdb.nix b/pkgs/development/compilers/gerbil/gerbil-lmdb.nix index f86912aeaaa8..1a3355c14908 100644 --- a/pkgs/development/compilers/gerbil/gerbil-lmdb.nix +++ b/pkgs/development/compilers/gerbil/gerbil-lmdb.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, lmdb, ... }: +{ pkgs, lib, fetchFromGitHub, lmdb, ... }: { pname = "gerbil-lmdb"; diff --git a/pkgs/development/compilers/gerbil/gerbil-mysql.nix b/pkgs/development/compilers/gerbil/gerbil-mysql.nix index ca1960e0ed39..a8cf710ec654 100644 --- a/pkgs/development/compilers/gerbil/gerbil-mysql.nix +++ b/pkgs/development/compilers/gerbil/gerbil-mysql.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, mariadb-connector-c, ... }: +{ pkgs, lib, fetchFromGitHub, mariadb-connector-c, ... }: { pname = "gerbil-mysql"; diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 4b0d3289c107..0dd078556efb 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix rec { version = "unstable-2023-12-06"; diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 4363dc32c21e..9a648f838406 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -17,7 +17,6 @@ , gcc , lib , ghcjsDepOverrides ? (_:_:{}) -, haskell , linkFarm , buildPackages }: diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix index 144131887fba..ec39f8744f58 100644 --- a/pkgs/development/compilers/gmqcc/default.nix +++ b/pkgs/development/compilers/gmqcc/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , stdenv , fetchFromGitHub }: diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index f086f22cc1af..83f24fff864e 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -16,7 +16,6 @@ , texinfo , texliveBasic # test -, writeText }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix index cd2e429e704a..777c82a59775 100644 --- a/pkgs/development/compilers/go/binary.nix +++ b/pkgs/development/compilers/go/binary.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, version, hashes }: +{ stdenv, fetchurl, version, hashes }: let toGoKernel = platform: if platform.isDarwin then "darwin" diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 0ed9c159b128..537133524a2c 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -6,7 +6,6 @@ , python3 , jdk , git -, libcef , rsync , lib , ant diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 8cb38b4f783a..029bd88dfb0f 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -2,7 +2,6 @@ , pkgsHostTarget , cmake , makeWrapper -, fetchpatch , mkDerivation , fetchFromGitHub , alex diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix index fccfa1eb691b..f989a5e9d6be 100644 --- a/pkgs/development/compilers/lingua-franca/default.nix +++ b/pkgs/development/compilers/lingua-franca/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, fetchzip, jdk17_headless }: +{ lib, stdenv, fetchzip, jdk17_headless }: stdenv.mkDerivation rec { pname = "lfc"; diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index 646d435489c6..f646edf03019 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -6,7 +6,6 @@ , src ? null , patches ? [] , runCommand -, substitute , cmake , lndir , ninja diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 7d9d813f024c..0de91473dd8c 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -14,7 +14,6 @@ , clang-unwrapped , perl , pkg-config -, xcbuild , version }: let diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index ab5b9d7d2166..9fd9d95e0b72 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -3,7 +3,6 @@ , mrustc , mrustc-minicargo , llvm_12 -, llvmPackages_12 , libffi , cmake , python3 diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index b0c40c5760cb..9a12537f3e32 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildHost, pkgsHostHost +{ lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index beee43323dad..640ea7908e25 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, rustc, Security, patchelf }: +{ stdenv, lib, rustPlatform, rustc, Security }: rustPlatform.buildRustPackage { pname = "clippy"; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 908e025bf332..1d50d6e23ddb 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, llvmPackages_16, ncurses, cmake, libxml2 -, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false +, symlinkJoin, cudaPackages, enableCUDA ? false , libffi, libobjc, libpfm, Cocoa, Foundation }: diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index a2bbf561a379..f9de0cf3142a 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, buildPackages , buildGoModule , fetchFromGitHub , makeWrapper diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 36b126af63ce..7d78a2d37686 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,5 +1,5 @@ { lib, mkCoqDerivation -, coq, flocq, compcert +, coq, flocq , ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index f9a4d6e7956d..2382141f2232 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,4 +1,4 @@ -{ which, lib, mkCoqDerivation, coq, bignums, version ? null }: +{ lib, mkCoqDerivation, coq, bignums, version ? null }: mkCoqDerivation { diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index bb8c2ccb1bd5..a7ff7044257f 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,5 +1,4 @@ -{ lib, bash, autoconf, automake, - mkCoqDerivation, coq, version ? null }: +{ lib, bash, autoconf, mkCoqDerivation, coq, version ? null }: mkCoqDerivation { pname = "flocq"; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 83285d187f46..0fbf19d24a45 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,4 +1,4 @@ -{ which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: +{ lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: mkCoqDerivation { pname = "gappalib"; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index c9d6845aa938..11fa1af24de6 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, coq, version ? null }: +{ lib, mkCoqDerivation, coq, version ? null }: mkCoqDerivation { pname = "ltac2"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 51accc11d249..f3f20adc7288 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -12,7 +12,7 @@ { lib, ncurses, graphviz, lua, fetchzip, mkCoqDerivation, withDoc ? false, single ? false, - coqPackages, coq, hierarchy-builder, version ? null }@args: + coq, hierarchy-builder, version ? null }@args: let repo = "math-comp"; diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 8534f098faee..ef1a2131af2c 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchzip, +{ lib, mkCoqDerivation, single ? false, - coqPackages, coq, equations, version ? null }@args: + coq, equations, version ? null }@args: let repo = "metacoq"; diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 942ba1dc18bd..e8c944254091 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }: +{ lib, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }: let # version of veriT that works with SMTCoq diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index 9ffe598156c0..d50c83f0745e 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }: +{ lib, mkCoqDerivation, coq, zorns-lemma, version ? null }: mkCoqDerivation rec { pname = "topology"; diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index fd3a81f08c58..b9cdb622d9ca 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -1,4 +1,4 @@ -{ metaFetch, mkCoqDerivation, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3, +{ metaFetch, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3, version ? null }: let ocamlPackages = coq.ocamlPackages; diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 4af16c8921cb..eccc7c2d216f 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -6,7 +6,6 @@ backendStdenv, fetchurl, lib, - lndir, markForCudatoolkitRootHook, flags, stdenv, diff --git a/pkgs/development/embedded/bossa/arduino.nix b/pkgs/development/embedded/bossa/arduino.nix index 04e483ff38b5..519b9820278b 100644 --- a/pkgs/development/embedded/bossa/arduino.nix +++ b/pkgs/development/embedded/bossa/arduino.nix @@ -1,4 +1,4 @@ -{ bossa, git, fetchFromGitHub }: +{ bossa, fetchFromGitHub }: bossa.overrideAttrs (attrs: rec { pname = "bossa-arduino"; diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix index bdd541f04432..62db654270b9 100644 --- a/pkgs/development/gnuradio-modules/limesdr/default.nix +++ b/pkgs/development/gnuradio-modules/limesdr/default.nix @@ -5,7 +5,6 @@ , thrift , cmake , pkg-config -, doxygen , swig , python , logLib diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix index bde8daed6f35..3b0efe120b0e 100644 --- a/pkgs/development/haskell-modules/package-list.nix +++ b/pkgs/development/haskell-modules/package-list.nix @@ -1,4 +1,4 @@ -{ runCommand, haskellPackages, lib, all-cabal-hashes, writeShellScript }: +{ runCommand, haskellPackages, lib, all-cabal-hashes }: let # Checks if the version looks like a Haskell PVP version which is the format # Hackage enforces. This will return false if the version strings is empty or diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 2b6d2c26c09f..f1cbd213b871 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -7,7 +7,6 @@ , makeWrapper , ncurses , python3 -, runCommand , zlib # *NOT* from LLVM 9! diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index e7da04b38144..8e81d7eebc38 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -1,6 +1,5 @@ { lib, stdenv, octave, buildEnv , makeWrapper, texinfo -, octavePackages , wrapOctave , computeRequiredOctavePackages , extraLibs ? [] diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/development/interpreters/yex-lang/default.nix index ba00c0ec0c7a..87719884a06e 100644 --- a/pkgs/development/interpreters/yex-lang/default.nix +++ b/pkgs/development/interpreters/yex-lang/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index 128318480853..2bf2e2c614e7 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation ( finalAttrs: { pname = "blst"; diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 0a1fd07e2508..af52aabca79b 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, writeShellScript , cmake , ogre , freetype diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 7f127870032c..308db170bc32 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -4,7 +4,6 @@ , cmake , freedvSupport ? false , lpcnetfreedv -, codec2 }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 0a8b630d073b..d6e3e86200cf 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -1,5 +1,4 @@ { runCommand -, writeText , libxslt , dbus , findXMLCatalogs diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 1acddbbd12ec..1ce085544492 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "doctest"; diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 6e0c1b537518..e598f77db9dc 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook -, gfortran, perl, mpi, blas, lapack, scalapack, openssh +, perl, mpi, blas, lapack, scalapack, openssh # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 171b81af8365..532fc4847715 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, overrideSDK , fetchFromGitHub , boost , cmake diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index c3c41d971beb..b099a2dd10e3 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -10,7 +10,6 @@ , json-glib , gobject-introspection , gtk-doc -, pkgs , docbook-xsl-nons }: diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4057d4618816..22df229d47cc 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -17,7 +17,7 @@ , buildPackages # this is just for tests (not in the closure of any regular package) -, coreutils, dbus, tzdata +, dbus, tzdata , desktop-file-utils, shared-mime-info , darwin , makeHardcodeGsettingsPatch diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 1a205a6c04cb..d58bdd2e7800 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -8,7 +8,6 @@ , ninja , gtk-doc , docbook-xsl-nons -, docbook_xml_dtd_43 , docbook_xml_dtd_45 , pkg-config , libffi diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 5193cedf868b..128ed788f43f 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -14,7 +14,6 @@ , libxml2 , lua5_4 , liboauth -, libgdata , libmediaart , grilo , gst_all_1 diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 5473f02f35c6..ed0612bf2ecb 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -30,7 +30,6 @@ , libepoxy , libxkbcommon , libxml2 -, gmp , gnome , gsettings-desktop-schemas , sassc diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index dfd09e5dc6c4..57ef21ed595f 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -17,7 +17,6 @@ , glib , cairo , pango -, pandoc , gdk-pixbuf , gobject-introspection , fribidi diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index d773434b8323..faba68ede148 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg +{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 3fea0ff9cea2..7c5cdca3f619 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,7 +41,6 @@ , libgdata , libmsgraph , python3 -, python3Packages , gsettings-desktop-schemas }: diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 2b7f05bcdef0..2089050552e7 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -12,7 +12,6 @@ , pkg-config , boost , libtool -, perlPackages , pythonBindings ? true , tclBindings ? true , perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index cef877d286a6..843fc1991f27 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -6,7 +6,6 @@ , cmake , hwloc , gperftools -, ninja , pkg-config , python3 }: diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index b3ef27e38774..06a5dfa5e9aa 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index 3f02765af8ea..6d4fb30ef75d 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -2,7 +2,6 @@ mkDerivation, extra-cmake-modules, libical, - qtbase }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index be8016155b87..fc04f2074501 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, python3, - qtbase, qtdeclarative, qtscript, + qtdeclarative, qtscript, }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix index 20c1b2368a7b..a7e42f48c18d 100644 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, - qtquickcontrols2, qtbase, + qtquickcontrols2, }: mkDerivation { diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 2dc1a9625dc1..60b3ad00aeda 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -17,7 +17,6 @@ , db , libedit , pam -, krb5 , libmicrohttpd , cjson diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 82e519f6f100..766a1161e2c6 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, python3 }: let version = "0.3.4"; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index bff80ab996db..a6fad154ad25 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc -, libpng, libjpeg, libXinerama, freetype, SDL, libGLU, libGL +, libpng, libjpeg, libXinerama, freetype, SDL, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 94c414a08356..d5e5f1db552a 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, srcOnly , cmake , ninja , pkg-config diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index be3717d2cba7..e810da2e96cd 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub , autoreconfHook, autoconf-archive , installShellFiles, libiconv }: diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/development/libraries/libdwarf/common.nix index ebf59ccd03f9..4cf3102bbbfc 100644 --- a/pkgs/development/libraries/libdwarf/common.nix +++ b/pkgs/development/libraries/libdwarf/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildInputs, hash, version, libelf, url, knownVulnerabilities }: +{ lib, stdenv, fetchurl, buildInputs, hash, version, url, knownVulnerabilities }: stdenv.mkDerivation rec { pname = "libdwarf"; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index fd7797ca0f14..3c1b14eaf909 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -9,7 +9,6 @@ , glib , nss , gobject-introspection -, coreutils , cairo , libgudev , gtk-doc diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 2de6d8dd4d2c..a81f9587b3be 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -9,7 +9,6 @@ , glib , libxml2 , sqlite -, zlib , sg3_utils , gdk-pixbuf , taglib diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index de825b3b9dde..cdc4b4f077ad 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , libtool, pkg-config, automake, autoconf, intltool -, glib, gobject-introspection, gtk2, gtk-doc +, gobject-introspection, gtk2, gtk-doc , clutter, clutter-gtk }: diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index a8fcd2581caa..18927df1f1bc 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -10,7 +10,6 @@ , libxslt , pkg-config , python3 -, valgrind , publicsuffix-list }: diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index dc773c3de400..81f13acb340a 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -5,7 +5,6 @@ , ninja , gdk-pixbuf , gd -, libjpeg , pkg-config }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index 0406c3dbafb1..a72bfc6f25d5 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: +{ lib, stdenv, fetchurl, installShellFiles, pkg-config, libdatrie }: stdenv.mkDerivation rec { pname = "libthai"; diff --git a/pkgs/development/libraries/libusbgx/default.nix b/pkgs/development/libraries/libusbgx/default.nix index 84dcdff974c0..dacaf6d42da9 100644 --- a/pkgs/development/libraries/libusbgx/default.nix +++ b/pkgs/development/libraries/libusbgx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, bash-completion, pkg-config, libconfig, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub, pkg-config, libconfig, autoreconfHook }: stdenv.mkDerivation { pname = "libusbgx"; version = "unstable-2021-10-31"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 63cc42bd706f..d7aac099b821 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,7 +9,6 @@ , dnsmasq , docutils , fetchFromGitLab -, fetchpatch , gettext , glib , gnutls diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 184a48adf0dd..f788a7f59b9c 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -13,7 +13,6 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder # for passthru.tests -, freeimage , gd , graphicsmagick , haskellPackages diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix index b3b1d7059d81..c8af5c6baf33 100644 --- a/pkgs/development/libraries/lpcnetfreedv/default.nix +++ b/pkgs/development/libraries/lpcnetfreedv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, codec2 }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake }: let dataVersion = "191005_v1.0"; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index bd78a4329a59..c9597f8320cb 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -1,6 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, librdf_raptor2, ladspaH, openssl, zlib -, doCheck ? config.doCheckByDefault or false, ladspaPlugins +, librdf_raptor2, doCheck ? config.doCheckByDefault or false, ladspaPlugins }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index 0a907bf4d285..0d34c42b8122 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "lyra"; diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix index b173498189d6..901b26f4e646 100644 --- a/pkgs/development/libraries/maui-core/default.nix +++ b/pkgs/development/libraries/maui-core/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , mkDerivation , libcanberra , pulseaudio diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 55ae2c8d9899..7c987f642269 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,9 +1,7 @@ -{ autoreconfHook -, cmake +{ cmake , fetchFromGitLab , mediastreamer , openh264 -, pkg-config , lib , stdenv }: diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 04f429aa899f..243c9b81bbe1 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, glib, readline, makeWrapper }: stdenv.mkDerivation { pname = "neardal"; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index f5cdc9f4841a..2c092dd57b13 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , ruby , opencl-headers -, addDriverRunpath , autoreconfHook , windows }: diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 22478d72200b..b906be979f57 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -2,7 +2,6 @@ , stdenv , applyPatches , fetchFromGitHub -, fetchpatch , cmake , git , llvmPackages_14 diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 12b05df234d8..25b43b3600e9 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer +, libpng, libtiff, zlib, lcms2, jpylyzer , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server , jdk diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 59f2d21d4c48..55fc330024d1 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, removeReferencesTo, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin +, rdma-core, zlib, numactl, libevent, hwloc, targetPackages , libpsm2, libfabric, pmix, ucx, ucc, makeWrapper , config # Enable CUDA support diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 4cde03bdf55b..ae9e63619a80 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index aa0926a849cc..6e489f69b72c 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -10,7 +10,6 @@ , gtk3 , qtbase , qtwayland -, pantheon , substituteAll , gsettings-desktop-schemas , useQt6 ? false diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 43c2c88ecd79..e738aba60560 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -3,11 +3,8 @@ , src , patches ? [ ] , version -, coreutils -, buildPackages , bison , flex -, gdb , gperf , lndir , perl @@ -36,7 +33,6 @@ , libdatrie , lttng-ust , libepoxy -, libiconv , dbus , fontconfig , freetype diff --git a/pkgs/development/libraries/qtfeedback/default.nix b/pkgs/development/libraries/qtfeedback/default.nix index a329ece074ba..285a81ae1ac4 100644 --- a/pkgs/development/libraries/qtfeedback/default.nix +++ b/pkgs/development/libraries/qtfeedback/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , perl , qmake -, qtbase , qtdeclarative }: diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 7387e6913073..69eb4b0cd12d 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , fetchpatch -, cmake , meson , ninja , pkg-config diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index ad7ba8a5a549..d41459e25ead 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -4,12 +4,10 @@ , fetchFromGitHub , freetype , gtk3-x11 -, mount , pcre , pkg-config , webkitgtk , xorg -, llvmPackages , WebKit , MetalKit , CoreAudioKit diff --git a/pkgs/development/libraries/rustls-ffi/default.nix b/pkgs/development/libraries/rustls-ffi/default.nix new file mode 100644 index 000000000000..d5d736dd2225 --- /dev/null +++ b/pkgs/development/libraries/rustls-ffi/default.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + Security, + apacheHttpd, +}: + +rustPlatform.buildRustPackage rec { + pname = "rustls-ffi"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "rustls"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc="; + }; + + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + cargoLock.lockFile = ./Cargo.lock; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + installPhase = '' + runHook preInstall + + make install DESTDIR=${placeholder "out"} + + runHook postInstall + ''; + + passthru.tests = { + apacheHttpd = apacheHttpd.override { modTlsSupport = true; }; + # Currently broken notably because of https://github.com/curl/curl/issues/13248 + # curl = curl.override { opensslSupport = false; rustlsSupport = true; }; + }; + + meta = with lib; { + description = "C-to-rustls bindings"; + homepage = "https://github.com/rustls/rustls-ffi/"; + license = with lib.licenses; [ + mit + asl20 + isc + ]; + maintainers = [ maintainers.lesuisse ]; + }; +} diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 1f49afbacff2..279ce4356b69 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, path, runtimeShell }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "safefile"; version = "1.0.5"; diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index e50bde243e85..f0d23b7e2e25 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, eigen, libGL, doxygen, spglib +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, eigen, libGL, spglib , mmtf-cpp, glew, python3, libarchive, libmsym, msgpack, qttools, wrapQtAppsHook }: diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix index 74f24e10f55f..267ac53d75d1 100644 --- a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix @@ -1,6 +1,4 @@ { buildPythonPackage -, pkg-config -, meson , simple-dftd3 , cffi , numpy diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 4ecd08d103fa..9f9405dec318 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -1,5 +1,4 @@ { stdenv -, bash , buildPackages , buildBazelPackage , fetchFromGitHub diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 36564110d283..3d6a3653d267 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: +{ lib, stdenv, fetchgit, python3, cmake, jq }: stdenv.mkDerivation rec { pname = "swiftshader"; diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix index 5d70bed4dd0f..e0c4296cb277 100644 --- a/pkgs/development/libraries/sycl-info/default.nix +++ b/pkgs/development/libraries/sycl-info/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, installShellFiles , cmake , ninja , ocl-icd diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index e4a8c7628bc8..55feb41bec8a 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, cmake , fetchFromGitLab , pkg-config , meson diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 9320fe34bb64..3ea2d075602a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit , gn, ninja, python3, glib, pkg-config, icu -, xcbuild, darwin +, xcbuild , fetchpatch , llvmPackages , symlinkJoin diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 79d3feca5245..742f5c58d281 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper -, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv +, runCommandCC, runCommand, vapoursynth, writeText, buildEnv , zimg, libass, python3, libiconv, testers , ApplicationServices }: diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index b005582b7f54..1991f2d6d7f9 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3 , ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme -, autoconf, automake, libtool , buildPackages }: diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 1eb1ede66cb0..a77dedb0c6ee 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -32,7 +32,6 @@ , AVFoundation , AVKit , WebKit -, fetchpatch }: let catch = fetchFromGitHub { diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index da85a37ab5bc..03ac85418710 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doctest , enableAssertions ? false diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/development/libraries/xtl/default.nix index 87f480ea29fe..208aceb3e35b 100644 --- a/pkgs/development/libraries/xtl/default.nix +++ b/pkgs/development/libraries/xtl/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , doctest -, gtest }: stdenv.mkDerivation rec { pname = "xtl"; diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 1cc8d66044c7..0bd421ede7ce 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua51Packages, lua, pkg-config, lib, substituteAll, zenity, AppKit}: +{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib, substituteAll, zenity, AppKit}: buildLuarocksPackage { pname = "nfd"; diff --git a/pkgs/development/misc/or1k/newlib.nix b/pkgs/development/misc/or1k/newlib.nix index 92829896a27c..39ddf063eacb 100644 --- a/pkgs/development/misc/or1k/newlib.nix +++ b/pkgs/development/misc/or1k/newlib.nix @@ -1,4 +1,4 @@ -{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }: +{ stdenv, fetchFromGitHub, crossLibcStdenv, buildPackages }: crossLibcStdenv.mkDerivation { name = "newlib"; diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index 13fd7a9adecc..5b68631e344d 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , pkgsBuildHost , ... }: diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix index 11ad37453f2a..0279b948a7ab 100644 --- a/pkgs/development/mobile/androidenv/cmdline-tools.nix +++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, postInstall}: +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, stdenv, postInstall}: deployAndroidPackage { name = "androidsdk"; diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix index 9fd112063cb8..c0252839cf23 100644 --- a/pkgs/development/mobile/androidenv/patcher.nix +++ b/pkgs/development/mobile/androidenv/patcher.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, stdenv}: deployAndroidPackage { inherit package os; diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 0a302d26b624..1d629daef875 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }: +{ lib, buildDunePackage, fetchurl, seq, stdlib-shims }: buildDunePackage rec { minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/octave-modules/financial/default.nix b/pkgs/development/octave-modules/financial/default.nix index 5fb6a00df78b..d034718ab5b8 100644 --- a/pkgs/development/octave-modules/financial/default.nix +++ b/pkgs/development/octave-modules/financial/default.nix @@ -1,8 +1,6 @@ { buildOctavePackage , lib , fetchurl -, io -, statistics }: buildOctavePackage rec { diff --git a/pkgs/development/octave-modules/level-set/default.nix b/pkgs/development/octave-modules/level-set/default.nix index 3cc0873e3813..325ce0390ada 100644 --- a/pkgs/development/octave-modules/level-set/default.nix +++ b/pkgs/development/octave-modules/level-set/default.nix @@ -1,5 +1,4 @@ { buildOctavePackage -, stdenv , lib , fetchgit , automake diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index e638d4c470ab..2ed284fe6079 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -2,10 +2,8 @@ lib, buildPecl, fetchFromGitHub, - writeText, libcouchbase, zlib, - php, substituteAll, }: let diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 271ad52a9595..b477d447c562 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, setuptools, diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 381eba4f5fcc..aba7e3fe32c1 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -14,7 +14,6 @@ requests-toolbelt, setuptools, rich, - pysocks, pip, pytest-httpbin, pytest-lazy-fixture, diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 4f04a810bd5e..dab384316fb7 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, cmake, cython, diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 83816d8958ac..36fe5b0421fe 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -1,7 +1,6 @@ { pname, version, - disabled, src, patches ? [ ], meta, diff --git a/pkgs/development/python-modules/pytest-cov-stub/default.nix b/pkgs/development/python-modules/pytest-cov-stub/default.nix index 025a815686f6..0d2ab63bd9bd 100644 --- a/pkgs/development/python-modules/pytest-cov-stub/default.nix +++ b/pkgs/development/python-modules/pytest-cov-stub/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - python, hatchling, }: diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 2ef63fd1f97a..9839f6d6c55d 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, click, - colorama, coverage, fetchPypi, pdm-backend, diff --git a/pkgs/development/python2-modules/attrs/default.nix b/pkgs/development/python2-modules/attrs/default.nix index e894ee27d3fb..30eb0ab17e25 100644 --- a/pkgs/development/python2-modules/attrs/default.nix +++ b/pkgs/development/python2-modules/attrs/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix index 6de685ea2771..11b9ae9ab5de 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix @@ -6,7 +6,6 @@ , vulkan-loader , glslang , shaderc -, lit }: callPackage ../base.nix rec { diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix index bd8a4ed4e35d..187775e25a65 100644 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ b/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -3,7 +3,6 @@ , stdenv , fetchFromGitHub , rocmUpdateScript -, runCommand , cmake , rocm-cmake , clr diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix index 8b71b3fb2977..7611a30165a7 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix @@ -6,7 +6,6 @@ , vulkan-loader , glslang , shaderc -, lit , fetchpatch }: diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index f93cceddd68a..4233aa640690 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , rocmUpdateScript -, runCommand , cmake , rocm-cmake , clr diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/development/ruby-modules/rbenv/default.nix index ef8b4c47818b..6c080f4f2181 100644 --- a/pkgs/development/ruby-modules/rbenv/default.nix +++ b/pkgs/development/ruby-modules/rbenv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bash, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { pname = "rbenv"; diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix index e28e77989939..25d5bc965193 100644 --- a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix +++ b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommandCC, skawarePackages, skalibs }: +{ lib, runCommandCC, skalibs }: let # From https://skarnet.org/software/misc/sdnotify-wrapper.c, diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 8fcaa144ab8c..a3ceed9c43e0 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -3,7 +3,6 @@ , lib , autoPatchelfHook , wrapQtAppsHook -, gmpxx , gnustep , libbsd , libffi_3_3 diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index ba844a6250dd..8c9127296b17 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, nix-update-script , cargo , meson , ninja @@ -13,8 +12,6 @@ , gst_all_1 , gtk4 , libadwaita -, llvmPackages -, glibc , pipewire , wayland , wrapGAppsHook4 diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index 288bcecd3b8d..17c3a181ec9a 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, - callPackage, fetchFromGitHub, buildDotnetModule, buildGoModule, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 2e1459c16bea..c2210358344c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -1,8 +1,8 @@ { stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles -, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +, runCommand, runCommandCC, makeWrapper # this package (through the fixpoint glass) , bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils +, lr, xe, zip, unzip, bash, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater , python3, writeScript @@ -14,8 +14,6 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook , file , substituteAll , writeTextFile diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 5521fcf0d53d..a49530ecfc69 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -2,7 +2,7 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils +, lr, xe, zip, unzip, bash, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils , diffutils, gnupatch # updater @@ -15,8 +15,6 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook , file , substituteAll , writeTextFile diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 7c604e711203..16bb018e36dd 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, libgit2 }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, libgit2 }: rustPlatform.buildRustPackage rec { pname = "cocogitto"; diff --git a/pkgs/development/tools/dbus-test-runner/default.nix b/pkgs/development/tools/dbus-test-runner/default.nix index 15f219ac9b1d..93b186095923 100644 --- a/pkgs/development/tools/dbus-test-runner/default.nix +++ b/pkgs/development/tools/dbus-test-runner/default.nix @@ -4,7 +4,6 @@ , testers , autoreconfHook , bash -, coreutils , dbus , dbus-glib , glib diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index b5ea07dde147..a2d73ae7c816 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: +{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix index 5a2ea9772b40..b661adaac136 100644 --- a/pkgs/development/tools/hover/default.nix +++ b/pkgs/development/tools/hover/default.nix @@ -6,7 +6,6 @@ , pkg-config , fetchFromGitHub , roboto -, writeScript , xorg , libglvnd , addDriverRunpath diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index c7207a686ca7..2de6e6618d29 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: +{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk }: stdenv.mkDerivation rec { version = "2.1.8"; diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/development/tools/ldid/default.nix index fc8692205fc5..38b252781c7e 100644 --- a/pkgs/development/tools/ldid/default.nix +++ b/pkgs/development/tools/ldid/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, callPackage , fetchgit , libplist , libxml2 diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/development/tools/mblock-mlink/default.nix index 4d70efbbc50e..0b6ec3252ef5 100644 --- a/pkgs/development/tools/mblock-mlink/default.nix +++ b/pkgs/development/tools/mblock-mlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, makeWrapper, autoPatchelfHook }: +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "mblock-mlink"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 610f04fd35a5..491bfc19ae0f 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -14,7 +14,6 @@ in , lib , noSysDirs , perl -, substitute , zlib , CoreServices diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 129b534339ee..228f8ed98a67 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, bash , cmake , colordiff , flex diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index f60c0c0b1de7..8c6f089099f2 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -43,7 +43,6 @@ , cacert , glibcLocales , fetchFromGitHub -, fetchpatch2 , nixosTests }: diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index 83dbfb93c86d..a082614aece3 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }: +{ fetchurl, perl, python3, lib, stdenv, zip }: stdenv.mkDerivation rec { pname = "jscoverage"; diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index b9c616b1fa31..b855a648a537 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, cargo , ctags , lib , makeWrapper diff --git a/pkgs/development/tools/nap/default.nix b/pkgs/development/tools/nap/default.nix index aad1a6c53a3a..784877af792f 100644 --- a/pkgs/development/tools/nap/default.nix +++ b/pkgs/development/tools/nap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "nap"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 450666a25609..7c92c1acdd22 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib , lambda-term, cppo, makeWrapper, buildDunePackage -, xdg, zed, logs, lwt, react, lwt_react +, xdg, zed, logs }: buildDunePackage rec { diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 2e2cecf77439..fdd665bbae22 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -9,7 +9,6 @@ # is released we can switch to latest binutils. libbfd_2_38, libopcodes_2_38, - buildPackages, autoreconfHook }: diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 9479a949ff3c..61d808e23c6d 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -7,7 +7,6 @@ , gdk-pixbuf , fontconfig , pango -, gnome , atk , at-spi2-atk , at-spi2-core diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 5051949d08b6..db2b4417c1b5 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -1,6 +1,4 @@ { lib, fetchCrate, rustPlatform, clang, rustfmt -, runtimeShell -, bash }: let # bindgen hardcodes rustfmt outputs that use nightly features diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/development/tools/rust/cargo-espmonitor/default.nix index 9c4874a97555..4c65c7bba3b2 100644 --- a/pkgs/development/tools/rust/cargo-espmonitor/default.nix +++ b/pkgs/development/tools/rust/cargo-espmonitor/default.nix @@ -1,8 +1,6 @@ { lib , fetchFromGitHub , rustPlatform -, pkg-config -, systemd , }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index da48ad231e34..e9398de3e8cf 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -1,7 +1,6 @@ { darwin , fetchFromGitHub , lib -, pkg-config , rustPlatform , stdenv }: diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 6f8092dd0fc3..be536194d290 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, runCommand , fetchCrate , rustPlatform , Security diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/development/tools/smlfmt/default.nix index 1ae8c49ab262..a8a1d4fb4d62 100644 --- a/pkgs/development/tools/smlfmt/default.nix +++ b/pkgs/development/tools/smlfmt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, mlton }: +{ lib, stdenv, fetchFromGitHub, mlton }: stdenv.mkDerivation rec { pname = "smlfmt"; diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/development/tools/steamos-devkit/default.nix index 462bf620e730..ed0e41b5f84a 100644 --- a/pkgs/development/tools/steamos-devkit/default.nix +++ b/pkgs/development/tools/steamos-devkit/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , fetchFromGitLab -, writeScript , python3 , copyDesktopItems , makeDesktopItem diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index 086c79d964a0..317f0ee41617 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, runCommand }: +{ stdenv, lib, fetchFromGitHub }: # This derivation is impure: it relies on an Xcode toolchain being installed # and available in the expected place. The values of sandboxProfile and diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 0de59f4256e1..bbb340b42a9a 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -4,8 +4,6 @@ rustPlatform, fetchFromGitHub, pkg-config, openssl, -jq, -moreutils, CoreServices, SystemConfiguration }: diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 8ce3c5aef739..dfe13b69a559 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,6 +1,5 @@ { alsa-lib , autoPatchelfHook -, callPackage , fetchzip , gtk2 , gtk3 diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 44737d2ba8ec..cb1f5242e265 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { From e90f9a5491311a7e1055968295669d5b5e1dd122 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 15:34:39 +0000 Subject: [PATCH 315/481] python312Packages.pandoc-latex-environment: 1.1.6.4 -> 1.1.6.5 --- .../python-modules/pandoc-latex-environment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix index fef2811083d9..c2cdf7e679a2 100644 --- a/pkgs/development/python-modules/pandoc-latex-environment/default.nix +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pandoc-latex-environment"; - version = "1.1.6.4"; + version = "1.1.6.5"; pyproject = true; src = fetchFromGitHub { owner = "chdemko"; repo = "pandoc-latex-environment"; rev = "refs/tags/${version}"; - hash = "sha256-DLuLFCKP5ip3duHlGAZnFip7GCDzWK91bka3DrknQSA="; + hash = "sha256-yBVxQW042mGQAksTG5Vr8fExcKt2YnuiPL1cSZRJJYA="; }; build-system = [ From 1447abdb8e199476f8c0f667ac1046995b4075c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 15:34:53 +0000 Subject: [PATCH 316/481] python312Packages.subarulink: 0.7.11 -> 0.7.12 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index f669da48ddd5..6adb88a40f32 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.11"; + version = "0.7.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HKtToMh4dAUpA654tFkUEM9DLPGr9XRQK0ezYzNPzqk="; + hash = "sha256-vH4jdH8ZqMSGqHa/4WzvSy7IcN8b3rr/TswsWtoSxOw="; }; propagatedBuildInputs = [ From f6c6c6203fe698613cdd5dd9d91cc00935ca95be Mon Sep 17 00:00:00 2001 From: Kaleb Olson Date: Wed, 31 Jul 2024 21:44:27 -0500 Subject: [PATCH 317/481] Set literal NIX_PATH in 'other distro' docs Setting `NIX_PATH="$NIX_PATH"` doesn't work in this context. As of NixOS/nix@ec9dd9a , nix is no longer setting NIX_PATH on non-nixOS distros. --- .../manual/installation/installing-from-other-distro.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index 38f0e5301472..c52a8a3125c5 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -125,7 +125,7 @@ The first steps to all these are the same: ::: ```ShellSession - $ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt + $ sudo PATH="$PATH" NIX_PATH="$HOME/.nix-defexpr/channels" `which nixos-install` --root /mnt ``` Again, please refer to the `nixos-install` step in From 3f9a3259547aff8490eba10a2b0d0e50bcc6566e Mon Sep 17 00:00:00 2001 From: Kaleb Olson Date: Fri, 2 Aug 2024 18:28:36 -0500 Subject: [PATCH 318/481] remove NIX_PATH from nixos-install step --- .../manual/installation/installing-from-other-distro.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index c52a8a3125c5..2d9818e6805c 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -125,7 +125,7 @@ The first steps to all these are the same: ::: ```ShellSession - $ sudo PATH="$PATH" NIX_PATH="$HOME/.nix-defexpr/channels" `which nixos-install` --root /mnt + $ sudo PATH="$PATH" `which nixos-install` --root /mnt ``` Again, please refer to the `nixos-install` step in From 72dc43c0aaf91c3a3c5fba19e740e99d76b3076e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sat, 3 Aug 2024 18:07:23 +0200 Subject: [PATCH 319/481] eza: 0.18.23 -> 0.18.24 changelog: https://github.com/eza-community/eza/releases/tag/v0.18.24 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 2e04cd6625a1..71ac2e0532ee 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.23"; + version = "0.18.24"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-Zwi6YfYhOLZ+RcIH/u1IeUn4Ty9jOvv9R0RTLO8Yi8Q="; + hash = "sha256-5UYYFE5IZmK2eAryUG4dNOTGE+Q1C2TDPos39zyQPaQ="; }; - cargoHash = "sha256-6g9EtHJaUAoIyjiklX/FxlGNZMzh6/mN9Yug35svfrE="; + cargoHash = "sha256-OC8HiFaxn4+TZLLNh6NNf8KvlgIBrYFBrKzPjvKsmNM="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From dee748da8648d7d84331cd0b6553ea544f560059 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 3 Aug 2024 22:17:43 +0800 Subject: [PATCH 320/481] deepin.deepin-pw-check: fix build for cracklib 2.10 --- pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix index fd50f71ac201..44c52c31a8e4 100644 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -23,6 +23,10 @@ buildGoModule rec { hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk="; }; + patches = [ + "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" + ]; + vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY="; nativeBuildInputs = [ From e1354a3538168398bbe88d555ee73eaf5df69e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Sat, 3 Aug 2024 19:09:47 +0200 Subject: [PATCH 321/481] maintainers: partially remove anselmschueler --- maintainers/maintainer-list.nix | 2 +- pkgs/applications/graphics/curtail/default.nix | 2 +- pkgs/applications/graphics/tesseract/tesseract5.nix | 2 +- pkgs/applications/misc/hollywood/default.nix | 2 +- .../networking/instant-messengers/fractal/default.nix | 2 +- pkgs/development/libraries/exprtk/default.nix | 2 +- pkgs/development/python-modules/types-psutil/default.nix | 2 +- pkgs/development/tools/rust/genemichaels/default.nix | 2 +- pkgs/tools/misc/see/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 84bae7d43d4c..f0fa282118d6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1449,7 +1449,7 @@ name = "Anselm Schüler"; matrix = "@schuelermine:matrix.org"; keys = [ { fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955"; } ]; - }; + }; # currently on hiatus, please do not ping until this notice is removed (or if it’s been like two years) anthonyroussel = { email = "anthony@roussel.dev"; github = "anthonyroussel"; diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix index 6ff083d08f02..6c6c6de1d852 100644 --- a/pkgs/applications/graphics/curtail/default.nix +++ b/pkgs/applications/graphics/curtail/default.nix @@ -72,6 +72,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "curtail"; homepage = "https://github.com/Huluti/Curtail"; license = licenses.gpl3Only; - maintainers = with maintainers; [ anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index be81a3dd21c9..16899aea978b 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ anselmschueler ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "tesseract"; }; diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix index 96e88500ae20..0609660a85d5 100644 --- a/pkgs/applications/misc/hollywood/default.nix +++ b/pkgs/applications/misc/hollywood/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation { mainProgram = "hollywood"; homepage = "https://a.hollywood.computer/"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 56593cc315cb..998ae6802341 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/fractal"; changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]); + maintainers = teams.gnome.members; platforms = platforms.linux; mainProgram = "fractal"; }; diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/development/libraries/exprtk/default.nix index 1d917f6de6ed..90fe883a2766 100644 --- a/pkgs/development/libraries/exprtk/default.nix +++ b/pkgs/development/libraries/exprtk/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "C++ Mathematical Expression Toolkit Library"; homepage = "https://www.partow.net/programming/exprtk/index.html"; license = licenses.mit; - maintainers = with maintainers; [ anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 766f6beebefe..e850eb837c5b 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Typing stubs for psutil"; homepage = "https://github.com/python/typeshed"; license = licenses.asl20; - maintainers = with maintainers; [ anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/rust/genemichaels/default.nix b/pkgs/development/tools/rust/genemichaels/default.nix index aec8003bbd52..5fa08d08d546 100644 --- a/pkgs/development/tools/rust/genemichaels/default.nix +++ b/pkgs/development/tools/rust/genemichaels/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "genemichaels"; homepage = "https://github.com/andrewbaxter/genemichaels"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/see/default.nix b/pkgs/tools/misc/see/default.nix index 31cc69ffe46b..f2c68cca97c4 100644 --- a/pkgs/tools/misc/see/default.nix +++ b/pkgs/tools/misc/see/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication { description = "CLI tool to open files in the terminal"; homepage = "https://github.com/Textualize/textualize-see"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ anselmschueler ]; + maintainers = [ ]; mainProgram = "see"; }; } From 8a67aa85343fbacb073bb61184f47d035d9a6051 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 1 Aug 2024 13:03:45 +0200 Subject: [PATCH 322/481] python312Packages.ale-py: 0.9.0 -> 0.9.1 Diff: https://github.com/Farama-Foundation/Arcade-Learning-Environment/compare/refs/tags/v0.9.0...v0.9.1 Changelog: https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v0.9.1 --- .../ale-py/cmake-pybind11.patch | 18 ----------- .../python-modules/ale-py/default.nix | 32 ++++++++++++------- 2 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/ale-py/cmake-pybind11.patch diff --git a/pkgs/development/python-modules/ale-py/cmake-pybind11.patch b/pkgs/development/python-modules/ale-py/cmake-pybind11.patch deleted file mode 100644 index 5bcf5b1d9b2f..000000000000 --- a/pkgs/development/python-modules/ale-py/cmake-pybind11.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 911e280..d484943 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -1,12 +1,6 @@ - find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED) - --include(FetchContent) --FetchContent_Declare( -- pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11 -- GIT_TAG v2.10.0) --FetchContent_MakeAvailable(pybind11) -- -+find_package(pybind11 REQUIRED) - add_library(ale-py MODULE ale_python_interface.cpp) - # Depend on the ALE and pybind11 module - target_link_libraries(ale-py PUBLIC ale ale-lib) diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 14c3e7b939a6..cdf2363a52f1 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -3,25 +3,34 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + + # build-system cmake, ninja, pybind11, setuptools, wheel, + + # buildInputs SDL2, zlib, + + # dependencies importlib-resources, numpy, typing-extensions, importlib-metadata, + + # checks gymnasium, pytestCheckHook, + stdenv, }: buildPythonPackage rec { pname = "ale-py"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,14 +39,9 @@ buildPythonPackage rec { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; rev = "refs/tags/v${version}"; - hash = "sha256-obZfNQ0+ppnq/BD4IFeMFAqJnCVV3X/2HeRwbdSKRFk="; + hash = "sha256-MpumAQ5OW/+fRIvrBlRWkgioxMVceb5LxEH2JjRk5zY="; }; - patches = [ - # don't download pybind11, use local pybind11 - ./cmake-pybind11.patch - ]; - build-system = [ cmake ninja @@ -57,10 +61,16 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' - ''; + postPatch = + # Relax the pybind11 version + '' + substituteInPlace src/python/CMakeLists.txt \ + --replace-fail 'find_package(pybind11 ''${PYBIND11_VER} QUIET)' 'find_package(pybind11 QUIET)' + '' + + '' + substituteInPlace pyproject.toml \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; dontUseCmakeConfigure = true; From b959ca09fb9afa3e2966fb8ba21a6d36e21a1e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 29 Jul 2024 00:50:06 +0200 Subject: [PATCH 323/481] linuxPackages.it87: unstable-2022-02-26 -> unstable-2024-06-09 --- pkgs/os-specific/linux/it87/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix index aa51626986e7..7416507e4a9d 100644 --- a/pkgs/os-specific/linux/it87/default.nix +++ b/pkgs/os-specific/linux/it87/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "it87-${version}-${kernel.version}"; - version = "unstable-2022-02-26"; + version = "unstable-2024-06-09"; # Original is no longer maintained. # This is the same upstream as the AUR uses. src = fetchFromGitHub { owner = "frankcrawford"; repo = "it87"; - rev = "c93d61adadecb009c92f3258cd3ff14a66efb193"; - sha256 = "sha256-wVhs//iwZUUGRTk1DpV/SnA7NZ7cFyYbsUbtazlxb6Q="; + rev = "a82899557b4779b87d444a43caf126615e03bb4a"; + hash = "sha256-aMMK3QoeXr6mPbo4SDXE8UuWc/oJ3lpgyK7wyEDKaEM="; }; hardeningDisable = [ "pic" ]; From 2a4d620d6b6213fb17921e6a8acf60027c226ab7 Mon Sep 17 00:00:00 2001 From: Stephen Stubbs Date: Sat, 3 Aug 2024 18:33:27 +0100 Subject: [PATCH 324/481] zotero-beta: 7.0.0-83 -> 7.0.0-111 --- pkgs/by-name/zo/zotero-beta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zo/zotero-beta/package.nix b/pkgs/by-name/zo/zotero-beta/package.nix index 2aca01589119..e8da30471190 100644 --- a/pkgs/by-name/zo/zotero-beta/package.nix +++ b/pkgs/by-name/zo/zotero-beta/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "7.0.0-beta.83+066eda731"; + version = "7.0.0-beta.111+b4f6c050e"; src = let @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "https://download.zotero.org/client/beta/${escapedVersion}/Zotero-${escapedVersion}_linux-x86_64.tar.bz2"; - hash = "sha256-wqew12/Icv4XS+IJRVcf1Rh/ipqBhe8QGkP8ErfS4J0="; + hash = "sha256-pZsmS4gKCT8UAjz9IJg5C7n4kk7bWT/7H5ONF20CzPM="; }; dontPatchELF = true; From 15f91e2ad892013ebcce5ed23c5c4a63f44332ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 19:57:37 +0200 Subject: [PATCH 325/481] python312Packages.boto3-stubs: 1.34.152 -> 1.34.153 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 4f04140104ee..be1e31dc0cf9 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.152"; + version = "1.34.153"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-8bOm1f224phhlkGaJEffhgnnmCawzBhHIPsxjTwSOw0="; + hash = "sha256-TOuJEvk9fVbxAmsr5EIvcn6dXjZSD4irnn8bJcuXJZ4="; }; build-system = [ setuptools ]; From 786d53a2b1770e87be763968a4f29a5125f89ee1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 19:57:41 +0200 Subject: [PATCH 326/481] python312Packages.botocore-stubs: 1.34.152 -> 1.34.153 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index b79a970aeeb9..c1e3e36ea1c8 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.152"; + version = "1.34.153"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-sPMsUUPHiukPDg3LXMYG8YM/ReswUSABCMMMBV77P+s="; + hash = "sha256-zSInN2lWIEwcJH7RiSnzkDAecD+GqmTMFOP29ffL5Cc="; }; nativeBuildInputs = [ poetry-core ]; From 2e7de3ff64f5eaa81009de7148d074b4845e25a5 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 21 Jul 2024 13:58:10 +0100 Subject: [PATCH 327/481] attract-mode: 2.6.2 -> 2.7.0-unstable-2024-08-02 Includes fixes for FFmpeg 7. --- pkgs/by-name/at/attract-mode/package.nix | 82 +++++++++++++++--------- 1 file changed, 50 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/at/attract-mode/package.nix b/pkgs/by-name/at/attract-mode/package.nix index abf2dfe9b751..87328a78ce6f 100644 --- a/pkgs/by-name/at/attract-mode/package.nix +++ b/pkgs/by-name/at/attract-mode/package.nix @@ -1,58 +1,76 @@ { - expat, + lib, + stdenv, fetchFromGitHub, - ffmpeg_4, - fontconfig, + pkg-config, + expat, + ffmpeg_7, freetype, libarchive, libjpeg, libGLU, - libGL, - openal, - pkg-config, sfml, - lib, - stdenv, zlib, + openal, + fontconfig, + darwin, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "attract-mode"; - version = "2.6.2"; + version = "2.7.0-unstable-2024-08-02"; src = fetchFromGitHub { owner = "mickelson"; repo = "attract"; - rev = "v${version}"; - sha256 = "sha256-gKxUU2y6Gtm5a/tXYw/fsaTBrriNh5vouPGICs3Ph3c="; + rev = "6ed3a1e32a519608c0b495295cc4c18ceea6b461"; + hash = "sha256-uhbu/DaQSE9Dissv7XLFMVYitPn8ZEewq90poCtEfYY="; }; nativeBuildInputs = [ pkg-config ]; - patchPhase = '' - sed -i "s|prefix=/usr/local|prefix=$out|" Makefile - ''; + buildInputs = + [ + expat + ffmpeg_7 + freetype + libarchive + libjpeg + libGLU + sfml + zlib + ] + ++ lib.optionals (!stdenv.isDarwin) [ + openal + fontconfig + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.CoreVideo + darwin.apple_sdk.frameworks.OpenAL + ]; - buildInputs = [ - expat - ffmpeg_4 - fontconfig - freetype - libarchive - libjpeg - libGLU - libGL - openal - sfml - zlib - ]; + makeFlags = [ + "prefix=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + "STRIP=${stdenv.cc.targetPrefix}strip" + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" + "AR=${stdenv.cc.targetPrefix}ar" + "BUILD_EXPAT=0" + ] ++ lib.optionals stdenv.isDarwin [ "USE_FONTCONFIG=0" ]; - meta = with lib; { + enableParallelBuilding = true; + + meta = { description = "Frontend for arcade cabinets and media PCs"; homepage = "http://attractmode.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hrdinka ]; - platforms = with platforms; linux; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.hrdinka ]; + platforms = lib.platforms.unix; mainProgram = "attract"; }; } From 9e164ae850e90373788c9a05402ef3907c867c84 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 20:17:44 +0200 Subject: [PATCH 328/481] python312Packages.deezer-python: 6.2.0 -> 7.0.0 Diff: https://github.com/browniebroke/deezer-python/compare/refs/tags/v6.2.0...v7.0.0 Changelog: https://github.com/browniebroke/deezer-python/releases/tag/v7.0.0 --- .../python-modules/deezer-python/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 0bd136e6fceb..e0b4b3907c37 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -3,27 +3,27 @@ buildPythonPackage, environs, fetchFromGitHub, + httpx, poetry-core, pytest-mock, pytest-vcr, pytestCheckHook, pythonOlder, - requests, tornado, }: buildPythonPackage rec { pname = "deezer-python"; - version = "6.2.0"; + version = "7.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "browniebroke"; repo = "deezer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Y1y8FBxpGpNIWCZbel9fdGLGC9VM9h1BvHtUxCZxp/A="; + hash = "sha256-V4M6qRTa7XKbl962Z3y70+v3YCeW65VjeSIv/1Oxnws="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ - requests + httpx tornado ]; From 49c723ce1ef295fc9454c7ef93bf47c1b92cd11e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 20:21:17 +0200 Subject: [PATCH 329/481] python312Packages.getmac: 0.9.4 -> 0.9.5 Diff: https://github.com/GhostofGoes/getmac/compare/refs/tags/0.9.4...0.9.5 Changelog: https://github.com/GhostofGoes/getmac/blob/0.9.5/CHANGELOG.md --- pkgs/development/python-modules/getmac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 141a6c44d27d..4c3339e7580a 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "getmac"; - version = "0.9.4"; + version = "0.9.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "GhostofGoes"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-B9agBmSrD3ZhqpGclZdMQNRSLSkepR6iduP1yrYz9tU="; + hash = "sha256-ZbTCbbASs7+ChmgcDePXSbiHOst6/eCkq9SiKgYhFyM="; }; nativeCheckInputs = [ From a42630abbd2f89731750cd42c0498452bc18de88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 20:23:15 +0200 Subject: [PATCH 330/481] python312Packages.google-cloud-pubsub: 2.21.5 -> 2.23.0 Changelog: https://github.com/googleapis/python-pubsub/blob/v2.23.0/CHANGELOG.md --- .../python-modules/google-cloud-pubsub/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 5f7618c3af51..94b11b4513fc 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -18,14 +18,15 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.21.5"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-T6lufyADWczEnPZlfjGsNfXm5V0A+7PO36ZykDz3WyQ="; + pname = "google_cloud_pubsub"; + inherit version; + hash = "sha256-zz1vKrEbXI38CqfUyuXuHWa0CNlmbxdiycF+JpzYtlg="; }; build-system = [ setuptools ]; @@ -64,10 +65,10 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Pub/Sub API client library"; - mainProgram = "fixup_pubsub_v1_keywords.py"; homepage = "https://github.com/googleapis/python-pubsub"; changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "fixup_pubsub_v1_keywords.py"; }; } From ec581817caba11e5fd97d68526bb89403a2cf715 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Aug 2024 20:24:27 +0200 Subject: [PATCH 331/481] nixos/wordpress: unpin php81 in check phase --- nixos/modules/services/web-apps/wordpress.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 0d49f2d92998..37c39608edae 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -70,7 +70,7 @@ let require_once(ABSPATH . 'wp-settings.php'); ?> ''; - checkPhase = "${pkgs.php81}/bin/php --syntax-check $target"; + checkPhase = "${pkgs.php}/bin/php --syntax-check $target"; }; mkPhpValue = v: let From 6fe75e3b624e03a2a5fa135cdb939cb9dddee960 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 17:19:28 +0000 Subject: [PATCH 332/481] mdcat: 2.1.2 -> 2.3.0 --- pkgs/tools/text/mdcat/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index a928b74a1518..0361889157ca 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.1.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - hash = "sha256-qdNORp9THxHWR95uVcYtCy59OQqdop1012thZN5i64w="; + hash = "sha256-OgqWlWORLbohok9gJWiVUf0EdFP7Duk0Iw1PiSl4350="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-/avxRvT35LxCBWkTYJDCtdd95VC67epZIPCMv994uBo="; + cargoHash = "sha256-jLKqJQ+T2KaS1bZ6MSQ6l/1iXvfLoyeI68WvO5smuwU="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. @@ -44,12 +44,12 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage $releaseDir/build/mdcat-*/out/mdcat.1 ln -sr $out/bin/{mdcat,mdless} - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for bin in mdcat mdless; do - installShellCompletion \ - --bash $releaseDir/build/mdcat-*/out/completions/$bin.bash \ - --fish $releaseDir/build/mdcat-*/out/completions/$bin.fish \ - --zsh $releaseDir/build/mdcat-*/out/completions/_$bin + installShellCompletion --cmd $bin \ + --bash <($out/bin/$bin --completions bash) \ + --fish <($out/bin/$bin --completions fish) \ + --zsh <($out/bin/$bin --completions zsh) done ''; From 22a6c4f19ddb00ae87aef53479b7fc09ae25960a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 08:58:40 +0000 Subject: [PATCH 333/481] goxel: 0.15.0 -> 0.15.1 --- pkgs/applications/graphics/goxel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 6b6a182542c1..404a42959038 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goxel"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${finalAttrs.version}"; - hash = "sha256-bJnIZwTmvHNHXYq3zsMwu0EORtX2o9lLi6LFNrolwe4="; + hash = "sha256-mNSkQisWL3wXb+IsClWFTMbpeiRC4xteePXNP+GkUnU="; }; nativeBuildInputs = [ scons pkg-config wrapGAppsHook3 ]; From 611196a5b0982efed912541b5ffde7e3c5d7b2cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 18:30:03 +0000 Subject: [PATCH 334/481] python312Packages.jupytext: 1.16.3 -> 1.16.4 --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 77e41807355f..4708b5363141 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.16.3"; + version = "1.16.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HrrJkEYd2fR3/3/uyeMAP6GsyJ88FroBtz95/XbwGpg="; + hash = "sha256-KOM/RvLOekH7nWd6SiyVMnKFV5tkyhBEN8S56x5BdOk="; }; build-system = [ From d3a68be0b3062e900b7a49c507be372516619d6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 20:34:23 +0200 Subject: [PATCH 335/481] python312Packages.hstspreload: 2024.7.1 -> 2024.8.1 Diff: https://github.com/sethmlarson/hstspreload/compare/refs/tags/2024.7.1...2024.8.1 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 5ef5504c84b7..64ed6cba12e9 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.7.1"; + version = "2024.8.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-WCmUYYPx8tJJ1Z3utjS8k6vePx/pZ6OZ+D0YjovqizQ="; + hash = "sha256-zVBwV+pCmZAnTJi8oyTCs9FxUktDFOxctGeB8fZcsfw="; }; build-system = [ setuptools ]; From 9c181bc79394068828a4aefe4ed76e7051cb6278 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 18:39:31 +0000 Subject: [PATCH 336/481] python312Packages.pynitrokey: 0.4.49 -> 0.4.50 --- pkgs/development/python-modules/pynitrokey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index 7f52440f9702..a144da100369 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -30,7 +30,7 @@ let pname = "pynitrokey"; - version = "0.4.49"; + version = "0.4.50"; mainProgram = "nitropy"; in @@ -40,7 +40,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-lYdrqXdB5ATFQZMUIMebpIng26ZuZW3zRnQPXiO+uTY="; + hash = "sha256-BIBwIYxoUcK7E69REcu/qmrpNlyYwnA7Im3iRSsWlnA="; }; propagatedBuildInputs = [ From c11665169be59b57acbf12b137d44430894ce7c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 18:45:13 +0000 Subject: [PATCH 337/481] gnmic: 0.38.0 -> 0.38.1 --- pkgs/applications/networking/gnmic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index b592c1568693..e1b3c5fc46b0 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-sFjr43rHFnhTpOutwgt7yg5wJtpSe2+ShUggb1QVCWE="; + hash = "sha256-Js5l6bVZtnR6uOo2+3L2CAvFj/i0O2FFGEiGOkc2qDQ="; }; - vendorHash = "sha256-+TrSvGbpQSTanf5rm955WE8jj/RlZGtacbBo6JsOW4Y="; + vendorHash = "sha256-4TTxhcP06YuhWWufVTAVK2wTf8mCc3WLAjzFe5wKChY="; ldflags = [ "-s" "-w" From db8489b61878dbccc97f388f03787a7045346c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 3 Aug 2024 20:51:02 +0200 Subject: [PATCH 338/481] netbird: 0.28.4 -> 0.28.7 Diff: https://github.com/netbirdio/netbird/compare/v0.28.4...v0.28.7 Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.28.7 --- pkgs/tools/networking/netbird/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 67d255475ccd..bf054a652c4a 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.28.4"; + version = "0.28.7"; src = fetchFromGitHub { owner = "netbirdio"; - repo = pname; + repo = "netbird"; rev = "v${version}"; - hash = "sha256-U5WCJvy8hM4v+gXYnHd9ilD5cbKkJ0agOdSkUh3snbE="; + hash = "sha256-QeFRkUSf0KsjUHcI8cejt/q05oG+ru3aHn5feFSF5Zs="; }; - vendorHash = "sha256-PrNbmExGuvZQvZBQj8+aIAjCztvV9RZt6b0Q/mdyWDk="; + vendorHash = "sha256-swX3Q+pLOa3D321oHcspDHUWcxt/IT8H2Mrqx3C/MY0="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 27bbf6b21cd76471a77b90815d86f51f417dcb58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 21:09:16 +0200 Subject: [PATCH 339/481] python312Packages.pyexploitdb: 0.2.27 -> 0.2.28 Changelog: https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 3b481d9b2344..9893fa58c2aa 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.27"; + version = "0.2.28"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-XNSTb/vOzesaMCzu5ZLAPFfJ2Nta/hUo/vPbtQJsSd8="; + hash = "sha256-dPDsehNQjPGaBh/+x+4/eq2WcyI5149IAiYduXsh8Vw="; }; build-system = [ setuptools ]; From 6c11488ce029bac37edb62c80362d759da42ee8e Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 3 Aug 2024 13:23:25 -0400 Subject: [PATCH 340/481] Revert "nixos/podman: use given package for dockerCompat" This reverts commit df74ebcabb0252fa5e0a8a5d803d1e9d042ad3fb, which breaks eval when Podman is enabled due to infinite recursion [0] [1]. I take full responsibility for merging this without looking too closely nor running the NixOS test. [0]: https://github.com/NixOS/nixpkgs/commit/df74ebcabb0252fa5e0a8a5d803d1e9d042ad3fb#commitcomment-145003824 [1]: https://github.com/NixOS/nixpkgs/pull/267321#issuecomment-2267076978 --- nixos/modules/virtualisation/podman/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 084981e04bbb..d0f4ac7f66da 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -5,7 +5,7 @@ let inherit (lib) mkOption types; - podmanPackage = (cfg.package.override { + podmanPackage = (pkgs.podman.override { extraPackages = cfg.extraPackages # setuid shadow ++ [ "/run/wrappers" ] From c096cef82f0aeed0641a0ed2cb8b259498e045f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 21:41:31 +0200 Subject: [PATCH 341/481] python312Packages.freenub: init at 0.1.0 Fork of pubnub https://github.com/bdraco/freenub --- .../python-modules/freenub/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/freenub/default.nix diff --git a/pkgs/development/python-modules/freenub/default.nix b/pkgs/development/python-modules/freenub/default.nix new file mode 100644 index 000000000000..fec4d3180bc4 --- /dev/null +++ b/pkgs/development/python-modules/freenub/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + aiohttp, + cbor2, + pycryptodomex, + busypie, + pytest-asyncio, + pytest-vcr, + pytestCheckHook, + requests, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "freenub"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "freenub"; + rev = "refs/tags/v${version}"; + hash = "sha256-UkW/7KUQ4uCu3cxDSL+kw0gjKjs4KnmxRIOLVP4hwyA="; + }; + + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + aiohttp + cbor2 + pycryptodomex + requests + ]; + + nativeCheckInputs = [ + busypie + pytest-asyncio + pytest-vcr + pytestCheckHook + ]; + + pythonImportsCheck = [ "pubnub" ]; + + meta = with lib; { + description = "Fork of pubnub"; + homepage = "https://github.com/bdraco/freenub"; + changelog = "https://github.com/bdraco/freenub/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0fd0de0df609..f22815913e25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4597,6 +4597,8 @@ self: super: with self; { free-proxy = callPackage ../development/python-modules/free-proxy { }; + freenub = callPackage ../development/python-modules/freenub { }; + skia-pathops = callPackage ../development/python-modules/skia-pathops { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL; }; From 0390b75d5b577e86b04b4631f48ac0248cb0522f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Aug 2024 21:42:08 +0200 Subject: [PATCH 342/481] python312Packages.yalexs: 6.4.2 -> 6.4.3 Diff: https://github.com/bdraco/yalexs/compare/refs/tags/v6.4.2...v6.4.3 Changelog: https://github.com/bdraco/yalexs/releases/tag/v6.4.3 --- pkgs/development/python-modules/yalexs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 0dfee73c80a3..ce2f51f08382 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -7,20 +7,20 @@ buildPythonPackage, ciso8601, fetchFromGitHub, - pubnub, + freenub, + poetry-core, pyjwt, pytestCheckHook, python-dateutil, pythonOlder, - requests, requests-mock, - poetry-core, + requests, typing-extensions, }: buildPythonPackage rec { pname = "yalexs"; - version = "6.4.2"; + version = "6.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-0EvQj+aKzpnehvI5IS3DBaJOp4wYpAWwkkaOLgwtdJs="; + hash = "sha256-LfK5xh1MBoWD3/Ae2Hxx0dOFoBkRZUqfudrleXluGzk="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { aiofiles aiohttp ciso8601 - pubnub + freenub pyjwt python-dateutil requests From 7ff715f93ddea6564e1ce5ab36c307fdd6634b17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 19:46:16 +0000 Subject: [PATCH 343/481] python312Packages.glean-parser: 14.3.0 -> 14.5.0 --- pkgs/development/python-modules/glean-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index c36ca579afe9..9fc995c3270a 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "14.3.0"; + version = "14.5.0"; pyproject = true; src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-tI1kMCn7gksLdq2ytKAOiKSd5OxHmsnFrdUsUR6b5IE="; + hash = "sha256-/j96nM3vW1HpfaxFMyumIj1IccjUcK6lySuTiKf5kLA="; }; postPatch = '' From 41d61ab71b8c653ecee7d1be66caa701de55c61f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 19:53:50 +0000 Subject: [PATCH 344/481] juju: 3.5.2 -> 3.5.3 --- pkgs/applications/networking/juju/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index f7339fc20601..915bb54563e4 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "juju"; - version = "3.5.2"; + version = "3.5.3"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-HdV6bRAMQ7LynEGjrFOX36g7+1Zb9AiFtF6O4yu7+NU="; + hash = "sha256-PdNUmPfPYqOYEphY0ZlwEikUV/bKSPOGQuAJsi8+g/E="; }; vendorHash = "sha256-FCN+0Wx2fYQcj5CRgPubAWbGGyVQcSSfu/Om6SUB6TQ="; From f2960856ca93d593787462f24bfad8e3585daa67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 19:58:22 +0000 Subject: [PATCH 345/481] python312Packages.pysolcast: 2.0.5 -> 2.0.6 --- pkgs/development/python-modules/pysolcast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index 84178ddb5b41..db2df1ad97cb 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "2.0.5"; + version = "2.0.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-NssU1RZU5Xc9s6E4nnjYElAGZrE4ER2jSzamrCx/Yng="; + hash = "sha256-x91QVCDPjfC8rCVam/mrc8HP84ONa2/mJtSV64hrilc="; }; pythonRelaxDeps = [ "responses" ]; From 556410f4f8ca36eb56486d67e7467e20ec4d8e84 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 8 Jul 2024 21:16:12 +0200 Subject: [PATCH 346/481] faircamp: 0.14.0 -> 0.15.0 Diff: https://codeberg.org/simonrepp/faircamp/compare/0.14.0...0.15.0 --- pkgs/applications/misc/faircamp/Cargo.lock | 1054 ++++++++++--------- pkgs/applications/misc/faircamp/default.nix | 13 +- 2 files changed, 561 insertions(+), 506 deletions(-) diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock index deeaca6b86be..7f23c9261970 100644 --- a/pkgs/applications/misc/faircamp/Cargo.lock +++ b/pkgs/applications/misc/faircamp/Cargo.lock @@ -4,11 +4,11 @@ version = 3 [[package]] name = "actix-codec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "bytes", "futures-core", "futures-sink", @@ -21,15 +21,15 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212" +checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" dependencies = [ "actix-http", "actix-service", "actix-utils", "actix-web", - "bitflags 2.4.1", + "bitflags 2.5.0", "bytes", "derive_more", "futures-core", @@ -44,17 +44,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" +checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash", - "base64 0.21.7", - "bitflags 2.4.1", + "base64", + "bitflags 2.5.0", "brotli", "bytes", "bytestring", @@ -78,7 +78,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -88,18 +88,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "actix-router" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if", "http", "regex", + "regex-lite", "serde", "tracing", ] @@ -154,9 +156,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.5.1" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -183,6 +185,7 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", @@ -194,21 +197,21 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -221,9 +224,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -232,9 +235,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -245,9 +248,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -299,69 +302,73 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "arbitrary-int" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8e2a586ecd6eb29477a0c25b19742acca4fa5e39c92e127656616810c20579" +checksum = "c84fc003e338a6f69fbd4f7fe9f92b535ff13e9af8997f3b14b6ddff8b1df46d" [[package]] name = "arg_enum_proc_macro" @@ -371,7 +378,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -382,9 +389,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "atomic-polyfill" -version = "0.1.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" dependencies = [ "critical-section", ] @@ -402,9 +409,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "av1-grain" @@ -437,9 +444,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -452,21 +459,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -491,9 +486,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitreader" @@ -506,9 +501,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" [[package]] name = "block-buffer" @@ -520,10 +515,19 @@ dependencies = [ ] [[package]] -name = "brotli" -version = "3.4.0" +name = "block2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -532,9 +536,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -542,21 +546,21 @@ dependencies = [ [[package]] name = "built" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -565,10 +569,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.5.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytestring" @@ -602,12 +612,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -618,9 +629,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -634,9 +645,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -644,7 +655,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -659,9 +670,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", "clap_derive", @@ -669,9 +680,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -681,14 +692,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -720,15 +731,15 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -736,9 +747,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -775,18 +786,33 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "crc" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -799,36 +825,28 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -847,14 +865,31 @@ dependencies = [ ] [[package]] -name = "deranged" -version = "0.3.9" +name = "deflate64" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -870,9 +905,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] name = "digest" @@ -886,16 +921,27 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.9.0" +name = "displaydoc" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "either" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -913,9 +959,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "exr" -version = "1.6.4" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", @@ -929,12 +975,12 @@ dependencies = [ [[package]] name = "faircamp" -version = "0.14.0" +version = "0.15.0" dependencies = [ "actix-files", "actix-web", "alac", - "base64 0.22.0", + "base64", "bincode", "chrono", "clap", @@ -957,6 +1003,7 @@ dependencies = [ "pulldown-cmark", "rmp3", "sanitize-filename", + "seahash", "serde", "serde_derive", "slug", @@ -978,18 +1025,18 @@ dependencies = [ [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] [[package]] name = "fixed" -version = "1.24.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c69ce7e7c0f17aa18fdd9d0de39727adb9c6281f2ad12f57cbe54ae6e76e7d" +checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048" dependencies = [ "az", "bytemuck", @@ -999,9 +1046,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1009,14 +1056,10 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin", ] @@ -1037,27 +1080,27 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-task", @@ -1077,15 +1120,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1100,15 +1141,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1125,9 +1166,9 @@ dependencies = [ [[package]] name = "half" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1153,15 +1194,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heapless" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32", @@ -1178,9 +1219,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1199,11 +1240,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1214,9 +1255,9 @@ checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1243,9 +1284,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1266,11 +1307,11 @@ dependencies = [ [[package]] name = "id3" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f41f7e5ad125c63d55b112a98afb753742fa7f97692bfbbc52544b89e1ff1f" +checksum = "55f4e785f2c700217ee82a1c727c720449421742abd5fcb2f1df04e1244760e9" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "byteorder", "flate2", ] @@ -1310,11 +1351,11 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ - "byteorder", + "byteorder-lite", "thiserror", ] @@ -1326,12 +1367,12 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1357,9 +1398,15 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "iso_country" version = "0.1.4" @@ -1389,9 +1436,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -1417,24 +1464,24 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1470,9 +1517,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libfuzzer-sys" @@ -1514,19 +1561,25 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", ] [[package]] -name = "log" -version = "0.4.20" +name = "lockfree-object-pool" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "loop9" @@ -1538,12 +1591,13 @@ dependencies = [ ] [[package]] -name = "malloc_buf" -version = "0.0.6" +name = "lzma-rs" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" dependencies = [ - "libc", + "byteorder", + "crc", ] [[package]] @@ -1558,28 +1612,18 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "metaflac" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1470d3cc1bb0d692af5eb3afb594330b8ba09fd91c32c4e1c6322172a5ba750" +checksum = "d0f083edae4a21f5acb1fda8220d1c14fa31f725bfd4e21005a14c2d8944db9b" dependencies = [ "byteorder", "hex", - "log", ] [[package]] @@ -1606,9 +1650,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -1616,9 +1660,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -1661,15 +1705,6 @@ dependencies = [ "rand", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - [[package]] name = "ndk-context" version = "0.1.1" @@ -1700,15 +1735,20 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -1728,7 +1768,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1742,11 +1782,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -1754,9 +1793,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1772,19 +1811,44 @@ dependencies = [ ] [[package]] -name = "objc" -version = "0.2.7" +name = "objc-sys" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "malloc_buf", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", ] [[package]] name = "object" -version = "0.32.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -1844,9 +1908,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1854,44 +1918,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] [[package]] @@ -1900,31 +1951,11 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1934,15 +1965,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -1965,9 +1996,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1988,16 +2019,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "pulldown-cmark" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7" +checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "memchr", "pulldown-cmark-escape", "unicase", @@ -2005,9 +2036,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "qoi" @@ -2026,9 +2057,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2113,17 +2144,11 @@ dependencies = [ "rgb", ] -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -2131,9 +2156,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2141,18 +2166,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -2162,9 +2187,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2172,10 +2197,16 @@ dependencies = [ ] [[package]] -name = "regex-syntax" -version = "0.8.2" +name = "regex-lite" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rgb" @@ -2198,9 +2229,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -2213,9 +2244,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2243,36 +2274,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "semver" -version = "1.0.20" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[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.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2281,9 +2318,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2311,22 +2348,11 @@ dependencies = [ "digest", ] -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2367,18 +2393,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2404,9 +2430,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -2427,9 +2453,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2457,29 +2483,29 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -2488,12 +2514,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -2508,10 +2535,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2532,9 +2560,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2551,34 +2579,33 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", @@ -2588,18 +2615,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", @@ -2645,9 +2672,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2657,18 +2684,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -2718,9 +2745,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2734,9 +2761,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2744,24 +2771,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2769,28 +2796,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2798,17 +2825,18 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.13" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ + "block2", "core-foundation", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle", + "objc2", + "objc2-foundation", "url", "web-sys", ] @@ -2819,44 +2847,22 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2877,6 +2883,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -2909,17 +2924,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "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", ] [[package]] @@ -2936,9 +2952,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2954,9 +2970,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2972,9 +2988,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2990,9 +3012,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3008,9 +3030,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3026,9 +3048,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3044,101 +3066,125 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" dependencies = [ "memchr", ] [[package]] name = "zerocopy" -version = "0.7.27" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43de342578a3a14a9314a2dab1942cbfcbe5686e1f91acdc513058063eafe18" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.27" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1012d89e3acb79fad7a799ce96866cfb8098b74638465ea1b1533d35900ca90" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] name = "zip" -version = "0.6.6" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "memchr", "pbkdf2", + "rand", "sha1", + "thiserror", "time", - "zstd 0.11.2+zstd.1.5.2", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" -dependencies = [ - "zstd-safe 7.0.0", + "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-safe" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index b243dccf9734..ac828dc87cc5 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitea +, fetchpatch , makeWrapper , pkg-config , glib @@ -16,16 +17,24 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-gHlm5ZQ5u+gOSBERlg6iYJxGTfs/+L4y2TY+ZOsVYh8="; + hash = "sha256-V8fz65LNNCEhexV+ps3cclc0CJljVlAwBf2KjZCBx88="; }; + patches = [ + # Fix build error in tests + (fetchpatch { + url = "https://codeberg.org/simonrepp/faircamp/commit/7240dd707f3669d49e755088393d27369ca368c2.patch"; + hash = "sha256-Ec75Gte2zUp/q912keLdYXUse60QirTQ+DkSaCwEboQ="; + }) + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { From d9e8ff5a038a3c77e97f2ee0ce4295b2cbaf603d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 21:16:04 +0000 Subject: [PATCH 347/481] buildkit: 0.15.0 -> 0.15.1 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 846ce3297175..807753068b47 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-xJimqvNkz9od5XjpzyKCNUciw8GbfydBDl0Oa45xoME="; + hash = "sha256-RIFRfzvVUI52LK45noaiZQfUjwKEOf04dTaSRsKmHbs="; }; vendorHash = null; From 83a364ced9d5b8a6bdac897bbef6b91e70777b97 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 3 Aug 2024 22:05:14 +0400 Subject: [PATCH 348/481] =?UTF-8?q?josm:=2019128=20=E2=86=92=2019160?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/jo/josm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix index 28486559a11f..48b92f55bec3 100644 --- a/pkgs/by-name/jo/josm/package.nix +++ b/pkgs/by-name/jo/josm/package.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "19128"; + version = "19160"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-ndbU3QQ3EN3ufBT31+i/YsBsOGC8Bd4m2tAbWADD5Rk="; + hash = "sha256-a0Tu0GkXH/MYR5llmVaVcEBvmr50sX4oSsCZSzo5dkE="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; - hash = "sha256-HhvOmlxzKtTt52kQJF8PLh6E/UIBgWpXxhkNeZrsH88="; + hash = "sha256-5sn4Wo4VMIZ79v/FegKrFQ62cngAQLc1luTnvhCO7y8="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From bcbd1535e715a50e2813f48126279eb30f4aa86b Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 30 Jul 2024 11:46:43 -0400 Subject: [PATCH 349/481] emacsPackages.copilot: add aarch64-linux to copilot.el --- .../emacs/elisp-packages/manual-packages/copilot/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index e56d39aa2ce0..2225dff0872d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -37,6 +37,7 @@ melpaBuild { maintainers = with lib.maintainers; [ bbigras ]; platforms = [ "aarch64-darwin" + "aarch64-linux" "x86_64-darwin" "x86_64-linux" "x86_64-windows" From 0942fb51051713a7358a1093f6cb5e7d39f8222c Mon Sep 17 00:00:00 2001 From: Shayon <7rat13@gmail.com> Date: Sun, 4 Aug 2024 02:30:06 +0530 Subject: [PATCH 350/481] screen-pipe: init at 0.1.48 --- pkgs/by-name/sc/screen-pipe/Cargo.lock | 6128 +++++++++++++++++++++++ pkgs/by-name/sc/screen-pipe/package.nix | 88 + 2 files changed, 6216 insertions(+) create mode 100644 pkgs/by-name/sc/screen-pipe/Cargo.lock create mode 100644 pkgs/by-name/sc/screen-pipe/package.nix diff --git a/pkgs/by-name/sc/screen-pipe/Cargo.lock b/pkgs/by-name/sc/screen-pipe/Cargo.lock new file mode 100644 index 000000000000..a7c6d2203ffe --- /dev/null +++ b/pkgs/by-name/sc/screen-pipe/Cargo.lock @@ -0,0 +1,6128 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "alsa" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +dependencies = [ + "alsa-sys", + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "assert_cmd" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc65048dd435533bb1baf2ed9956b9a278fbfdcf90301b39ee117f06c0199d37" +dependencies = [ + "anstyle", + "bstr", + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "assert_fs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "async-trait" +version = "0.1.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core 0.3.4", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 0.1.2", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core 0.4.3", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.72", +] + +[[package]] +name = "bindgen_cuda" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8489af5b7d17a81bffe37e0f4d6e1e4de87c87329d05447f22c35d95a1227d" +dependencies = [ + "glob", + "num_cpus", + "rayon", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[package]] +name = "bitstream-io" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata 0.4.7", + "serde", +] + +[[package]] +name = "built" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "candle-core" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5b18de020c2729dbf7ac390325312644808b6ba9b7962f1f724e9185b1d53c7" +dependencies = [ + "byteorder", + "candle-kernels", + "candle-metal-kernels", + "cudarc", + "gemm", + "half", + "memmap2", + "metal", + "num-traits", + "num_cpus", + "rand", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", +] + +[[package]] +name = "candle-kernels" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bc0a71be8b2f0950b63fd602a5e10a74a4f94a5fd63059ae455e96163389488" +dependencies = [ + "bindgen_cuda", +] + +[[package]] +name = "candle-metal-kernels" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f889aacd02fd999620a0435133d7cf3b58c81ef9dd5e47c38939b7a72345ea86" +dependencies = [ + "metal", + "once_cell", + "thiserror", + "tracing", +] + +[[package]] +name = "candle-nn" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b006b30f66a0d94fc9cef0ac4de6ce510565f35ae2c6c35ce5d4aacfb0fc8eeb" +dependencies = [ + "candle-core", + "candle-metal-kernels", + "half", + "metal", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[package]] +name = "candle-transformers" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0d4eb6a0d9279d5829b06b2bf3caa117904eefd6dcf879d16e687c4a84034c" +dependencies = [ + "byteorder", + "candle-core", + "candle-nn", + "fancy-regex", + "num-traits", + "rand", + "rayon", + "serde", + "serde_json", + "serde_plain", + "tracing", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "console-api" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" +dependencies = [ + "futures-core", + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "prost", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" +version = "0.15.3" +source = "git+https://github.com/louis030195/cpal-d.git?rev=6751589#67515895504eef8217cb2008fb6544fb9012ddc7" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni", + "js-sys", + "libc", + "mach2", + "ndk", + "ndk-context", + "oboe", + "screencapturekit", + "screencapturekit-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.54.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "futures", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cudarc" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56028291ec3b0f6711e2e1b2d597484d359833dcb68331ce89e538012f835c4" +dependencies = [ + "half", + "libloading", +] + +[[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 0.11.1", + "syn 2.0.72", +] + +[[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 2.0.72", +] + +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.72", +] + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +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 2.0.72", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dyn-stack" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "extended" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365" + +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "ffmpeg-next" +version = "7.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19a340e3d664ad5f530147cd6d4a86ece739a829fe2d81c369389ef903bd96f6" +dependencies = [ + "bitflags 2.6.0", + "ffmpeg-sys-next", + "libc", +] + +[[package]] +name = "ffmpeg-sys-next" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db1b7546e70609ead8c06b2b4c618a1ba352364675f81608f431dd4f321fe3f1" +dependencies = [ + "bindgen", + "cc", + "libc", + "num_cpus", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "flate2" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gemm" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", + "sysctl", +] + +[[package]] +name = "gemm-f16" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.3.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.3.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "bytemuck", + "cfg-if", + "crunchy", + "num-traits", + "rand", + "rand_distr", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "base64 0.21.7", + "byteorder", + "flate2", + "nom", + "num-traits", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "futures", + "indicatif", + "log", + "native-tls", + "num_cpus", + "rand", + "reqwest 0.11.27", + "serde", + "serde_json", + "thiserror", + "tokio", + "ureq", +] + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hound" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper 0.14.30", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper 0.14.30", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.7", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "color_quant", + "exr", + "gif", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-compare" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96cd73af13ae2e7220a1c02fe7d6bb53be50612ba7fabbb5c88e7753645f1f3c" +dependencies = [ + "image", + "itertools 0.12.1", + "rayon", + "thiserror", +] + +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "infer" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" +dependencies = [ + "cfb", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +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", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", + "stable_deref_trait", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "monostate" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "bytemuck", + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[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_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +dependencies = [ + "memchr", +] + +[[package]] +name = "oboe" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" +dependencies = [ + "jni", + "ndk", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" +dependencies = [ + "cc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.3", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plotters" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" + +[[package]] +name = "plotters-svg" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "primal-check" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" +dependencies = [ + "num-integer", +] + +[[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", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.72", +] + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost", +] + +[[package]] +name = "pulp" +version = "0.18.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec8d02258294f59e4e223b41ad7e81c874aa6b15bc4ced9ba3965826da0eed5" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5797d09f9bd33604689e87e8380df4951d4912f01b63f71205e2abd4ae25e6b6" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rgb", +] + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "realfft" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571" +dependencies = [ + "rustfft", +] + +[[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 2.1.3", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.52.0", +] + +[[package]] +name = "rgb" +version = "0.8.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rubato" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5d18b486e7d29a408ef3f825bc1327d8f87af091c987ca2f5b734625940e234" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "realfft", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustfft" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" +dependencies = [ + "num-complex", + "num-integer", + "num-traits", + "primal-check", + "strength_reduce", + "transpose", + "version_check", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rusty-tesseract" +version = "1.1.10" +source = "git+https://github.com/louis030195/rusty-tesseract.git?branch=main#08346c1de08d122c7121425abc79081c30dbf778" +dependencies = [ + "dirs", + "image", + "log", + "subprocess", + "substring", + "tempfile", + "thiserror", + "which", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "safetensors" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ced76b22c7fba1162f11a5a75d9d8405264b467a07ae0c9c29be119b9297db9" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "screencapturekit" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5eeeb57ac94960cfe5ff4c402be6585ae4c8d29a2cf41b276048c2e849d64e" +dependencies = [ + "screencapturekit-sys", +] + +[[package]] +name = "screencapturekit-sys" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22411b57f7d49e7fe08025198813ee6fd65e1ee5eff4ebc7880c12c82bde4c60" +dependencies = [ + "block", + "dispatch", + "objc", + "objc-foundation", + "objc_id", + "once_cell", +] + +[[package]] +name = "screenpipe-audio" +version = "0.1.0" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytemuck", + "byteorder", + "candle-core", + "candle-nn", + "candle-transformers", + "chrono", + "clap", + "cpal", + "criterion", + "env_logger", + "hf-hub", + "hound", + "infer", + "lazy_static", + "log", + "rand", + "reqwest 0.12.5", + "rubato", + "screenpipe-core", + "serde", + "serde_json", + "symphonia", + "tempfile", + "tokenizers", + "tokio", + "tracing", + "webrtc-vad", +] + +[[package]] +name = "screenpipe-core" +version = "0.1.0" +dependencies = [ + "anyhow", + "candle-core", + "candle-nn", + "candle-transformers", + "hf-hub", + "log", + "serde", + "serde_json", + "tokenizers", + "which", +] + +[[package]] +name = "screenpipe-server" +version = "0.1.0" +dependencies = [ + "anyhow", + "axum 0.7.5", + "base64 0.21.7", + "byteorder", + "candle-core", + "candle-nn", + "candle-transformers", + "chrono", + "clap", + "colored", + "console-subscriber", + "criterion", + "crossbeam", + "dirs", + "env_logger", + "ffmpeg-next", + "futures", + "hf-hub", + "hyper 1.4.1", + "image", + "lazy_static", + "log", + "num_cpus", + "rand", + "reqwest 0.12.5", + "rubato", + "rusty-tesseract", + "screenpipe-audio", + "screenpipe-core", + "screenpipe-vision", + "serde", + "serde_json", + "sqlx", + "symphonia", + "sysinfo 0.29.11", + "tempfile", + "threadpool", + "tokenizers", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "screenpipe-vision" +version = "0.1.0" +dependencies = [ + "anyhow", + "assert_cmd", + "assert_fs", + "base64 0.21.7", + "byteorder", + "candle-core", + "candle-nn", + "candle-transformers", + "chrono", + "clap", + "criterion", + "hf-hub", + "image", + "image-compare", + "lazy_static", + "log", + "num_cpus", + "predicates", + "rand", + "reqwest 0.11.27", + "rusty-tesseract", + "serde", + "serde_json", + "strsim 0.10.0", + "tempfile", + "threadpool", + "tokenizers", + "tokio", + "xcap", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] +name = "serde" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "serde_json" +version = "1.0.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "sqlformat" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" +dependencies = [ + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.3.0", + "log", + "memchr", + "native-tls", + "once_cell", + "paste", + "percent-encoding", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +dependencies = [ + "dotenvy", + "either", + "heck 0.4.1", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.6.0", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.6.0", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "urlencoding", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subprocess" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "symphonia" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" +dependencies = [ + "lazy_static", + "symphonia-bundle-flac", + "symphonia-codec-aac", + "symphonia-codec-adpcm", + "symphonia-codec-pcm", + "symphonia-codec-vorbis", + "symphonia-core", + "symphonia-format-isomp4", + "symphonia-format-mkv", + "symphonia-format-ogg", + "symphonia-format-riff", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-bundle-flac" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e34f34298a7308d4397a6c7fbf5b84c5d491231ce3dd379707ba673ab3bd97" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-codec-aac" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdbf25b545ad0d3ee3e891ea643ad115aff4ca92f6aec472086b957a58522f70" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-adpcm" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94e1feac3327cd616e973d5be69ad36b3945f16b06f19c6773fc3ac0b426a0f" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-pcm" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f395a67057c2ebc5e84d7bb1be71cce1a7ba99f64e0f0f0e303a03f79116f89b" +dependencies = [ + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-codec-vorbis" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30" +dependencies = [ + "log", + "symphonia-core", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-core" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "bytemuck", + "lazy_static", + "log", + "rustfft", +] + +[[package]] +name = "symphonia-format-isomp4" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfdf178d697e50ce1e5d9b982ba1b94c47218e03ec35022d9f0e071a16dc844" +dependencies = [ + "encoding_rs", + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-mkv" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb43471a100f7882dc9937395bd5ebee8329298e766250b15b3875652fe3d6f" +dependencies = [ + "lazy_static", + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-ogg" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931" +dependencies = [ + "log", + "symphonia-core", + "symphonia-metadata", + "symphonia-utils-xiph", +] + +[[package]] +name = "symphonia-format-riff" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f7be232f962f937f4b7115cbe62c330929345434c834359425e043bfd15f50" +dependencies = [ + "extended", + "log", + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "symphonia-metadata" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" +dependencies = [ + "encoding_rs", + "lazy_static", + "log", + "symphonia-core", +] + +[[package]] +name = "symphonia-utils-xiph" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe" +dependencies = [ + "symphonia-core", + "symphonia-metadata", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.6.0", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + +[[package]] +name = "sysinfo" +version = "0.29.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "sysinfo" +version = "0.30.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows 0.52.0", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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 = "tokenizers" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e500fad1dd3af3d626327e6a3fe5050e664a6eaa4708b8ca92f1794aaf73e6fd" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "indicatif", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.8.4", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "tokio" +version = "1.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.3.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.3.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", +] + +[[package]] +name = "tonic" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.6.20", + "base64 0.21.7", + "bytes", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.30", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "transpose" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" +dependencies = [ + "num-integer", + "strength_reduce", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[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" +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", +] + +[[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" + +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.72", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "webrtc-vad" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a1e40fd6ca90be95459152a2537f2ba4286ee1b13073f7ebcaa74fc94e3008" +dependencies = [ + "cc", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "which" +version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" +dependencies = [ + "either", + "home", + "rustix", + "winsafe", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "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]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "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.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + +[[package]] +name = "xcap" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a462fc23e8aab59b6dbd7d717999d4589374ef94142005143e40740187847ccb" +dependencies = [ + "core-foundation", + "core-graphics", + "dbus", + "image", + "log", + "percent-encoding", + "sysinfo 0.30.13", + "thiserror", + "windows 0.54.0", + "xcb", +] + +[[package]] +name = "xcb" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e75181b5a62b6eeaa72f303d3cef7dbb841e22885bf6d3e66fe23e88c55dc6" +dependencies = [ + "bitflags 1.3.2", + "libc", + "quick-xml", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zip" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "indexmap 2.3.0", + "num_enum", + "thiserror", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix new file mode 100644 index 000000000000..b851c49a5808 --- /dev/null +++ b/pkgs/by-name/sc/screen-pipe/package.nix @@ -0,0 +1,88 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + dbus, + ffmpeg, + oniguruma, + openssl, + sqlite, + stdenv, + darwin, + alsa-lib, + xorg, +}: +rustPlatform.buildRustPackage rec { + pname = "screen-pipe"; + version = "0.1.48"; + + src = fetchFromGitHub { + owner = "louis030195"; + repo = "screen-pipe"; + rev = "v${version}"; + hash = "sha256-rWKRCqWFuPO84C52mMrrS4euD6XdJU8kqZsAz28+vWE="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "cpal-0.15.3" = "sha256-eKn3tS5QuqbMTwnRAEybvbPZOiKiid7ghGztAmrs9fw="; + "rusty-tesseract-1.1.10" = "sha256-XT74zGn+DetEBUujHm4Soe2iorQcIoUeZbscTv+64hw="; + }; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = + [ + dbus + ffmpeg + oniguruma + openssl + sqlite + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk_12_3.frameworks; + [ + CoreAudio + AudioUnit + CoreFoundation + CoreGraphics + CoreMedia + IOKit + Metal + MetalPerformanceShaders + Security + ScreenCaptureKit + SystemConfiguration + ] + ) + ++ lib.optionals stdenv.isLinux [ + alsa-lib + xorg.libxcb + ]; + + buildFeatures = lib.optional stdenv.isDarwin "metal"; + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; + + doCheck = false; # Tests fail to build + + meta = with lib; { + description = "Personalized AI powered by what you've seen, said, or heard"; + homepage = "https://github.com/louis030195/screen-pipe"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + mainProgram = "screen-pipe"; + }; +} From 5a628e6349afe0e9843463418a3585cbfe85023e Mon Sep 17 00:00:00 2001 From: DariusChit Date: Sat, 3 Aug 2024 15:50:42 +0100 Subject: [PATCH 351/481] tmux: add patch for hanging on shutdown --- pkgs/tools/misc/tmux/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index aa72ecb5d980..af381a062259 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -54,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch"; hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4="; }) + # https://github.com/tmux/tmux/issues/3905 + # fix tmux hanging on shutdown + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/3823fa2c577d440649a84af660e4d3b0c095d248.patch"; + hash = "sha256-FZDy/ZgVdwUAam8g5SfGBSnMhp2nlHHfrO9eJNIhVPo="; + }) ]; nativeBuildInputs = [ From f97a1c5460c3ac4286f68681054986166edc284c Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 3 Aug 2024 09:25:06 -0500 Subject: [PATCH 352/481] python312Packages.tree-sitter0_21: remove Python 3.12 limit distutils was removed from the standard library in Python 3.12, but it is required to propagate to tree-sitter0_21's dependent applications. Removing the limitation on the package and adding distutils to the dependencies allows this library to be useful in Python 3.12. --- .../python-modules/tree-sitter0_21/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tree-sitter0_21/default.nix b/pkgs/development/python-modules/tree-sitter0_21/default.nix index 665f7d6b56ce..2e0dde0da3a6 100644 --- a/pkgs/development/python-modules/tree-sitter0_21/default.nix +++ b/pkgs/development/python-modules/tree-sitter0_21/default.nix @@ -6,6 +6,7 @@ pythonOlder, pythonAtLeast, setuptools, + distutils, }: buildPythonPackage rec { @@ -13,8 +14,7 @@ buildPythonPackage rec { version = "0.21.3"; pyproject = true; - # https://github.com/tree-sitter/py-tree-sitter/issues/209 - disabled = pythonAtLeast "3.12" || pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tree-sitter"; @@ -30,6 +30,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "tree_sitter" ]; + # Needed explicitly for Python >= 3.12 as tree-sitter provides + # calls to distutils functions to compile language files + dependencies = lib.optionals (pythonAtLeast "3.12") [ distutils ]; + preCheck = '' rm -r tree_sitter ''; From ebf0719c6599e22fe2f3153d7c1c7985e920fe75 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 3 Aug 2024 09:31:43 -0500 Subject: [PATCH 353/481] python312Packages.grep-ast: init at 0.3.3 --- .../python-modules/grep-ast/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/grep-ast/default.nix diff --git a/pkgs/development/python-modules/grep-ast/default.nix b/pkgs/development/python-modules/grep-ast/default.nix new file mode 100644 index 000000000000..01d164bacdc1 --- /dev/null +++ b/pkgs/development/python-modules/grep-ast/default.nix @@ -0,0 +1,41 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + + pathspec, + pytestCheckHook, + setuptools, + tree-sitter-languages, +}: + +buildPythonPackage rec { + pname = "grep-ast"; + version = "0.3.3"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "grep_ast"; + hash = "sha256-QriIfVcwHcVWNDaPjVSenEnJE9r7TRnJtUw922BPzPQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pathspec + tree-sitter-languages + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "grep_ast" ]; + + meta = { + homepage = "https://github.com/paul-gauthier/grep-ast"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ greg ]; + description = "Python implementation of the ast-grep tool"; + mainProgram = "grep-ast"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0fd0de0df609..5d724731d9e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5295,6 +5295,8 @@ self: super: with self; { gremlinpython = callPackage ../development/python-modules/gremlinpython { }; + grep-ast = callPackage ../development/python-modules/grep-ast { }; + greynoise = callPackage ../development/python-modules/greynoise { }; growattserver = callPackage ../development/python-modules/growattserver { }; From fb7bc79ff0bb865dacfcce3c41a8bd2f680abd4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:12:43 +0000 Subject: [PATCH 354/481] lazysql: 0.2.3 -> 0.2.4 --- pkgs/by-name/la/lazysql/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index f2b56f110045..74f29f92d8ca 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lazysql"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-7aHzqgRtJvGueCmB87uJkFgkphfPj/owAz0Q2o3OU88="; + hash = "sha256-Pzx9wjuPv7k0q+ads/uKrRTEAZbktf4ciyD7KZjYGwQ="; }; - vendorHash = "sha256-tgD6qoCVC1ox15VPJWVvhe4yg3R81ktMuW2dsaU69rY="; + vendorHash = "sha256-hYkSdFmzljhjsh2stXWGDLHwB4NXeKQyjiN2DqG0GRg="; buildInputs = lib.optionals stdenv.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; From 7f371084569d913709eddc925478b75cc50cb0a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:16:44 +0000 Subject: [PATCH 355/481] shadowsocks-rust: 1.20.2 -> 1.20.3 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index f6c17a6b2bdc..7a82ea8ac524 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-sfGt68XpezLKTRlnhjUTive83SA3aXF6uNLwmTCG3tU="; + hash = "sha256-TVD6yI/I6R2sZGdyE0JsbuN9u5e23MRQCsKpi85JEGM="; }; - cargoHash = "sha256-p1mPLJIEc3wSfweQfRrlnvAN0t7Ag7d+dxkGUP886Rs="; + cargoHash = "sha256-4OXue0KsGxc0EOLRTdr9uTA5t1dl09YJKvavezJ/mxM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 57b468e8942e36ca899038a41f70079849a9c99b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:25:50 +0000 Subject: [PATCH 356/481] pscale: 0.205.0 -> 0.207.0 --- pkgs/development/tools/pscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index b55afd185264..3a4ed97102d5 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pscale"; - version = "0.205.0"; + version = "0.207.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-CRSwB2r0be8K2c5W9dzxuBHL5cELtpl4jmxngoi4nvo="; + sha256 = "sha256-T01Vo8W21Gu2e7W87LFM/7NGsqHgWt+L4mXmPAEyB70="; }; vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40="; From 6cb21508562f3179e99c95c34c4c68038421ccf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:34:03 +0000 Subject: [PATCH 357/481] openvas-scanner: 23.6.0 -> 23.8.2 --- pkgs/by-name/op/openvas-scanner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index a554b6403dff..baba85269424 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.6.0"; + version = "23.8.2"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-VIjkrlE39eq8a7Kgj4QZSZ5R9bAnw0oodUc8m/4bSCQ="; + hash = "sha256-sHu6GF+T5Ce2aiGccv9uM+KdAWCLB8CCXujxgxhg4Ho="; }; nativeBuildInputs = [ From 5063b5d93bf9eff34e488791bc816375f478c838 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:35:00 +0000 Subject: [PATCH 358/481] r0vm: 1.0.3 -> 1.0.5 --- pkgs/by-name/r0/r0vm/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index 5cdc11b87b4d..77f856dcb764 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -10,12 +10,12 @@ }: rustPlatform.buildRustPackage rec { pname = "r0vm"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "risc0"; repo = "risc0"; rev = "v${version}"; - sha256 = "sha256-shlu6X2JzFU8xCo6yXSHZUxe+XAvzfwuQrWv/ck1a3E="; + sha256 = "sha256-jtROtI5/4W2pNvn1ZYR/wQAZmECTr7YxuZGu2Ns9paw="; }; buildAndTestSubdir = "risc0/r0vm"; @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec { doCheck = false; - cargoHash = "sha256-xFiCNskX2zsAmqM604rg5oko4owWZYMY6jNNrJH5kJ8="; + cargoHash = "sha256-WLd/cUiaIR04CIOaf9JwFmAY4fU9yH2QHDuT3Q54Gvg="; postPatch = let - # see https://github.com/risc0/risc0/blob/v1.0.3/risc0/circuit/recursion/build.rs + # see https://github.com/risc0/risc0/blob/v1.0.5/risc0/circuit/recursion/build.rs sha256Hash = "4e8496469e1efa00efb3630d261abf345e6b2905fb64b4f3a297be88ebdf83d2"; recursionZkr = fetchurl { name = "recursion_zkr.zip"; From d03ec73e86e5262c12dbf264a95aacea8597f955 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:41:26 +0000 Subject: [PATCH 359/481] kyverno-chainsaw: 0.2.7 -> 0.2.8 --- pkgs/by-name/ky/kyverno-chainsaw/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index f7035840d813..059997ff15bd 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-Ft3xWXUu57DHKTDyvtIvYExauP/La0xWu2rjbpcvxzM="; + hash = "sha256-elszVinOGL4IbMNK3RTtzJPRRqs7qgqITQqj0g/wyk8="; }; - vendorHash = "sha256-ilQOf1GMVmf9FhwfMuK+eGFOnqmL+kW/ma+/KaTWqc4="; + vendorHash = "sha256-HDmnI+WVv4cUia+IXrBdFBFnrxKMSFjKD6LUZ393sqs="; ldflags = [ "-s" From 4bc97676080706585de8cdefc3da32f574dc2306 Mon Sep 17 00:00:00 2001 From: Semnodime Date: Thu, 1 Aug 2024 18:48:50 +0200 Subject: [PATCH 360/481] jpexs: 18.4.1 -> 20.1.0 --- pkgs/development/tools/jpexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix index f9ba57b10e8b..f5c3bf79842c 100644 --- a/pkgs/development/tools/jpexs/default.nix +++ b/pkgs/development/tools/jpexs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jpexs"; - version = "18.4.1"; + version = "20.1.0"; src = fetchzip { url = "https://github.com/jindrapetrik/jpexs-decompiler/releases/download/version${version}/ffdec_${version}.zip"; - sha256 = "sha256-aaEL3xJZkFw78zo3IyauWJM9kOo0rJTUSKmWsv9xQZ8="; + hash = "sha256-ytGtylhyNSdKfuPclZRJasOb/cskW65hMd4NM/q+/Ko="; stripRoot = false; }; From 888d768d2b28e570e3b878014cf1ee96170fcd39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:50:35 +0000 Subject: [PATCH 361/481] fflogs: 8.6.0 -> 8.12.0 --- pkgs/by-name/ff/fflogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 7b5f8849c800..ebc5bdbb3c37 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.6.0"; + version = "8.12.0"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-fJOZHvnGOB+b67w2F8kJ+1hogc0DTmtujvNw3W8WWSU="; + hash = "sha256-2hpCcA/RN7fpNhaqMAyVC4d1fTRhp+lwYf/Wc0FjXxI="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in From 8981a04d4e5156d3306ca5d2e69a7e9ddff76aa9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 3 Aug 2024 09:17:26 +1000 Subject: [PATCH 362/481] buildbot: 4.0.1 -> 4.0.2 Changelog: https://github.com/buildbot/buildbot/releases/tag/v4.0.2 --- .../buildbot/master.nix | 4 ++-- .../buildbot/plugins.nix | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 4e3fc2581c9f..d0a2efb32b57 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -71,7 +71,7 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "4.0.1"; + version = "4.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -80,7 +80,7 @@ buildPythonApplication rec { owner = "buildbot"; repo = "buildbot"; rev = "v${version}"; - hash = "sha256-xvXPVHbDpYZidZsMXHQPW9rPQomZ2xJ2YS964h44YEs="; + hash = "sha256-0ctOInVRJqjmcqy67PTriRmqo3fz1qMEVV+K5lXvZ6k="; }; build-system = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 2f8d2b1441b1..530b46d26337 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-AXQR0TMv6Zb49hyHvbNSTTQ4qff8uc2YI+0iH0jMoKs="; + hash = "sha256-TU5/0KQQbNDpxuntIwQvxGp/7PvBb+iMiAOJA3EAAAA="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-/fOHFuHaAs2DjM24aBPOVOGutiZVCRinA7FnKCXrm30="; + hash = "sha256-EtG4vlsoyIDcfKWvkL7ei/BGVItF5wkWPhq4aHfmJ24="; }; # Remove unnecessary circular dependency on buildbot @@ -62,7 +62,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-iKZLYuLxSOWUmWP+N1bzZqVPcp967iKMXNq4rDlKuUY="; + hash = "sha256-gNei1LZXV7G+8u0AtNDSsj98LprsbyIFR94N4+AXO54="; }; buildInputs = [ buildbot-pkg ]; @@ -84,7 +84,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-38CZiz4EPbL/PlfwbPQkh7ybhb3gNlDUHlc7ZYn1YyE="; + hash = "sha256-CJ14Se4Wlpb7jt5u1VVmd0MnUdO2l7KfQyVQbO7hMhA="; }; buildInputs = [ buildbot-pkg ]; @@ -106,7 +106,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-D+DJZ7pY5cvHaLCfP1o+5VBMEEm8/xV0PT0TEUJQlMA="; + hash = "sha256-lY8ljjGaZ0i7aY1rR//7M7H83ZTSQj9CnTafWXner94="; }; buildInputs = [ buildbot-pkg ]; @@ -128,7 +128,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Cczw4aKWv58C6EnRc+EBwREbWgtEFYTGFE5Y7+U8Nwg="; + hash = "sha256-XZAInGgM/hm4Rxk0usH0NRiCuq19XJeYuwJNF2gtn3M="; }; buildInputs = [ buildbot-pkg ]; @@ -150,7 +150,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-yUqVSfVy7K70pxK9n4RTMZQolvKzwWKBRYGEWI6TGxg="; + hash = "sha256-RRdHvlm+98Cu+qiIhDMx6W65bQ30ULTKZrz05Xm32gg="; }; buildInputs = [ buildbot-pkg ]; @@ -172,7 +172,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-7p7TZb+VVYcrEUedi6TPWtQaE9QHDyXbt/O5B+ZITjg="; + hash = "sha256-sg/40zP3YMF8e3GsL+A9gtCUlhoqKqHNeFUycQrQNJc="; }; buildInputs = [ buildbot-pkg ]; @@ -194,7 +194,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-dt88qBbnsAP2gVYiWVuOtWC0U/Nt5aZvIJKXPuFwq8A="; + hash = "sha256-pE6wDMLYGtDgaRjqv/SS9bm6F58molO9oQI3XklcWfg="; }; buildInputs = [ buildbot-pkg ]; @@ -216,7 +216,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-1FSjuEVI7HiTykWqSzPredg1McTQ/Da7SS48TkAT4Pk="; + hash = "sha256-ZgnfiQtKCs1Ui9KiUMaSbtaMnCgSgH+IzJTXWYcG/fE="; }; buildInputs = [ buildbot-pkg ]; @@ -238,7 +238,7 @@ src = fetchurl { url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-T3jRrg8w2yfPNIKIScyM1nW3A6wfv0ujrirhK7wdE5c="; + hash = "sha256-yxbLY3LiT0qmRiz7+/F/TuODiSnteq0891fxAGSU7yY="; }; buildInputs = [ buildbot-pkg ]; From c2c0aa3fbae2a46a685970cfcc687332300a29b1 Mon Sep 17 00:00:00 2001 From: redyf Date: Sat, 3 Aug 2024 20:36:50 -0300 Subject: [PATCH 363/481] gleam: 1.3.2 -> 1.4.0 https://github.com/gleam-lang/gleam/releases/tag/v1.4.0 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 234bc86ba318..9b01c1c74613 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ncb95NjBH/Nk4XP2QIq66TgY1F7UaOaRIEvZchdo5Kw="; + hash = "sha256-Wo8J8cv53kNWypb5VqUlKJas+zkCHZS6mICnpn0aZoc="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-6fbQOvmXWsU+6QiEHMNsbwuaIH9j0wzp0sNR7W8sBAE="; + cargoHash = "sha256-ehQLNBDERLIZrqQfsS+epzZAIjap7HnBs18SsjdWuS4="; passthru.updateScript = nix-update-script { }; From e17a38ddc27fc9c7a81b986c5866f83238d8b23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20J=C3=B6ns?= <34899572+jopejoe1@users.noreply.github.com> Date: Sun, 4 Aug 2024 01:37:16 +0200 Subject: [PATCH 364/481] discord: updates (#332018) * discord: 0.0.61 -> 0.0.62 * discord-ptb: 0.0.95 -> 0.0.98 * discord-canary: 0.0.455 -> 0.0.465 * pkgsCross.aarch64-darwin.discord: 0.0.311 -> 0.0.313 * pkgsCross.aarch64-darwin.discord-ptb: 0.0.124 -> 0.0.127 * pkgsCross.aarch64-darwin.discord-canary: 0.0.562 -> 0.0.574 --- .../instant-messengers/discord/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6826a5f834bc..270b26d336f0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,14 +2,14 @@ let versions = if stdenv.isLinux then { - stable = "0.0.61"; - ptb = "0.0.95"; - canary = "0.0.455"; + stable = "0.0.62"; + ptb = "0.0.98"; + canary = "0.0.465"; development = "0.0.24"; } else { - stable = "0.0.311"; - ptb = "0.0.124"; - canary = "0.0.562"; + stable = "0.0.313"; + ptb = "0.0.127"; + canary = "0.0.574"; development = "0.0.45"; }; version = versions.${branch}; @@ -17,15 +17,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-jJapVZ67nqLSNhti7LkfsGNV3JzglZjQkHhTwJvPO98="; + hash = "sha256-gtoTcTcZYJdclEqi1BcxlhVJqU2POdk7XpDq7Dt5YMg="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-AtGfukiFT07i655wW4/9p6NHkjtgHlE9rSp6owXhT5k="; + hash = "sha256-aJx5ruZRCnBTf/Qon1uFfxMX2a25Xg2AzbnN/UtDe8w="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-SDw0LaRIOq/sd7Qz9XZMikuMkau/lFrCtKv6MBvhzWs="; + hash = "sha256-h4ULLPRhtGy6FZHKfj3AF0hjPhidVvJEbHOVgCh+6JQ="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -35,15 +35,15 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-k/PEywycex/3Z+QRgM13vGoIf33vSeaZPbBwdETPsvE="; + hash = "sha256-eQLPtwSX24+DOxvQcS2tFOMI6HNYedycl/U5GnzR6w0="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-6OVcvDo4fTpuT/dq8zphSITwuw4DMdFNCnCdi7wqvpQ="; + hash = "sha256-Z2b4I8WzBaubb5oGEGpqC6VlVvObyQwKOH+mxCPMuMw="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-MxV2RZkDbio78Od8lEvJHEoKEN4xxSSie8QuviCUjSk="; + hash = "sha256-ZKjZf716RPOcXkZEFzvb4ojafafccVpjlLoEZv/GGec="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 3c9f8e5c83b7ef8a3f9ed51789e10c43ef6cc8bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 23:54:07 +0000 Subject: [PATCH 365/481] python312Packages.htmltools: 0.5.2 -> 0.5.3 --- pkgs/development/python-modules/htmltools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/htmltools/default.nix b/pkgs/development/python-modules/htmltools/default.nix index a1764a06407b..f7375cab0b77 100644 --- a/pkgs/development/python-modules/htmltools/default.nix +++ b/pkgs/development/python-modules/htmltools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "htmltools"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "posit-dev"; repo = "py-htmltools"; rev = "refs/tags/v${version}"; - hash = "sha256-H0M9dY8CNQAMEGEGHhPIWEYRmk4omCuVFgJUg8ef8Zw="; + hash = "sha256-+BSbJdWmqoEQGEJWBgoTVe4bbvlGJiMyfvvj0lAy9ZA="; }; build-system = [ From 89c64de2a8938777d3d5092d6b1ca4b045ef2590 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 23:56:45 +0000 Subject: [PATCH 366/481] python312Packages.reolink-aio: 0.9.5 -> 0.9.6 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 897e4fd21b08..4aad6212e6de 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.5"; + version = "0.9.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-qwVrC3ZbnbQeyaLSRcrceeDSkYlB3AAywRa8eIOL2ls="; + hash = "sha256-/W0X5lFcVNp2qj8GX5mIZ5ucRlkcKHY+ESrM0gc5FYA="; }; build-system = [ setuptools ]; From 2f96b1f722d97338591ff4a673ba4cc70efbbd50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 23:57:36 +0000 Subject: [PATCH 367/481] codux: 15.30.0 -> 15.32.0 --- pkgs/by-name/co/codux/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index 89cec09f24b3..3109ad9885fd 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.30.0"; + version = "15.32.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-TMtZq58UswbhMgY3FCqVuZaSQ8b4mBYA9wEykMXF9Kc="; + sha256 = "sha256-Uk7QUbcYqbWgu6pKs4iiRwPJASZTDmN1Kv338ZKJQgk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 90928184b6cafe9cf1c13ada7355c28ecc517633 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 00:14:09 +0000 Subject: [PATCH 368/481] wasm-tools: 1.214.0 -> 1.215.0 --- pkgs/tools/misc/wasm-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index f0ec6169ca57..aada6a3e1fb1 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.214.0"; + version = "1.215.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-YVb1SXwksmhvK6FqsKoT9SB6CglcW6A2/Zt6GXvioF4="; + hash = "sha256-a6r1GQ5p1JHk/4Aprg6ZhxBgJzRSsDvDDFru64o3uBU="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-Mdjsng49/LdNzxZMz5py0thHQ8e786uKuI63rPor3g0="; + cargoHash = "sha256-VKhTDl1M8aQKqdpGSEhhfKJhSsnD256/XCCkIPeUMPc="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; From 5d8832101e4c61b177b1a222ed912cd89387cae9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 00:17:21 +0000 Subject: [PATCH 369/481] intel-compute-runtime: 24.22.29735.20 -> 24.26.30049.6 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 331e69c84bd0..3531a0da94fa 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.22.29735.20"; + version = "24.26.30049.6"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-M+buuVTd0w1Js6eDKln+LFhQgeNU4KCbN6vK8PyUdG8="; + hash = "sha256-VZGHVATA6B/+WB541tsnY3lVi526p7+Rd7cSGpNICLU="; }; nativeBuildInputs = [ cmake pkg-config ]; From b747b8cf8e8193f263f8ce152448c73d01e0fd5d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 3 Aug 2024 17:18:40 -0700 Subject: [PATCH 370/481] {gfortran{,48,49},gfortran{6..14}}: move to by-name --- pkgs/by-name/gf/gfortran/package.nix | 11 +++ pkgs/by-name/gf/gfortran10/package.nix | 10 +++ pkgs/by-name/gf/gfortran11/package.nix | 10 +++ pkgs/by-name/gf/gfortran12/package.nix | 10 +++ pkgs/by-name/gf/gfortran13/package.nix | 10 +++ pkgs/by-name/gf/gfortran14/package.nix | 10 +++ pkgs/by-name/gf/gfortran48/package.nix | 10 +++ pkgs/by-name/gf/gfortran49/package.nix | 10 +++ pkgs/by-name/gf/gfortran6/package.nix | 10 +++ pkgs/by-name/gf/gfortran7/package.nix | 10 +++ pkgs/by-name/gf/gfortran8/package.nix | 10 +++ pkgs/by-name/gf/gfortran9/package.nix | 10 +++ pkgs/top-level/all-packages.nix | 97 -------------------------- 13 files changed, 121 insertions(+), 97 deletions(-) create mode 100644 pkgs/by-name/gf/gfortran/package.nix create mode 100644 pkgs/by-name/gf/gfortran10/package.nix create mode 100644 pkgs/by-name/gf/gfortran11/package.nix create mode 100644 pkgs/by-name/gf/gfortran12/package.nix create mode 100644 pkgs/by-name/gf/gfortran13/package.nix create mode 100644 pkgs/by-name/gf/gfortran14/package.nix create mode 100644 pkgs/by-name/gf/gfortran48/package.nix create mode 100644 pkgs/by-name/gf/gfortran49/package.nix create mode 100644 pkgs/by-name/gf/gfortran6/package.nix create mode 100644 pkgs/by-name/gf/gfortran7/package.nix create mode 100644 pkgs/by-name/gf/gfortran8/package.nix create mode 100644 pkgs/by-name/gf/gfortran9/package.nix diff --git a/pkgs/by-name/gf/gfortran/package.nix b/pkgs/by-name/gf/gfortran/package.nix new file mode 100644 index 000000000000..93b8c5a4906d --- /dev/null +++ b/pkgs/by-name/gf/gfortran/package.nix @@ -0,0 +1,11 @@ +{ wrapCC, gcc }: +# Use the same GCC version as the one from stdenv by default +wrapCC ( + gcc.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran10/package.nix b/pkgs/by-name/gf/gfortran10/package.nix new file mode 100644 index 000000000000..9cd90cd6f3b8 --- /dev/null +++ b/pkgs/by-name/gf/gfortran10/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc10 }: +wrapCC ( + gcc10.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran11/package.nix b/pkgs/by-name/gf/gfortran11/package.nix new file mode 100644 index 000000000000..d27a264fc529 --- /dev/null +++ b/pkgs/by-name/gf/gfortran11/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc11 }: +wrapCC ( + gcc11.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran12/package.nix b/pkgs/by-name/gf/gfortran12/package.nix new file mode 100644 index 000000000000..95280bb8761b --- /dev/null +++ b/pkgs/by-name/gf/gfortran12/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc12 }: +wrapCC ( + gcc12.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran13/package.nix b/pkgs/by-name/gf/gfortran13/package.nix new file mode 100644 index 000000000000..71afda9d70f7 --- /dev/null +++ b/pkgs/by-name/gf/gfortran13/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc13 }: +wrapCC ( + gcc13.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran14/package.nix b/pkgs/by-name/gf/gfortran14/package.nix new file mode 100644 index 000000000000..a77d10196e48 --- /dev/null +++ b/pkgs/by-name/gf/gfortran14/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc14 }: +wrapCC ( + gcc14.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran48/package.nix b/pkgs/by-name/gf/gfortran48/package.nix new file mode 100644 index 000000000000..e31c9d0c6ebd --- /dev/null +++ b/pkgs/by-name/gf/gfortran48/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc48 }: +wrapCC ( + gcc48.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran49/package.nix b/pkgs/by-name/gf/gfortran49/package.nix new file mode 100644 index 000000000000..8016f9ff42ba --- /dev/null +++ b/pkgs/by-name/gf/gfortran49/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc49 }: +wrapCC ( + gcc49.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran6/package.nix b/pkgs/by-name/gf/gfortran6/package.nix new file mode 100644 index 000000000000..c6a91e99bf54 --- /dev/null +++ b/pkgs/by-name/gf/gfortran6/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc6 }: +wrapCC ( + gcc6.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran7/package.nix b/pkgs/by-name/gf/gfortran7/package.nix new file mode 100644 index 000000000000..311b7e6b90a7 --- /dev/null +++ b/pkgs/by-name/gf/gfortran7/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc7 }: +wrapCC ( + gcc7.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran8/package.nix b/pkgs/by-name/gf/gfortran8/package.nix new file mode 100644 index 000000000000..0d0e03c7bb0b --- /dev/null +++ b/pkgs/by-name/gf/gfortran8/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc8 }: +wrapCC ( + gcc8.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/by-name/gf/gfortran9/package.nix b/pkgs/by-name/gf/gfortran9/package.nix new file mode 100644 index 000000000000..9fce86338bcd --- /dev/null +++ b/pkgs/by-name/gf/gfortran9/package.nix @@ -0,0 +1,10 @@ +{ wrapCC, gcc9 }: +wrapCC ( + gcc9.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea869ed21a37..8788bc2e96ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15220,103 +15220,6 @@ with pkgs; gcc_latest = gcc14; - # Use the same GCC version as the one from stdenv by default - gfortran = wrapCC (gcc.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran48 = wrapCC (gcc48.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran49 = wrapCC (gcc49.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran6 = wrapCC (gcc6.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran7 = wrapCC (gcc7.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran8 = wrapCC (gcc8.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran9 = wrapCC (gcc9.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran10 = wrapCC (gcc10.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran11 = wrapCC (gcc11.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran12 = wrapCC (gcc12.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran13 = wrapCC (gcc13.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - - gfortran14 = wrapCC (gcc14.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; From 311fada2d68a3f443d470ec6dafa002de9cd889d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 00:18:54 +0000 Subject: [PATCH 371/481] junest: 7.4.8 -> 7.4.9 --- pkgs/by-name/ju/junest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ju/junest/package.nix b/pkgs/by-name/ju/junest/package.nix index a74a9815a81c..2890f345964b 100644 --- a/pkgs/by-name/ju/junest/package.nix +++ b/pkgs/by-name/ju/junest/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "junest"; - version = "7.4.8"; + version = "7.4.9"; src = fetchFromGitHub { owner = "fsquillace"; repo = "junest"; rev = "refs/tags/${version}"; - hash = "sha256-9yrQ721fHUxXEZ0mh27SB8yoUH67ltOktUq3kr4qrBc="; + hash = "sha256-iPZN4zPHRsOh5GjRUbeEQj7BYO2Ng93mNn8TvxpDN3Q="; }; dontBuild = true; From cdce031214793d766942068e3f8e5c8c65e4b094 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 00:39:14 +0000 Subject: [PATCH 372/481] php: 8.2.21 -> 8.2.22 --- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index d3e051e96bb2..7b533cb13ea9 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.21"; - hash = "sha256-+Ydv59TZbUGs7RmbWKH3rntmVd3JJnMTX+3tf2k5138="; + version = "8.2.22"; + hash = "sha256-Wq5ZZMYFMxhfm+koz315oTOTzFVgzt8fS5d5RMx2pYU="; }); in base.withExtensions ({ all, ... }: with all; ([ From ea2ddc7f7ee9794b6c89de6161790c4dcca4903b Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 28 Jul 2024 23:28:29 -0500 Subject: [PATCH 373/481] lmstudio: adding crertel to maintainers --- pkgs/by-name/lm/lmstudio/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 59af9b4f96b5..54f84f2385cd 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -11,7 +11,7 @@ let homepage = "https://lmstudio.ai/"; license = lib.licenses.unfree; mainProgram = "lmstudio"; - maintainers = with lib.maintainers; [ cig0 eeedean ]; + maintainers = with lib.maintainers; [ cig0 eeedean crertel ]; platforms = [ "x86_64-linux" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; From e574238af418d40b7b90bc97b152f582161cf21f Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 28 Jul 2024 23:27:17 -0500 Subject: [PATCH 374/481] lmstudio: 0.2.27 -> 0.2.31 --- pkgs/by-name/lm/lmstudio/darwin.nix | 4 ++-- pkgs/by-name/lm/lmstudio/linux.nix | 4 ++-- pkgs/by-name/lm/lmstudio/package.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 2a96f05bebe6..305de818b80d 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { inherit meta pname version; src = fetchurl { - url = "https://releases.lmstudio.ai/mac/arm64/${version}/latest/LM-Studio-${version}-arm64.dmg"; - hash = "sha256-zLbkb33Fmz2b+cloEINJybuj+i3ya+EVxb5CPWo/iXk="; + url = "https://releases.lmstudio.ai/mac/arm64/${version}/1/LM-Studio-${version}-arm64.dmg"; + hash = "sha256-ZitdLHuGIH22Ohk7UWVz32BPFTj796HoR+5zEs5rh6E="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index f4ed1b048000..827e89df406d 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -6,8 +6,8 @@ }: let src = fetchurl { - url = "https://releases.lmstudio.ai/linux/x86/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-Mui9QxK7UDnt6cWpYzsoy4hp7P46kx/53+em7Alu1BA="; + url = "https://files.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; + hash = "sha256-zC8QQNsT1X8ICiYLy/jYMVp8w8NP7ghtVF06UMC4eOg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 54f84f2385cd..c61622085ba9 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,7 +5,7 @@ }: let pname = "lmstudio"; - version = "0.2.27"; + version = "0.2.31"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; From d4a6b4b3f0fde908c83b08e51f60df0e05f10dff Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Sat, 3 Aug 2024 19:09:13 -0600 Subject: [PATCH 375/481] home-assistant: pin pyopenweathermap at 0.0.10 --- pkgs/servers/home-assistant/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a57f0d32c4a6..a7175b343f30 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -299,6 +299,16 @@ let }; }); + pyopenweathermap = super.pyopenweathermap.overridePythonAttrs (oldAttrs: rec { + version = "0.0.10"; + src = fetchFromGitHub { + owner = "freekode"; + repo = "pyopenweathermap"; + rev = "refs/tags/v${version}"; + hash = "sha256-wEcE4IYVvxEwW5Hhz+DqDIqbjd5/O1hEr7dGgiuMI00="; + }; + }); + pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { version = "0.8.6"; src = fetchFromGitHub { From c84c729a800a1b2d62f14c3d0b62ea7f17263ab3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 01:14:16 +0000 Subject: [PATCH 376/481] ergo: 5.0.21 -> 5.0.22 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index b3ff8ccce2c2..0ab89e9c2709 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.21"; + version = "5.0.22"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-WtBsChSHnYbRBojxRUGdMnXlG+45hp4ZSd8GLx5n/88="; + sha256 = "sha256-fuea76l6kIjk9n/LlktZmJ1B8wiwSfEeHUkTr+I1a2c="; }; nativeBuildInputs = [ makeWrapper ]; From eba75667ee868bb68e81438df456bac40e171a8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 01:16:48 +0000 Subject: [PATCH 377/481] evtx: 0.8.2 -> 0.8.3 --- pkgs/tools/security/evtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/tools/security/evtx/default.nix index 0bd753fab527..f690fa17fd10 100644 --- a/pkgs/tools/security/evtx/default.nix +++ b/pkgs/tools/security/evtx/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "evtx"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "omerbenamram"; repo = "evtx"; rev = "refs/tags/v${version}"; - hash = "sha256-uuoHDIZ76BfRSb1XXHDwsSQ3ium22FPv1fjrB35liXw="; + hash = "sha256-q2IpWWL/wmjVKSwupAa43zpXF+8/a1Cm/lKOmpwcsLA="; }; - cargoHash = "sha256-OmwfI86Rj0Ph5cXpGzAycEw+A4liki7+gc1iokDBwhU="; + cargoHash = "sha256-O6XnBvLLoTvYA3G5Ws/aaYWJvEmDT7nnz+mc4QVkftg="; postPatch = '' # CLI tests will fail in the sandbox From 072406a37f418489472abd6c39d852f2fe1cd5e3 Mon Sep 17 00:00:00 2001 From: Spencer Pogorzelski <34356756+Scoder12@users.noreply.github.com> Date: Thu, 1 Aug 2024 19:16:23 -0700 Subject: [PATCH 378/481] ida-free: add openssl dependency to libida64 The cloud decompiler is currently not working because it tries to dlopen() openssl. openssl is added to the RUNPATH of the main ida64 binary, but not of this helper library. Tell autoPatchelf to add it by adding a reference to it. --- pkgs/by-name/id/ida-free/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix index 87d7457280ef..237080eced38 100644 --- a/pkgs/by-name/id/ida-free/package.nix +++ b/pkgs/by-name/id/ida-free/package.nix @@ -121,6 +121,10 @@ stdenv.mkDerivation rec { ln -s $IDADIR/$bb $out/bin/$bb done + # runtimeDependencies don't get added to non-executables, and openssl is needed + # for cloud decompilation + patchelf --add-needed libcrypto.so $IDADIR/libida64.so + runHook postInstall ''; From 405be788077d9cfd12a75247611e6fa8bc19d291 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 01:25:25 +0000 Subject: [PATCH 379/481] gopass: 1.15.13 -> 1.15.14 --- pkgs/tools/security/gopass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 35961ad0abe1..fc16820d1c97 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.13"; + version = "1.15.14"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-FoDb4+9x8waLWBk4d0TclpReu60vzNGE+8GQmKMmcMQ="; + hash = "sha256-3oXdHjW3svGfOEoikEeGm4oU9j+7IBOHw5KH7CCV/uw="; }; - vendorHash = "sha256-Om4ne8oyZBr6a4dgBIvd0NZaDwmmC68pg8D+1UApzLw="; + vendorHash = "sha256-GeppWyIWE8kYIqhRf1iHksWksdjbIzy96rRpx+qQ3L0="; subPackages = [ "." ]; From 398e84be34a5d358fdc6d9593afde49809b0a986 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 01:31:20 +0000 Subject: [PATCH 380/481] libgpiod: 2.1.2 -> 2.1.3 --- pkgs/development/libraries/libgpiod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index fe131f469f0b..1880b8310fce 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - hash = "sha256-sb3x4/dSOGlfk+RCBiuvwGkXDyv08M1LjgScpnExofA="; + hash = "sha256-jYDqAirngSKqUlMI50I7gwZL/yePzZzQRblLT4H4BX0="; }; nativeBuildInputs = [ From c65a037bd5e54003f5d1d4245fff9467d1fa7b07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 01:39:07 +0000 Subject: [PATCH 381/481] gmid: 2.0.5 -> 2.1 --- pkgs/by-name/gm/gmid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix index 40670bd5fbd5..09a8a33d828b 100644 --- a/pkgs/by-name/gm/gmid/package.nix +++ b/pkgs/by-name/gm/gmid/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "2.0.5"; + version = "2.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-xuA5yLtRu9GDrSr7FBlAwEjCjFVRmnOuBM62AHOHDhc="; + hash = "sha256-C9CheVP0ZFf44J26KKa3+fkp8MB1sNVHnsHiNuNPKwQ="; }; nativeBuildInputs = [ bison ]; From d005a72f3d9feb8dd5b2c687ece5bda6668eda8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 02:09:13 +0000 Subject: [PATCH 382/481] mpop: 1.4.19 -> 1.4.20 --- pkgs/applications/networking/mpop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 7132eca55913..7370ddd6e201 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -16,11 +16,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary ["gnutls" "openssl" "no"]; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.19"; + version = "1.4.20"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-I8QeE8b/68qt4sNsn9RivyX2I+SBuwYnz+CT4DpVXIo="; + sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s="; }; nativeBuildInputs = [ From 796c71895cd2374312a73768a5d92da16150c829 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 02:09:26 +0000 Subject: [PATCH 383/481] inform6: 6.42-r2 -> 6.42-r4 --- pkgs/development/compilers/inform6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix index e717d9af7ae8..1b95978b0f52 100644 --- a/pkgs/development/compilers/inform6/default.nix +++ b/pkgs/development/compilers/inform6/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inform6"; - version = "6.42-r2"; + version = "6.42-r4"; src = fetchurl { url = "https://ifarchive.org/if-archive/infocom/compilers/inform6/source/inform-${version}.tar.gz"; - sha256 = "sha256-zNm7z2nJlxaHRcZ7Ad8t1jZW999o9WFHrEnqlOJLdk0="; + sha256 = "sha256-R/GzexNpHCmAmiXzCZwEv117Ka4p2R+P7eQPW9C1NXU="; }; buildInputs = [ perl ]; From e8a6875398a763309440b241867a30accb9a9564 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 23:54:09 -0400 Subject: [PATCH 384/481] diagnostic-languageserver: migrate from mkYarnPackage --- .../di/diagnostic-languageserver/package.json | 33 ------------------ .../di/diagnostic-languageserver/package.nix | 34 +++++++++++-------- 2 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 pkgs/by-name/di/diagnostic-languageserver/package.json diff --git a/pkgs/by-name/di/diagnostic-languageserver/package.json b/pkgs/by-name/di/diagnostic-languageserver/package.json deleted file mode 100644 index 17483d559a2f..000000000000 --- a/pkgs/by-name/di/diagnostic-languageserver/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "diagnostic-languageserver", - "version": "1.15.0", - "description": "diagnostic language server", - "main": "./lib/index.js", - "repository": "git@github.com:iamcco/diagnostic-languageserver.git", - "author": "iamcco ", - "license": "MIT", - "scripts": { - "build": "tsc -p ./", - "watch": "tsc -w -p ./" - }, - "bin": { - "diagnostic-languageserver": "./bin/index.js" - }, - "dependencies": { - "commander": "^5.1.0", - "find-up": "^4.1.0", - "lodash": "^4.17.15", - "rxjs": "^6.5.5", - "tempy": "^0.7.1", - "tslib": "^1.11.2", - "vscode-languageserver": "^6.1.1", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-uri": "^2.1.1" - }, - "devDependencies": { - "@types/lodash": "^4.14.150", - "@types/node": "^11.11.3", - "ignore": "^5.1.8", - "typescript": "^3.8.3" - } -} diff --git a/pkgs/by-name/di/diagnostic-languageserver/package.nix b/pkgs/by-name/di/diagnostic-languageserver/package.nix index 81d99c83ac9f..85f35db24ec9 100644 --- a/pkgs/by-name/di/diagnostic-languageserver/package.nix +++ b/pkgs/by-name/di/diagnostic-languageserver/package.nix @@ -1,41 +1,45 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, - nix-update-script -}: mkYarnPackage rec { + nix-update-script, + yarnConfigHook, + yarnBuildHook, + npmHooks, + nodejs, +}: +stdenv.mkDerivation (finalAttrs: { pname = "diagnostic-languageserver"; version = "1.15.0"; src = fetchFromGitHub { owner = "iamcco"; repo = "diagnostic-languageserver"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-EFkvxMvtA5L6ZiDxrZxGnNAphNn/P3ra6ZrslplScZg="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-T8ppt8EDljtMhGp9i0VleU2Nw3tJexE2ufT6C4EtAz0="; }; - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; - doDist = false; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + npmHooks.npmInstallHook + nodejs + ]; passthru.updateScript = nix-update-script { }; meta = { description = "General purpose Language Server that integrate with linter to support diagnostic features"; homepage = "https://github.com/iamcco/diagnostic-languageserver"; - changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${version}"; + changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "diagnostic-languageserver"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) From 0502f67fa6f46db44b0f7e9c08bf31b9eb3eb223 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 23:59:55 -0400 Subject: [PATCH 385/481] get-graphql-schema: remove usage of mkYarnPackage --- .../ge/get-graphql-schema/package.json | 35 ------------------- .../by-name/ge/get-graphql-schema/package.nix | 35 +++++++++---------- 2 files changed, 17 insertions(+), 53 deletions(-) delete mode 100644 pkgs/by-name/ge/get-graphql-schema/package.json diff --git a/pkgs/by-name/ge/get-graphql-schema/package.json b/pkgs/by-name/ge/get-graphql-schema/package.json deleted file mode 100644 index ade37982b91f..000000000000 --- a/pkgs/by-name/ge/get-graphql-schema/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "get-graphql-schema", - "bin": "dist/index.js", - "files": [ - "README.md", - "dist/" - ], - "version": "2.1.1", - "description": "Downloads the GraphQL Schema of an GraphQL endpoint URL", - "scripts": { - "build": "tsc", - "prepublish": "npm run build && chmod +x dist/index.js", - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/graphcool/get-graphql-schema.git" - }, - "author": "Johannes Schickling ", - "license": "MIT", - "dependencies": { - "@types/chalk": "^0.4.31", - "@types/graphql": "^0.8.6", - "@types/minimist": "^1.2.0", - "@types/node": "^7.0.4", - "@types/node-fetch": "^1.6.7", - "chalk": "^1.1.3", - "graphql": "^0.9.1", - "minimist": "^1.2.0", - "node-fetch": "^1.6.3" - }, - "devDependencies": { - "typescript": "^2.1.5" - } -} diff --git a/pkgs/by-name/ge/get-graphql-schema/package.nix b/pkgs/by-name/ge/get-graphql-schema/package.nix index 25d9f839778c..c32fb60544d0 100644 --- a/pkgs/by-name/ge/get-graphql-schema/package.nix +++ b/pkgs/by-name/ge/get-graphql-schema/package.nix @@ -1,37 +1,36 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, - nodejs_22 -}: mkYarnPackage rec { + nodejs, + yarnConfigHook, + yarnBuildHook, + npmHooks, +}: +stdenv.mkDerivation (finalAttrs: { pname = "get-graphql-schema"; version = "2.1.1"; src = fetchFromGitHub { owner = "prisma-labs"; repo = "get-graphql-schema"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ujc0LGAqmo4SmItm4VcbBOtmUvL6aV1ppMm4fMmuSRs="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-TZGNX8UHbolLyBmQNGTnFjgx3/3f2HNVQf/h9rIVJKs="; }; - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + npmHooks.npmInstallHook + nodejs + ]; - postFixup = '' - substituteInPlace $out/libexec/get-graphql-schema/deps/get-graphql-schema/dist/index.js \ - --replace-fail "#!/usr/bin/env node" "#!${lib.getExe nodejs_22}" - chmod +x $out/bin/get-graphql-schema - ''; meta = { description = "Command line tool for generating a changelog from git tags and commit history"; homepage = "https://github.com/cookpete/auto-changelog"; @@ -40,4 +39,4 @@ mainProgram = "get-graphql-schema"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) From 04c0c779b7ccb53b9b99bd01bca41b46e8f7b139 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 23:48:42 -0400 Subject: [PATCH 386/481] auto-changelog: remove usage of mkYarnPackage --- pkgs/by-name/au/auto-changelog/package.json | 100 -------------------- pkgs/by-name/au/auto-changelog/package.nix | 36 +++++-- 2 files changed, 28 insertions(+), 108 deletions(-) delete mode 100644 pkgs/by-name/au/auto-changelog/package.json diff --git a/pkgs/by-name/au/auto-changelog/package.json b/pkgs/by-name/au/auto-changelog/package.json deleted file mode 100644 index 573119c376c5..000000000000 --- a/pkgs/by-name/au/auto-changelog/package.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "name": "auto-changelog", - "version": "2.4.0", - "description": "Command line tool for generating a changelog from git tags and commit history", - "main": "./src/index.js", - "bin": { - "auto-changelog": "./src/index.js" - }, - "engines": { - "node": ">=8.3" - }, - "scripts": { - "lint": "standard --verbose | snazzy", - "lint-fix": "standard --fix", - "lint-markdown": "markdownlint README.md test/data/*.md", - "test": "cross-env NODE_ENV=test mocha -r @babel/register test", - "test-coverage": "cross-env NODE_ENV=test nyc mocha test", - "report-coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json", - "preversion": "npm run lint && npm run test", - "version": "node src/index.js --package && git add CHANGELOG.md", - "generate-test-data": "cross-env NODE_ENV=test node scripts/generate-test-data.js" - }, - "author": "Pete Cook (https://github.com/cookpete)", - "homepage": "https://github.com/CookPete/auto-changelog", - "repository": { - "type": "git", - "url": "https://github.com/CookPete/auto-changelog.git" - }, - "bugs": { - "url": "https://github.com/CookPete/auto-changelog/issues" - }, - "keywords": [ - "auto", - "automatic", - "changelog", - "change", - "log", - "generator", - "git", - "commit", - "commits", - "history" - ], - "license": "MIT", - "dependencies": { - "commander": "^7.2.0", - "handlebars": "^4.7.7", - "node-fetch": "^2.6.1", - "parse-github-url": "^1.0.2", - "semver": "^7.3.5" - }, - "devDependencies": { - "@babel/core": "^7.14.3", - "@babel/register": "^7.13.16", - "babel-plugin-istanbul": "^6.0.0", - "babel-plugin-rewire": "^1.2.0", - "chai": "^4.3.4", - "codecov": "^3.8.2", - "cross-env": "^7.0.3", - "markdownlint-cli": "^0.30.0", - "mocha": "^9.2.0", - "nyc": "^15.1.0", - "snazzy": "^9.0.0", - "standard": "^16.0.3" - }, - "babel": { - "env": { - "test": { - "plugins": [ - "istanbul", - "rewire" - ] - } - } - }, - "standard": { - "ignore": [ - "test/data/" - ] - }, - "nyc": { - "all": true, - "include": "src", - "exclude": "src/index.js", - "sourceMap": false, - "instrument": false, - "report-dir": "./coverage", - "temp-dir": "./coverage/.nyc_output", - "require": [ - "@babel/register" - ], - "reporter": [ - "text", - "html" - ] - }, - "auto-changelog": { - "breakingPattern": "Breaking change" - } -} diff --git a/pkgs/by-name/au/auto-changelog/package.nix b/pkgs/by-name/au/auto-changelog/package.nix index 44a4273b9042..ba35a26d6e37 100644 --- a/pkgs/by-name/au/auto-changelog/package.nix +++ b/pkgs/by-name/au/auto-changelog/package.nix @@ -1,25 +1,45 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, - fetchFromGitHub -}: mkYarnPackage rec { + fetchFromGitHub, + yarnConfigHook, + npmHooks, + nodejs, + git, +}: +stdenv.mkDerivation (finalAttrs: { pname = "auto-changelog"; version = "2.4.0"; src = fetchFromGitHub { owner = "cookpete"; repo = "auto-changelog"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ="; }; + nativeBuildInputs = [ + yarnConfigHook + npmHooks.npmInstallHook + nodejs + ]; + + doCheck = true; + + nativeCheckInputs = [ git ]; + + checkPhase = '' + runHook preCheck + yarn --offline run test -i -g 'compileTemplate' + runHook postCheck + ''; + meta = { description = "Command line tool for generating a changelog from git tags and commit history"; homepage = "https://github.com/cookpete/auto-changelog"; @@ -28,4 +48,4 @@ mainProgram = "auto-changelog"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) From b812646b79772bb7e9f21c8ecb935a55e7e8e7ff Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sat, 3 Aug 2024 22:25:27 -0400 Subject: [PATCH 387/481] get-graphql-schema: Fix meta attributes --- pkgs/by-name/ge/get-graphql-schema/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/get-graphql-schema/package.nix b/pkgs/by-name/ge/get-graphql-schema/package.nix index c32fb60544d0..fe6b35e9bcad 100644 --- a/pkgs/by-name/ge/get-graphql-schema/package.nix +++ b/pkgs/by-name/ge/get-graphql-schema/package.nix @@ -32,9 +32,8 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "Command line tool for generating a changelog from git tags and commit history"; - homepage = "https://github.com/cookpete/auto-changelog"; - changelog = "https://github.com/cookpete/auto-changelog/blob/master/CHANGELOG.md"; + description = "Fetch and print the GraphQL schema from a GraphQL HTTP endpoint."; + homepage = "https://github.com/prisma-labs/get-graphql-schema"; license = lib.licenses.mit; mainProgram = "get-graphql-schema"; maintainers = with lib.maintainers; [ pyrox0 ]; From 941d89514cd0522b9283678819ab82acf1b415fc Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Sat, 3 Aug 2024 21:30:19 -0400 Subject: [PATCH 388/481] serie: fixed rust check failures, added version test --- pkgs/by-name/se/serie/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 62937e9b1597..3a46cd2e6c58 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -4,6 +4,9 @@ fetchFromGitHub, rustPlatform, darwin, + testers, + gitMinimal, + serie, }: rustPlatform.buildRustPackage rec { @@ -27,8 +30,9 @@ rustPlatform.buildRustPackage rec { ] ); - # requires a git repository - doCheck = false; + nativeCheckInputs = [ gitMinimal ]; + + passthru.tests.version = testers.testVersion { package = serie; }; meta = with lib; { description = "A rich git commit graph in your terminal, like magic"; From 8561c138c547bf48a9691c350d8975bf7d5eb534 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:02:12 +0000 Subject: [PATCH 389/481] python312Packages.mapbox-earcut: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/mapbox-earcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix index e86a3760bc97..c7359364b2fb 100644 --- a/pkgs/development/python-modules/mapbox-earcut/default.nix +++ b/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mapbox-earcut"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "skogler"; repo = "mapbox_earcut_python"; rev = "refs/tags/v${version}"; - hash = "sha256-+Vxvo++bkoCsJFmt/u1eaqhgpz8Uddz06iIi66ju+MQ="; + hash = "sha256-xR+nO5xdoDUhWZM19DOid3lsEXBood5NofQ0SezJ9OE="; }; nativeBuildInputs = [ From 3fcb87d5ba0509fd082468ee19b0448f4c861062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:02:36 +0000 Subject: [PATCH 390/481] maa-cli: 0.4.8 -> 0.4.9 --- pkgs/by-name/ma/maa-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index e1bfed03e0eb..fcbb89c8e339 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-qsyMLYAcniYz3gHw2N0itewmEaeCfXHCNwKUq6zUwX0="; + hash = "sha256-klcS4SNMB5bAy4Gzk9NgbjbZL+7kh0lNXwIwJoXBbVU="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { "core_installer" ]; - cargoHash = "sha256-cmsr4XEccerQMo1ksBzJvA/xdx9sAJlyum+YCpFATOw="; + cargoHash = "sha256-C4NkJc7msyaUjQAsc0kbDwkr0cj3Esv+JjA24RvFsXA="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 From efd3bbab3fad4c9efb9edd45ad6f5662b5acc9b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:02:51 +0000 Subject: [PATCH 391/481] pgbouncer: 1.23.0 -> 1.23.1 --- pkgs/servers/sql/pgbouncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 178ef933d5a5..17bb24562d7e 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-GAQhnDAe8DXn9B6pr/HlGAtLr4hF1hBh6aEIWTYyMiY="; + hash = "sha256-GWO0lyMdmlYKYtJm5KLq5ogatAGFPZPl0pLDdA7sUIQ="; }; nativeBuildInputs = [ pkg-config ]; From f3b11c048d5fe479394981ce0fd4ada127671794 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:02:55 +0000 Subject: [PATCH 392/481] python312Packages.pyemvue: 0.18.5 -> 0.18.6 --- pkgs/development/python-modules/pyemvue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyemvue/default.nix b/pkgs/development/python-modules/pyemvue/default.nix index 641339d487a9..c2b6ac4d22ce 100644 --- a/pkgs/development/python-modules/pyemvue/default.nix +++ b/pkgs/development/python-modules/pyemvue/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pyemvue"; - version = "0.18.5"; + version = "0.18.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-cgQARaGM6Jb2kEcG7HqPStRPkhHldJ7UbxQpxN6JbZE="; + hash = "sha256-FQ34pKRK1HDLoupMDfVaNxAhn1HbZHYi6se4ewlUWGA="; }; nativeBuildInputs = [ hatchling ]; From d657a50fc778af41be5972c1d92593a5890800b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:22:33 +0000 Subject: [PATCH 393/481] zfind: 0.4.4 -> 0.4.5 --- pkgs/by-name/zf/zfind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix index 84fb6a45f54b..9e0030fe40cd 100644 --- a/pkgs/by-name/zf/zfind/package.nix +++ b/pkgs/by-name/zf/zfind/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "zfind"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "laktak"; repo = "zfind"; rev = "v${version}"; - hash = "sha256-CHudSfvl+YnKjvvuSH0RgIqF2bDEO1KW3oAiNN2mLro="; + hash = "sha256-sRZAsmh193K5HX7oC1UdCQccNpSc5QHtec+UpvpntKU="; }; vendorHash = "sha256-blq0/pRppdf2jcuhIqYeNhcazFNZOGeEjPTSLgHqhrU="; From 729e7d5af2fc796bc8c7da3511d1534a53e60682 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:22:40 +0000 Subject: [PATCH 394/481] ttyplot: 1.6.5 -> 1.7.0 --- pkgs/tools/misc/ttyplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index d9f4ac565514..535d374bf2b7 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.6.5"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - hash = "sha256-DLFEnEo+EQuq4ziqo9qfyHGD1Zosk9Kb/80QjnI2aXk="; + hash = "sha256-B95pd0hoesBDQwzN0h3kMBVcUFJVWQrpOKizKpdoiok="; }; nativeBuildInputs = [ From 74da3a712853d683696eea2fb7a97da0705c5745 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:39:54 +0000 Subject: [PATCH 395/481] regclient: 0.7.0 -> 0.7.1 --- pkgs/development/tools/regclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 663d8f1df7e6..3251014f5bfd 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -11,14 +11,14 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.7.0"; + version = "0.7.1"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-MumOum8mG2KOSKz2wRZlbTFvgSOEpJ/qMz7+hYooPgk="; + sha256 = "sha256-QG0qwilYqsueyI3rzpNj9z8gYYRzIorlOID+baORgJU="; }; vendorHash = "sha256-gqnE3kfBLjV8CroYcJwa9QWCFOL/dBIblPQJZR2DW+4="; From 84eed40b9c455350dd256e8055f35e5bc04a5d78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:55:42 +0000 Subject: [PATCH 396/481] gh-dash: 4.4.0 -> 4.5.0 --- pkgs/tools/misc/gh-dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index 9fd5298abf29..904a010e0b5e 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-HNGg3e6QoAkcio/78u2U1u0EhX707yXmA4fyGIqJHX0="; + hash = "sha256-zLKQbw9d20KKuK5j9RhZPLSDRrw5SQ8vycIEfRmUEzI="; }; vendorHash = "sha256-JOd2czYWVgE1jBfeuoVRp+oE/asyk50o5Pf021jD5mY="; From f22364d259b341636fb446bf432df14b8f066f78 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 3 Aug 2024 19:29:53 -0700 Subject: [PATCH 397/481] alsa-firmware: fix building with llvm --- pkgs/by-name/al/alsa-firmware/package.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/al/alsa-firmware/package.nix b/pkgs/by-name/al/alsa-firmware/package.nix index 06b6ef47d430..1666cce5646f 100644 --- a/pkgs/by-name/al/alsa-firmware/package.nix +++ b/pkgs/by-name/al/alsa-firmware/package.nix @@ -1,6 +1,13 @@ -{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl, fetchpatch }: +{ + lib, + stdenv, + buildPackages, + autoreconfHook, + fetchurl, + fetchpatch, +}: -stdenvNoCC.mkDerivation rec { +stdenv.mkDerivation rec { pname = "alsa-firmware"; version = "1.2.4"; @@ -17,12 +24,13 @@ stdenvNoCC.mkDerivation rec { }) ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook ]; - configureFlags = [ - "--with-hotplug-dir=$(out)/lib/firmware" - ]; + configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ]; + + depsBuildBuild = lib.optional ( + stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isAarch64 + ) buildPackages.stdenv.cc; dontStrip = true; From bcece721779f6d983bf2cdd2d4f66dfa09378f2a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 22 Apr 2024 20:42:49 +0800 Subject: [PATCH 398/481] singularity-tools: format with nixfmt-rfc-style (Nix RFC 166) --- .../singularity-tools/default.nix | 67 ++++++++++--------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index cd10a9960421..ecca857eb79d 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -1,19 +1,21 @@ -{ runCommand -, lib -, stdenv -, storeDir ? builtins.storeDir -, writeScript -, singularity -, writeClosure -, bash -, vmTools -, gawk -, util-linux -, runtimeShell -, e2fsprogs +{ + runCommand, + lib, + stdenv, + storeDir ? builtins.storeDir, + writeScript, + singularity, + writeClosure, + bash, + vmTools, + gawk, + util-linux, + runtimeShell, + e2fsprogs, }: rec { - shellScript = name: text: + shellScript = + name: text: writeScript name '' #!${runtimeShell} set -e @@ -21,15 +23,13 @@ rec { ''; mkLayer = - { name - , contents ? [ ] + { + name, + contents ? [ ], # May be "apptainer" instead of "singularity" - , projectName ? (singularity.projectName or "singularity") + projectName ? (singularity.projectName or "singularity"), }: - runCommand "${projectName}-layer-${name}" - { - inherit contents; - } '' + runCommand "${projectName}-layer-${name}" { inherit contents; } '' mkdir $out for f in $contents ; do cp -ra $f $out/ @@ -40,13 +40,14 @@ rec { let defaultSingularity = singularity; in - { name - , contents ? [ ] - , diskSize ? 1024 - , runScript ? "#!${stdenv.shell}\nexec /bin/sh" - , runAsRoot ? null - , memSize ? 1024 - , singularity ? defaultSingularity + { + name, + contents ? [ ], + diskSize ? 1024, + runScript ? "#!${stdenv.shell}\nexec /bin/sh", + runAsRoot ? null, + memSize ? 1024, + singularity ? defaultSingularity, }: let projectName = singularity.projectName or "singularity"; @@ -55,7 +56,12 @@ rec { result = vmTools.runInLinuxVM ( runCommand "${projectName}-image-${name}.img" { - buildInputs = [ singularity e2fsprogs util-linux gawk ]; + buildInputs = [ + singularity + e2fsprogs + util-linux + gawk + ]; layerClosure = writeClosure contents; preVM = vmTools.createEmptyImage { size = diskSize; @@ -110,7 +116,8 @@ rec { echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd echo > /etc/resolv.conf TMPDIR=$(pwd -P) ${projectName} build $out ./img - ''); + '' + ); in result; From d17eef519d601e7081be6526ca360791d670f094 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li <44064051+ShamrockLee@users.noreply.github.com> Date: Tue, 4 Apr 2023 05:22:57 +0800 Subject: [PATCH 399/481] singularity-tools: rearrarnge the input parameters --- .../singularity-tools/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index ecca857eb79d..c1dc1a00df04 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -1,17 +1,20 @@ { - runCommand, lib, + # Build helpers stdenv, - storeDir ? builtins.storeDir, - writeScript, - singularity, - writeClosure, - bash, + runCommand, vmTools, + writeClosure, + writeScript, + # Native build inputs + e2fsprogs, gawk, util-linux, + # Build inputs + bash, runtimeShell, - e2fsprogs, + singularity, + storeDir ? builtins.storeDir, }: rec { shellScript = @@ -44,9 +47,9 @@ rec { name, contents ? [ ], diskSize ? 1024, - runScript ? "#!${stdenv.shell}\nexec /bin/sh", - runAsRoot ? null, memSize ? 1024, + runAsRoot ? null, + runScript ? "#!${stdenv.shell}\nexec /bin/sh", singularity ? defaultSingularity, }: let From 6729e0336d95cf477c3a4d3980fb2755c7c494c9 Mon Sep 17 00:00:00 2001 From: arathunku Date: Sun, 4 Aug 2024 07:34:12 +0200 Subject: [PATCH 400/481] elixir-ls: 0.21.3 -> 0.23.0 - [v0.23.0 release](https://github.com/elixir-lsp/elixir-ls/releases/tag/v0.23.0) - [v0.22.0 release](https://github.com/elixir-lsp/elixir-ls/releases/tag/v0.22.0) --- pkgs/development/beam-modules/elixir-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 144ffb55e95e..98ffe5e6af60 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.21.3"; + version = "0.23.0"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-IzHvJQ7UdGXFeSyNYKeHlDuY/o1y/E4fM+lG3t9J2HM="; + hash = "sha256-X5BJuqr3TVwpv731ym+Ac3+goA0LH9f3H5wWFwQsAB8="; }; in mixRelease { @@ -20,7 +20,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-3PVMembw3CpYUQ/ynoPKmu0N5iZwoFu9uNjRS+kS4BY="; + hash = "sha256-2b5XJnS4ipSjppUniXr1ep8Ymv3yd6COYM/W1QNM/zc="; }; # elixir-ls is an umbrella app From 0b07b7e4b7a0d6d160e8b1a2296105d1e7a8719e Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 3 Aug 2024 23:07:14 -0700 Subject: [PATCH 401/481] llvmPackages: fix wasm with common opts --- .../compilers/llvm/common/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index ea12bace42a0..1ec50ce87db3 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -471,10 +471,12 @@ let && stdenv.targetPlatform.useLLVM or false ) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; - nixSupport.cc-ldflags = lib.optionals ( - !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD - ) [ "-L${targetLlvmLibraries.libunwind}/lib" ] - ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version"; + nixSupport.cc-ldflags = + lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) + ( + [ "-L${targetLlvmLibraries.libunwind}/lib" ] + ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version" + ); } ); @@ -695,13 +697,11 @@ let ./compiler-rt/armv6-scudo-no-yield.patch ./compiler-rt/armv6-scudo-libatomic.patch ] - ++ lib.optional (lib.versionAtLeast metadata.release_version "19") ( - fetchpatch { - url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; - hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no="; - relative = "compiler-rt"; - } - ); + ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (fetchpatch { + url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; + hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no="; + relative = "compiler-rt"; + }); in { compiler-rt-libc = callPackage ./compiler-rt ( From 7519a61915940841a2287be13615b3554d000c24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 06:39:18 +0000 Subject: [PATCH 402/481] jmol: 16.2.19 -> 16.2.21 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 3e9cd1aaeaa6..a48019febb1d 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.2.19"; + version = "16.2.21"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-uOPRdTmEbU376G7a7om5UpBjemkN170PwGCskJY41HE="; + hash = "sha256-9gIOrHoy0JyoPXaHOfBDHCL+ykmmHNam+Um12sHqZsE="; }; patchPhase = '' From a67c42c7585fa71e25750e1d45d4e94f0d4f0aaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 06:42:50 +0000 Subject: [PATCH 403/481] scalene: 1.5.42.2 -> 1.5.43.2 --- pkgs/development/python-modules/scalene/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 430cff86e231..6f5adae67d84 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "scalene"; - version = "1.5.42.2"; + version = "1.5.43.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-0ZGk0xFBFSeeg4vjNXu/ppGdEKGhUc2ql4R6oWG23aQ="; + hash = "sha256-LtD7v3pLz4UCnh6xlhkPdcEjyu3mt+YQPYZ0nNCLuDw="; }; nativeBuildInputs = [ From a67c67f2371e2f4649fb2839a630846086fee8bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 06:45:20 +0000 Subject: [PATCH 404/481] python312Packages.conda: 24.7.0 -> 24.7.1 --- pkgs/development/python-modules/conda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index bf887f347bfb..a02e75987d76 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -27,7 +27,7 @@ }: buildPythonPackage rec { pname = "conda"; - version = "24.7.0"; + version = "24.7.1"; pyproject = true; src = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda"; rev = "refs/tags/${version}"; - hash = "sha256-5Zj27rqULUThbLb5lbb4oynAYoqsDa0mTkNH9sLM3VU="; + hash = "sha256-e+C+tSUdSGyotuZzkOuV0e0hOj+MZRuq1fHzsu3LERQ="; }; From 6a0b3c2ccb650f7d4690a9443c37c8b34c484b07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 06:55:36 +0000 Subject: [PATCH 405/481] python312Packages.scalene: 1.5.42.2 -> 1.5.43.2 --- pkgs/development/python-modules/scalene/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 430cff86e231..6f5adae67d84 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "scalene"; - version = "1.5.42.2"; + version = "1.5.43.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-0ZGk0xFBFSeeg4vjNXu/ppGdEKGhUc2ql4R6oWG23aQ="; + hash = "sha256-LtD7v3pLz4UCnh6xlhkPdcEjyu3mt+YQPYZ0nNCLuDw="; }; nativeBuildInputs = [ From bbd0655ae828b9f1cf39d891b52aa6506394ef46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 29 Feb 2024 13:53:30 +0200 Subject: [PATCH 406/481] add compressDrv and compressDrvWeb *compressDrv* compresses files in a given derivation. *compressDrvWeb* compresses a derivation for a loosely-defined pre-compressed "web server" usage. This intends to replace the `passthru.data-compressed` derivations that have accumulated in nixpkgs with something more reusable. --- .../manual/release-notes/rl-2411.section.md | 2 + pkgs/build-support/compress-drv/default.nix | 63 +++++++++++ pkgs/build-support/compress-drv/test.nix | 42 +++++++ pkgs/build-support/compress-drv/web.nix | 103 ++++++++++++++++++ pkgs/test/default.nix | 2 + pkgs/top-level/all-packages.nix | 4 + 6 files changed, 216 insertions(+) create mode 100644 pkgs/build-support/compress-drv/default.nix create mode 100644 pkgs/build-support/compress-drv/test.nix create mode 100644 pkgs/build-support/compress-drv/web.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4a4dba0fdafb..63287161f084 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -13,6 +13,8 @@ - `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/). This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version. +- `compressDrv` can compress selected files in a derivation. `compressDrvWeb` compresses files for common web server usage (`.gz` with `zopfli`, `.br` with `brotli`). + - `hardware.display` is a new module implementing workarounds for misbehaving monitors through setting up custom EDID files and forcing kernel/framebuffer modes. diff --git a/pkgs/build-support/compress-drv/default.nix b/pkgs/build-support/compress-drv/default.nix new file mode 100644 index 000000000000..f5507cb3d3ed --- /dev/null +++ b/pkgs/build-support/compress-drv/default.nix @@ -0,0 +1,63 @@ +{ + lib, + xorg, + runCommand, +}: +/** + # compressDrv compresses files in a given derivation. + + ## Inputs: + + `formats` ([String]) + + : List of file extensions to compress. Example: `["txt" "svg" "xml"]`. + + `compressors` (String -> String) + + : Map a desired extension (e.g. `gz`) to a compress program. + + The compressor program that will be executed to get the `COMPRESSOR` extension. + The program should have a single " {}", which will be the replaced with the + target filename. + + Compressor must: + - read symlinks (thus --force is needed to gzip, zstd, xz). + - keep the original file in place (--keep). + + Example: + + ``` + { + xz = "${xz}/bin/xz --force --keep {}"; + } + ``` + + See compressDrvWeb, which is a wrapper on top of compressDrv, for broader use + examples. +*/ +drv: +{ formats, compressors, ... }: +let + validProg = + ext: prog: + let + matches = (builtins.length (builtins.split "\\{}" prog) - 1) / 2; + in + lib.assertMsg ( + matches == 1 + ) "compressor ${ext} needs to have exactly one '{}', found ${builtins.toString matches}"; + mkCmd = + ext: prog: + assert validProg ext prog; + '' + find -L $out -type f -regextype posix-extended -iregex '.*\.(${formatsPipe})' -print0 \ + | xargs -0 -P$NIX_BUILD_CORES -I{} ${prog} + ''; + formatsPipe = builtins.concatStringsSep "|" formats; +in +runCommand "${drv.name}-compressed" { } '' + mkdir $out + (cd $out; ${xorg.lndir}/bin/lndir ${drv}) + + ${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)} +'' diff --git a/pkgs/build-support/compress-drv/test.nix b/pkgs/build-support/compress-drv/test.nix new file mode 100644 index 000000000000..74cc8c4b463b --- /dev/null +++ b/pkgs/build-support/compress-drv/test.nix @@ -0,0 +1,42 @@ +{ + gzip, + runCommand, + compressDrv, +}: +let + example = runCommand "sample-drv" { } '' + mkdir $out + echo 42 > $out/1.txt + echo 43 > $out/1.md + touch $out/2.png + ''; + drv = compressDrv example { + formats = [ "txt" ]; + compressors.gz = "${gzip}/bin/gzip --force --keep --fast {}"; + }; + wrapped = compressDrv drv { + formats = [ "md" ]; + compressors.gz = "${gzip}/bin/gzip --force --keep --fast {}"; + }; +in +runCommand "test-compressDrv" { } '' + set -ex + + ls -l ${drv} + test -h ${drv}/1.txt + test -f ${drv}/1.txt.gz + cmp ${drv}/1.txt <(${gzip}/bin/zcat ${drv}/1.txt.gz) + + test -h ${drv}/2.png + test ! -a ${drv}/2.png.gz + + # compressDrv always points to the final file, no matter how many times + # it's been wrapped + cmp <(readlink -e ${drv}/1.txt) <(readlink -e ${wrapped}/1.txt) + + test -f ${wrapped}/1.txt.gz + test -f ${wrapped}/1.md.gz + test ! -f ${drv}/1.md.gz + + mkdir $out +'' diff --git a/pkgs/build-support/compress-drv/web.nix b/pkgs/build-support/compress-drv/web.nix new file mode 100644 index 000000000000..6ee15e87d13b --- /dev/null +++ b/pkgs/build-support/compress-drv/web.nix @@ -0,0 +1,103 @@ +{ + zopfli, + brotli, + compressDrv, +}: +/** + # compressDrvWeb compresses a derivation for common web server use. + + Useful when one wants to pre-compress certain static assets and pass them to + the web server. For example, `pkgs.gamja` creates this derivation: + + /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/ + ├── index.2fd01148.js + ├── index.2fd01148.js.map + ├── index.37aa9a8a.css + ├── index.37aa9a8a.css.map + ├── index.html + └── manifest.webmanifest + + `pkgs.compressDrvWeb pkgs.gamja`: + + /nix/store/f5ryid7zrw2hid7h9kil5g5j29q5r2f7-gamja-1.0.0-beta.9-compressed + ├── index.2fd01148.js -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.2fd01148.js + ├── index.2fd01148.js.br + ├── index.2fd01148.js.gz + ├── index.2fd01148.js.map -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.2fd01148.js.map + ├── index.2fd01148.js.map.br + ├── index.2fd01148.js.map.gz + ├── index.37aa9a8a.css -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.37aa9a8a.css + ├── index.37aa9a8a.css.br + ├── index.37aa9a8a.css.gz + ├── index.37aa9a8a.css.map -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.37aa9a8a.css.map + ├── index.37aa9a8a.css.map.br + ├── index.37aa9a8a.css.map.gz + ├── index.html -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/index.html + ├── index.html.br + ├── index.html.gz + ├── manifest.webmanifest -> /nix/store/2wn1qbk8gp4y2m8xvafxv1b2dcdqj8fz-gamja-1.0.0-beta.9/manifest.webmanifest + ├── manifest.webmanifest.br + └── manifest.webmanifest.gz + + When this `-compressed` directory is passed to a properly configured web + server, it will serve those pre-compressed files: + + $ curl -I -H 'Accept-Encoding: br' https://irc.example.org/ + <...> + content-encoding: br + <...> + + For example, a caddy configuration snippet for gamja to serve + the static assets (JS, CSS files) pre-compressed: + + virtualHosts."irc.example.org".extraConfig = '' + root * ${pkgs.compressDrvWeb pkgs.gamja {}} + file_server browse { + precompressed br gzip + } + ''; + + This feature is also available in nginx via `ngx_brotli` and + `ngx_http_gzip_static_module`. + + ## Inputs + + `formats` ([String]) + + : List of file extensions to compress. Default is common formats that compress + well. The list may be expanded. + + `extraFormats` ([String]) + + : Extra extensions to compress in addition to `formats`. + + `compressors` (String -> String) + + : See parameter `compressors` of compressDrv. +*/ +drv: +{ + formats ? [ + "css" + "js" + "svg" + "ttf" + "eot" + "txt" + "xml" + "map" + "html" + "json" + "webmanifest" + ], + extraFormats ? [ ], + compressors ? { + "gz" = "${zopfli}/bin/zopfli --keep {}"; + "br" = "${brotli}/bin/brotli --keep --no-copy-stat {}"; + }, + ... +}: +compressDrv drv { + formats = formats ++ extraFormats; + compressors = compressors; +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 3612bbfd1ef8..2d8d1c1c6842 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -106,6 +106,8 @@ with pkgs; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + compress-drv = callPackage ../build-support/compress-drv/test.nix { }; + fetchurl = callPackages ../build-support/fetchurl/tests.nix { }; fetchtorrent = callPackages ../build-support/fetchtorrent/tests.nix { }; fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 679af721d175..c7b3ed217437 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39878,6 +39878,10 @@ with pkgs; }; }; + compressDrv = callPackage ../build-support/compress-drv { }; + + compressDrvWeb = callPackage ../build-support/compress-drv/web.nix { }; + duti = callPackage ../os-specific/darwin/duti { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; From d97365e05e847554a7c51146a059a750cc9ceed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 29 Feb 2024 14:14:38 +0200 Subject: [PATCH 407/481] gitea.passthru.data-compressed: switch to compressDrvWeb --- pkgs/by-name/gi/gitea/package.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 4bb7c0014c0d..81625263a356 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -6,15 +6,13 @@ , git , bash , coreutils +, compressDrvWeb , gitea , gzip , openssh , pam , sqliteSupport ? true , pamSupport ? stdenv.hostPlatform.isLinux -, runCommand -, brotli -, xorg , nixosTests , buildNpmPackage }: @@ -90,19 +88,7 @@ in buildGoModule rec { ''; passthru = { - data-compressed = runCommand "gitea-data-compressed" { - nativeBuildInputs = [ brotli xorg.lndir ]; - } '' - mkdir -p $out/{options,public,templates} - lndir ${frontend}/public $out/public - lndir ${gitea.data}/options $out/options - lndir ${gitea.data}/templates $out/templates - - # Create static gzip and brotli files - find -L $out -type f -regextype posix-extended -iregex '.*\.(css|html|js|svg|ttf|txt)' \ - -exec gzip --best --keep --force {} ';' \ - -exec brotli --best --keep --no-copy-stat {} ';' - ''; + data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data); tests = nixosTests.gitea; }; From 959058c2c87978acd350227692151e4a0316c72b Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 4 Aug 2024 10:21:24 +0300 Subject: [PATCH 408/481] linuxManualConfig: remove "$src is not a directory" logspam --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 9c30f1fd70d0..5544409a74d6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -207,6 +207,10 @@ let for i in $(find arch -name install.sh); do patchShebangs "$i" done + + # unset $src because the build system tries to use it and spams a bunch of warnings + # see: https://github.com/torvalds/linux/commit/b1992c3772e69a6fd0e3fc81cd4d2820c8b6eca0 + unset src ''; configurePhase = '' From 319b2cb3aa6a9f97f770d7a00dacf6236b36c97c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 4 Aug 2024 09:24:01 +0200 Subject: [PATCH 409/481] b4: 0.14.0 -> 0.14.1 --- pkgs/development/tools/b4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 14336fc91dc3..8298ff4c2557 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KaMo0aZhwv9F4aya5ViTBwPxK6RLPZgfRJ9g6O48SUk="; + hash = "sha256-ZJ1TxkvOZWQWQrtQvAIN0G9cLXRH89GcrTuIbaIKgDE="; }; # tests make dns requests and fails From e9cd65dd16c1b0631d0554a727d9e84a7a69cf67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 08:03:26 +0000 Subject: [PATCH 410/481] libserdes: 7.6.2 -> 7.7.0 --- pkgs/development/libraries/libserdes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index ec66c2da3da0..38f7d1c5d934 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libserdes"; - version = "7.6.2"; + version = "7.7.0"; src = fetchFromGitHub { owner = "confluentinc"; From 5e763e941ced878490c6c9f5dccdc346237b360c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 08:22:02 +0000 Subject: [PATCH 411/481] networkmanager: 1.48.4 -> 1.48.6 --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 3cb389e0bd97..9a3e039267b6 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -60,11 +60,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.48.4"; + version = "1.48.6"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - hash = "sha256-8l81/i6hpHP30YTMxyyNStyXBZJv5POno8hUmUH1awM="; + hash = "sha256-5lxJbgZjGkl3x5XA8khZjDnDQOVjXXz1TsMHKsyZiZU="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From fefc54e71e05d788c4a7d5709cc8af46689e9844 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sun, 4 Aug 2024 11:33:50 +0300 Subject: [PATCH 412/481] mesonlsp: 4.3.1 -> 4.3.2 --- pkgs/by-name/me/mesonlsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/mesonlsp/package.nix b/pkgs/by-name/me/mesonlsp/package.nix index a8c11f03d41f..54741170ef8f 100644 --- a/pkgs/by-name/me/mesonlsp/package.nix +++ b/pkgs/by-name/me/mesonlsp/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mesonlsp"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "JCWasmx86"; repo = "mesonlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-L2aPjdKljPyyZBGqMB67nLnwB+B+XSlgbwuJENE9Mu4="; + hash = "sha256-hNQl6JhPC8/l/Y/gWWSFOXYM/s+Xzbs+JeWMN6CZVOw="; }; patches = [ ./disable-tests-that-require-network-access.patch ]; From 31ffcd4e6297c8536f2aa4457fa146ff62c32b99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 08:51:57 +0000 Subject: [PATCH 413/481] git-cola: 4.8.0 -> 4.8.1 --- pkgs/applications/version-management/git-cola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index 2bad97d7286c..3f36fa142c1e 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - hash = "sha256-sm/a790PiSqGYbftxvLiLMifKbMyi3a5Rvlhr9plyrU="; + hash = "sha256-3SCfsLYB4qhvsVo0Ji4WPwIDGcMwQ4M4zKnCOsXGTS0="; }; buildInputs = lib.optionals stdenv.isLinux [ From 96f5069dd04003ad40c9e08747317336642386d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:11:49 +0000 Subject: [PATCH 414/481] planify: 4.9.0 -> 4.10.5 --- pkgs/applications/office/planify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index b50bc9bb4e2c..f9227354deea 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.9.0"; + version = "4.10.5"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-zNQe0w8Vbe+ZIYTer1ISwJ6yA4dOdDtuWme5txcbY3w="; + hash = "sha256-tjU7/JZjJqH9H/EWMoAbRurJtIDv8BTT938EnJicTv4="; }; nativeBuildInputs = [ From a2424528a569987f39d38742454c09d2f4f6aa6f Mon Sep 17 00:00:00 2001 From: Aleksana Date: Sun, 4 Aug 2024 17:52:17 +0800 Subject: [PATCH 415/481] nixosTests.pixelfed: remove unused function argument --- nixos/tests/web-apps/pixelfed/standard.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/tests/web-apps/pixelfed/standard.nix b/nixos/tests/web-apps/pixelfed/standard.nix index 3e56dda8f07c..c575ee0b0f76 100644 --- a/nixos/tests/web-apps/pixelfed/standard.nix +++ b/nixos/tests/web-apps/pixelfed/standard.nix @@ -1,5 +1,4 @@ -import ../../make-test-python.nix ({pkgs, ...}: -{ +import ../../make-test-python.nix { name = "pixelfed-standard"; meta.maintainers = [ ]; @@ -35,4 +34,4 @@ import ../../make-test-python.nix ({pkgs, ...}: # server.succeed("pixelfed-manage passport:client --personal") # server.succeed("curl -H 'Host: pixefed.local' -H 'Accept: application/json' -H 'Authorization: Bearer secret' -F'status'='test' http://localhost/api/v1/statuses") ''; -}) +} From 5dee280b3d58edcca363e1297176256a79e33c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Aug 2024 03:23:03 -0700 Subject: [PATCH 416/481] python312Packages.breathe: modernize --- .../python-modules/breathe/default.nix | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 2281fbe3b314..4564364bfe5e 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,54 +2,57 @@ lib, buildPythonPackage, defusedxml, - docutils, fetchFromGitHub, fetchpatch, pytestCheckHook, pythonOlder, + setuptools, sphinx, }: buildPythonPackage rec { pname = "breathe"; version = "4.35.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "michaeljones"; - repo = pname; + owner = "breathe-doc"; + repo = "breathe"; rev = "refs/tags/v${version}"; hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; }; patches = [ + # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/964 (fetchpatch { - # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/956 - name = "breathe-sphinx7.2-support.patch"; - url = "https://github.com/breathe-doc/breathe/commit/46abd77157a2a57e81586e4f8765ae8f1a09d167.patch"; - hash = "sha256-zGFO/Ndk/9Yv2dbo8fpEoB/vchZP5vRceoC1E3sUny8="; + url = "https://github.com/breathe-doc/breathe/commit/caa8dc45222b35d360c24bf36835a7d8e6d86df2.patch"; + hash = "sha256-wWe4x4WwZTrDhNZAF7mhfHHNEjd+Kp4YXghL+DPa10w="; + }) + # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/976 + (fetchpatch { + url = "https://github.com/breathe-doc/breathe/commit/09c856bf72de41e82582f31855e916295ba6d382.patch"; + hash = "sha256-vU3DUrj4Jj4AUolFFtWmaLMf9RG7TmKqJe5sCwwRjPI="; }) ]; - propagatedBuildInputs = [ - docutils - sphinx + build-system = [ setuptools ]; + + dependencies = [ sphinx ]; + + nativeCheckInputs = [ + defusedxml + pytestCheckHook ]; - nativeCheckInputs = [ pytestCheckHook ]; - - checkInputs = [ defusedxml ]; - pythonImportsCheck = [ "breathe" ]; - meta = with lib; { + meta = { description = "Sphinx Doxygen renderer"; mainProgram = "breathe-apidoc"; - homepage = "https://github.com/michaeljones/breathe"; - license = licenses.bsd3; - maintainers = [ ]; - inherit (sphinx.meta) platforms; + homepage = "https://github.com/breathe-doc/breathe"; + license = lib.licenses.bsd3; + maintainers = lib.teams.sphinx.members; }; } From 67a87cc4c9bc6173b0261fe8104fabc29b5087f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Aug 2024 03:26:35 -0700 Subject: [PATCH 417/481] libxlsxwriter: 1.1.7 -> 1.1.8 Diff: https://github.com/jmcnamara/libxlsxwriter/compare/RELEASE_1.1.7...v1.1.8 Changelog: https://github.com/jmcnamara/libxlsxwriter/blob/refs/tags/v1.1.8/Changes.txt --- pkgs/development/libraries/libxlsxwriter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 6859caff61aa..b5128c1180e4 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; - rev = "RELEASE_${version}"; - hash = "sha256-bJ0NMbK9c21YYdcg/TW3ePSDVi5hly6lSW7wXFskI8M="; + rev = "refs/tags/v${version}"; + hash = "sha256-GtH8324whOUizGZTzQtD53WTy4BNPnpTSkCX/iOIolQ="; }; buildInputs = [ From 04564a105690cc2e03ec20f771905ca359773d6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 10:40:11 +0000 Subject: [PATCH 418/481] git-machete: 3.26.2 -> 3.26.3 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 6fb9f3b72a51..2eb80fa6b615 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.26.2"; + version = "3.26.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-AvHRl+xP4VSBP9p2BoRr/z/BT6c7zlOWUlWmfp5VvfA="; + hash = "sha256-UCaJiYLYeHI4R8IJfhgmT4Ji++CtQgvIJrKH1EXl83o="; }; nativeBuildInputs = [ installShellFiles ]; From 7bd0f2e9bf478c9f9bbe99b38c15273a18f87a14 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 4 Aug 2024 12:48:25 +0200 Subject: [PATCH 419/481] ngrok: 3.13.0 -> 3.14.0 --- pkgs/by-name/ng/ngrok/versions.json | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json index a049d26be676..1b1ef45e785c 100644 --- a/pkgs/by-name/ng/ngrok/versions.json +++ b/pkgs/by-name/ng/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/cYxmmhtKymA/ngrok-v3-3.13.0-linux-386", - "sha256": "f434e84e1e7a37aa9f35d9f3b6a1b3cb36374efbfc309fe2819e36608157ed90", - "version": "3.13.0" + "url": "https://bin.equinox.io/a/bCqkEJHChUv/ngrok-v3-3.14.0-linux-386", + "sha256": "0fc0fcb097ae9caa47b8887e4aca71ce3850bc97343cea93b8cf13d48d5d7c5a", + "version": "3.14.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/cL3Y3magKAa/ngrok-v3-3.13.0-linux-amd64", - "sha256": "cff5ff71db0191b8fcea1acdbbec70cd2cae57c670343161a9c10761d95a102e", - "version": "3.13.0" + "url": "https://bin.equinox.io/a/8oZyZn8Sh2k/ngrok-v3-3.14.0-linux-amd64", + "sha256": "80d5ea4de774ad7f579d7381a492b6531c1d83c2a0476d236bd87b1aaaac3c7e", + "version": "3.14.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/bsi3rM6xj2X/ngrok-v3-3.13.0-linux-arm", - "sha256": "5d82d847795ad85f0b7d8768e5f6fb8cd8668fc58e4f1434de4601b4e6c920af", - "version": "3.13.0" + "url": "https://bin.equinox.io/a/cMuwPWbrN4a/ngrok-v3-3.14.0-linux-arm", + "sha256": "8baeb05eab0bf3c4adde0a3aba63ec21cdd53f2ade8d1b556dea716597242fb1", + "version": "3.14.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/isHcV5N1inu/ngrok-v3-3.13.0-linux-arm64", - "sha256": "cc827724c59fe508cec6f8b16a22dba5c06171acadc224034679f9cc34b13c03", - "version": "3.13.0" + "url": "https://bin.equinox.io/a/3H9YcER9Em2/ngrok-v3-3.14.0-linux-arm64", + "sha256": "021e698af6ccff051184e72bf02de4a5ce45b8e4ace28e000f004e8af841db23", + "version": "3.14.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/bYybffm9EV8/ngrok-v3-3.13.0-darwin-amd64", - "sha256": "e03fff765e0af568f4131ccf3abe5c5f93fc3b0ebad5a10e115c8012cdb1482b", - "version": "3.13.0" + "url": "https://bin.equinox.io/a/25F8KjXtZLM/ngrok-v3-3.14.0-darwin-amd64", + "sha256": "f82d9521e8cb4d8e08b0a2b7d7f6ff4c4db2123c64d9e02ed59de71b8c6f98c5", + "version": "3.14.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/2w7pzTmD25A/ngrok-v3-3.13.0-darwin-arm64", - "sha256": "aa03fec3b1c111c799d0f5be95a80325ad08448a928b3985fa8a27578cf4b883", - "version": "3.13.0" + "url": "https://bin.equinox.io/a/3bTR91HsBHY/ngrok-v3-3.14.0-darwin-arm64", + "sha256": "da5112d50a4b4d27163373effff66a09acaa966a733be4197cc96ca5776432fa", + "version": "3.14.0" } } From 51f7dd585c0b294927bd391ba460bad9759b17de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 11:04:43 +0000 Subject: [PATCH 420/481] emacsPackages.voicemacs: 0-unstable-2022-02-16 -> 0-unstable-2024-01-03 --- .../elisp-packages/manual-packages/voicemacs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix index 593dac257976..dbbec44f9ccc 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix @@ -19,13 +19,13 @@ melpaBuild { pname = "voicemacs"; - version = "0-unstable-2022-02-16"; + version = "0-unstable-2024-01-03"; src = fetchFromGitHub { owner = "jcaw"; repo = "voicemacs"; - rev = "d91de2a31c68ab083172ade2451419d6bd7bb389"; - hash = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc="; + rev = "d93f15d855d61f78827d78c9ca3508766266366c"; + hash = "sha256-D/5+3SgECEb7A8qQqsAV1TQr+lA8EyOjf6NesnV2gos="; }; patches = [ From 1556ff12b6559fda76b6a7dbfd73fdc73061f1af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 11:08:09 +0000 Subject: [PATCH 421/481] emacsPackages.font-lock-plus: 208-unstable-2018-01-01 -> 208-unstable-2022-04-02 --- .../manual-packages/font-lock-plus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix index d7e8390b40b8..93d963a09e08 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "font-lock-plus"; ename = "font-lock+"; - version = "208-unstable-2018-01-01"; + version = "208-unstable-2022-04-02"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "font-lock-plus"; - rev = "f2c1ddcd4c9d581bd32be88fad026b49f98b6541"; - hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4="; + rev = "aa1c82d05c9222b09099a0ccd7468e955497940c"; + hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw="; }; passthru.updateScript = unstableGitUpdater { }; From 11da2254d641e8a6aac5d8eae41bdc5feec7ba3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 4 Aug 2024 04:05:31 -0700 Subject: [PATCH 422/481] python312Packages.rapidfuzz: 3.9.4 -> 3.9.5 Diff: https://github.com/maxbachmann/RapidFuzz/compare/refs/tags/v3.9.4...v3.9.5 Changelog: https://github.com/maxbachmann/RapidFuzz/blob/refs/tags/v3.9.5/CHANGELOG.rst --- pkgs/development/python-modules/rapidfuzz/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 4fe45a1dfa44..4da9eb0bd17d 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.4"; + version = "3.9.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,12 +28,13 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-Af5WTmvUVO91GfnnjVnShMB188XINBdmk2NWC80REdI="; + hash = "sha256-uoiXUE36FjIzYrcoqVnHF5RpNeYm8Nkied9UzaEGeSY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "Cython >=3.0.9, <3.1.0" "Cython" + --replace-fail "scikit-build~=0.18.0" "scikit-build" \ + --replace-fail "Cython >=3.0.10, <3.1.0" "Cython" ''; build-system = [ From 53bdde4918abe5915e3a13a5e701f866143ac003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 11:12:03 +0000 Subject: [PATCH 423/481] ledger-live-desktop: 2.84.0 -> 2.84.1 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index fc1b2d298866..ce40616c5e40 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.84.0"; + version = "2.84.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-VqPiFcquR1AbtH3oZJ5l+/KmvFUGCdBrwZuPAJ+26nw="; + hash = "sha256-V/bOCddc7UhmN8zlHmKj+H4v+ZZ/qn8jRj0jH4EtwMI="; }; appimageContents = appimageTools.extractType2 { From 52ec421a000b621f2097e89944f07f1260c760bb Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:28:52 +0200 Subject: [PATCH 424/481] bazecor: move to by-name --- pkgs/{applications/misc => by-name/ba}/bazecor/10-dygma.rules | 0 .../misc/bazecor/default.nix => by-name/ba/bazecor/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/ba}/bazecor/10-dygma.rules (100%) rename pkgs/{applications/misc/bazecor/default.nix => by-name/ba/bazecor/package.nix} (100%) diff --git a/pkgs/applications/misc/bazecor/10-dygma.rules b/pkgs/by-name/ba/bazecor/10-dygma.rules similarity index 100% rename from pkgs/applications/misc/bazecor/10-dygma.rules rename to pkgs/by-name/ba/bazecor/10-dygma.rules diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/by-name/ba/bazecor/package.nix similarity index 100% rename from pkgs/applications/misc/bazecor/default.nix rename to pkgs/by-name/ba/bazecor/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c1fc93249ff..09ec5802f303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -334,8 +334,6 @@ with pkgs; bakelite = callPackage ../tools/backup/bakelite { }; - bazecor = callPackage ../applications/misc/bazecor { }; - bearer = callPackage ../development/tools/bearer { }; benthos = callPackage ../development/tools/benthos { }; From 13a894ff1ced5e49359bff45b46e368b05dfd299 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:10 +0200 Subject: [PATCH 425/481] cddl: move to by-name --- pkgs/{development/tools => by-name/cd}/cddl/Gemfile | 0 pkgs/{development/tools => by-name/cd}/cddl/Gemfile.lock | 0 pkgs/{development/tools => by-name/cd}/cddl/gemset.nix | 0 .../tools/cddl/default.nix => by-name/cd/cddl/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{development/tools => by-name/cd}/cddl/Gemfile (100%) rename pkgs/{development/tools => by-name/cd}/cddl/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/cd}/cddl/gemset.nix (100%) rename pkgs/{development/tools/cddl/default.nix => by-name/cd/cddl/package.nix} (100%) diff --git a/pkgs/development/tools/cddl/Gemfile b/pkgs/by-name/cd/cddl/Gemfile similarity index 100% rename from pkgs/development/tools/cddl/Gemfile rename to pkgs/by-name/cd/cddl/Gemfile diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/by-name/cd/cddl/Gemfile.lock similarity index 100% rename from pkgs/development/tools/cddl/Gemfile.lock rename to pkgs/by-name/cd/cddl/Gemfile.lock diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/by-name/cd/cddl/gemset.nix similarity index 100% rename from pkgs/development/tools/cddl/gemset.nix rename to pkgs/by-name/cd/cddl/gemset.nix diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/by-name/cd/cddl/package.nix similarity index 100% rename from pkgs/development/tools/cddl/default.nix rename to pkgs/by-name/cd/cddl/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09ec5802f303..04fdab284479 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4460,8 +4460,6 @@ with pkgs; cbftp = callPackage ../tools/networking/cbftp { }; - cddl = callPackage ../development/tools/cddl { }; - cedille = callPackage ../applications/science/logic/cedille { inherit (haskellPackages) alex happy Agda ghcWithPackages; }; From 9ca37768272983b28ee60cd4815b3a6fe55c3825 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:18 +0200 Subject: [PATCH 426/481] gh-actions-cache: move to by-name --- .../default.nix => by-name/gh/gh-actions-cache/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/gh-actions-cache/default.nix => by-name/gh/gh-actions-cache/package.nix} (100%) diff --git a/pkgs/tools/misc/gh-actions-cache/default.nix b/pkgs/by-name/gh/gh-actions-cache/package.nix similarity index 100% rename from pkgs/tools/misc/gh-actions-cache/default.nix rename to pkgs/by-name/gh/gh-actions-cache/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04fdab284479..43aa1cedfbcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1783,8 +1783,6 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; - gh-actions-cache = callPackage ../tools/misc/gh-actions-cache { }; - gh-cal = callPackage ../tools/misc/gh-cal { inherit (darwin.apple_sdk.frameworks) Security; }; From 5781e6b0049bf47e5d46196147842f3fcfa26c72 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:31 +0200 Subject: [PATCH 427/481] gh-dash: move to by-name --- .../misc/gh-dash/default.nix => by-name/gh/gh-dash/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/gh-dash/default.nix => by-name/gh/gh-dash/package.nix} (100%) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/by-name/gh/gh-dash/package.nix similarity index 100% rename from pkgs/tools/misc/gh-dash/default.nix rename to pkgs/by-name/gh/gh-dash/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43aa1cedfbcc..7045414b4b86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1787,8 +1787,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - gh-dash = callPackage ../tools/misc/gh-dash { }; - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; ghostie = callPackage ../tools/misc/ghostie { }; From 0f05f31b4dea7ee3461c162fbe6dde2f5b035027 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:49 +0200 Subject: [PATCH 428/481] gh-markdown-preview: move to by-name --- .../default.nix => by-name/gh/gh-markdown-preview/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/gh-markdown-preview/default.nix => by-name/gh/gh-markdown-preview/package.nix} (100%) diff --git a/pkgs/tools/misc/gh-markdown-preview/default.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix similarity index 100% rename from pkgs/tools/misc/gh-markdown-preview/default.nix rename to pkgs/by-name/gh/gh-markdown-preview/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7045414b4b86..95edf6d6994c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1787,8 +1787,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; - ghostie = callPackage ../tools/misc/ghostie { }; glooctl = callPackage ../applications/networking/cluster/glooctl { }; From 444a6ef6616838c19a9ac728eccb7f8ef48241bd Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:57 +0200 Subject: [PATCH 429/481] latte-integrale: move to by-name --- .../default.nix => by-name/la/latte-integrale/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/science/math/latte-integrale/default.nix => by-name/la/latte-integrale/package.nix} (100%) diff --git a/pkgs/development/libraries/science/math/latte-integrale/default.nix b/pkgs/by-name/la/latte-integrale/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/latte-integrale/default.nix rename to pkgs/by-name/la/latte-integrale/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95edf6d6994c..c47365e3d0a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37404,8 +37404,6 @@ with pkgs; rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; - latte-integrale = callPackage ../development/libraries/science/math/latte-integrale { }; - lcalc = callPackage ../development/libraries/science/math/lcalc { }; lrcalc = callPackage ../applications/science/math/lrcalc { }; From a2a6e797ac0a5b136b93eb4437fd4f3ce4c787c0 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:30:04 +0200 Subject: [PATCH 430/481] scriv: move to by-name --- .../scriv/default.nix => by-name/sc/scriv/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/scriv/default.nix => by-name/sc/scriv/package.nix} (100%) diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/by-name/sc/scriv/package.nix similarity index 100% rename from pkgs/applications/version-management/scriv/default.nix rename to pkgs/by-name/sc/scriv/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c47365e3d0a8..794f5f2be7c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2983,8 +2983,6 @@ with pkgs; sakura = callPackage ../applications/terminal-emulators/sakura { }; - scriv = callPackage ../applications/version-management/scriv { }; - st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; From dd2019b0c0d3e2be73e386171886442c1b0fe456 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:30:31 +0200 Subject: [PATCH 431/481] tandem-aligner: move to by-name --- .../default.nix => by-name/ta/tandem-aligner/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/biology/tandem-aligner/default.nix => by-name/ta/tandem-aligner/package.nix} (100%) diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/by-name/ta/tandem-aligner/package.nix similarity index 100% rename from pkgs/applications/science/biology/tandem-aligner/default.nix rename to pkgs/by-name/ta/tandem-aligner/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 794f5f2be7c8..f9ba016f03b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37266,8 +37266,6 @@ with pkgs; svaba = callPackage ../applications/science/biology/svaba { }; - tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; - tebreak = callPackage ../applications/science/biology/tebreak { }; treemix = callPackage ../applications/science/biology/treemix { }; From e51da07c01f082367d11c2f16c198e508e8c4389 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 11:57:17 +0000 Subject: [PATCH 432/481] handlr-regex: 0.10.1 -> 0.11.2 --- pkgs/by-name/ha/handlr-regex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix index 2d42ed39241e..5e8e4d76ee6b 100644 --- a/pkgs/by-name/ha/handlr-regex/package.nix +++ b/pkgs/by-name/ha/handlr-regex/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "handlr-regex"; - version = "0.10.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "Anomalocaridid"; repo = pname; rev = "v${version}"; - hash = "sha256-6ASljvJF/qbl8nvAZKQ2rQ8CQPovTF7FLKp8enIjIP4="; + hash = "sha256-xYt+pntqfq1RwaLAoTIH6zaJZWgyl58I/2xWCWe+bBs="; }; - cargoHash = "sha256-4tm7N8l7ScKhhOFxt/1ssArdF9fgvCyrDrBASaiOusI="; + cargoHash = "sha256-w5eZm+wHx4aU6zsNZhg8mehDSzpd6k6PpV/V7tzukIA="; nativeBuildInputs = [ installShellFiles From 2bb681036a342b1cebfc1ec59bf70fbbc5de9f4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 12:17:41 +0000 Subject: [PATCH 433/481] asm-lsp: 0.7.3 -> 0.7.4 --- pkgs/by-name/as/asm-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 24e561e132a7..0f5be37795a5 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -6,7 +6,7 @@ }: let pname = "asm-lsp"; - version = "0.7.3"; + version = "0.7.4"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { owner = "bergercookie"; repo = "asm-lsp"; rev = "v${version}"; - hash = "sha256-LWsawBh1czS7LUX70IXrJHUonIt2XEN8L26iP5cVyRk="; + hash = "sha256-tgwiCAlHuFdeMr1GA4vPg8i94zfRj+uyPMAXYh+Smo4="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-pIjOelOQ5X8jl/ZtE8IzXPtcLmANDtWsJaNXno8CT6Y="; + cargoHash = "sha256-UBYD0rs7bEtVZatu/kRgyCwKHvcgYJWRgyfBi3ooPGQ="; # tests expect ~/.cache/asm-lsp to be writable preCheck = '' From 285ee47a61618cbb94ecb0521b0f0699197138e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 12:22:25 +0000 Subject: [PATCH 434/481] age-plugin-yubikey: 0.4.0 -> 0.5.0 --- pkgs/tools/security/age-plugin-yubikey/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/age-plugin-yubikey/default.nix b/pkgs/tools/security/age-plugin-yubikey/default.nix index 0942848e02e5..e69d4dc789fb 100644 --- a/pkgs/tools/security/age-plugin-yubikey/default.nix +++ b/pkgs/tools/security/age-plugin-yubikey/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "age-plugin-yubikey"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - hash = "sha256-V3NzZyCfslUBsARO5UC8N+cuptLxg2euM87DGqtLpPk="; + hash = "sha256-9ghnPe83K+qixaFKCdM2FCPoENTNJnZA+OmmpD0E5LE="; }; - cargoHash = "sha256-5qmwCcrhDkJlyeTS+waMiTxro1HjMHiQE5Ds/4sVpx4="; + cargoHash = "sha256-8petNuCJ1qS6XKt+24Lg/bZh96yj9oO6fu/z65Xhi4k="; nativeBuildInputs = [ pkg-config From aae29fb61395143b66fc6ae65ca331dd2ecf6f5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 12:55:16 +0000 Subject: [PATCH 435/481] python312Packages.neo: 0.13.1 -> 0.13.2 --- pkgs/development/python-modules/neo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 725aa1f5d99a..f910ac452d69 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "neo"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gVhbKLZaTciakucc7TlCxdv9qnG90sw4U3G3ebVlTK0="; + hash = "sha256-aYDZVC55XVNR/VtdnTlBBKR/MNDvfwUR+spqe14ncrw="; }; nativeBuildInputs = [ setuptools ]; From 9551c76ef59922514719db6a6466ccd85bf69def Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 12:55:16 +0000 Subject: [PATCH 436/481] python312Packages.imread: 0.7.5 -> 0.7.6 --- pkgs/development/python-modules/imread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index d8a3c80a30b7..98ae59f9a4cd 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "imread"; - version = "0.7.5"; + version = "0.7.6"; pyproject = true; src = fetchPypi { inherit version; pname = "imread"; - hash = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; + hash = "sha256-ULPXCJyGJQTCKyVu9R/kWFGzRhbbFMDr/FU2AByZYBU="; }; nativeBuildInputs = [ From 3e3b4c910c50d30045f0d24684477a309d71e4d6 Mon Sep 17 00:00:00 2001 From: imxyy_soope_ <3516554684@qq.com> Date: Sun, 4 Aug 2024 21:18:28 +0800 Subject: [PATCH 437/481] hmcl: 3.5.8 -> 3.5.9 hmcl: add missing glib dependency --- pkgs/games/hmcl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index 3ac7b9a96cda..69b546183406 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -7,6 +7,7 @@ , imagemagick , jre , xorg +, glib , libGL , glfw , openal @@ -18,7 +19,7 @@ }: let - version = "3.5.8"; + version = "3.5.9"; icon = fetchurl { url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico"; hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; @@ -30,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar"; - hash = "sha256-HRTXJhKtRB+pANMAZ9R1kNsSbl/Rr6a8wMhfaPeD/40="; + hash = "sha256-iaOg0OiGEdS0E7UTanZkciWDHqeZoAdBM3ghH10Wbd8="; }; dontUnpack = true; @@ -71,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: { libpath = lib.makeLibraryPath ([ libGL glfw + glib openal libglvnd ] ++ lib.optionals stdenv.isLinux [ From 69e6cb019d1650d830e0564951cec72125064854 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 4 Aug 2024 15:46:55 +0200 Subject: [PATCH 438/481] vscode-extensions.github.copilot: 1.219.1019 -> 1.219.1028 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index df78bad7c60a..3e067de3610c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2020,8 +2020,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.219.1019"; # compatible with vscode ^1.91.0 - hash = "sha256-W39hZyJ5XtDghkKu4Ml99M0/jZ1tVMGesKAKPquTkb8="; + version = "1.219.1028"; # compatible with vscode ^1.92.0 + hash = "sha256-5f1P/CV6+Rp2kS9oSz5Ko5jMUt/Q6pWa9a+3nPyin6k="; }; meta = { From a0a6480042b517197a77b96b6b12ade26af35f60 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 4 Aug 2024 15:47:01 +0200 Subject: [PATCH 439/481] vscode-extensions.github.copilot-chat: 0.17.2024062801 -> 0.19.2024073102 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3e067de3610c..72051a629fbd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2037,8 +2037,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.17.2024062801"; # compatible with vscode ^1.91.0 - hash = "sha256-aDTqHDGdWE/CG5bt/9um62sGFngHsJJvTl38NEqNq8E="; + version = "0.19.2024073102"; # compatible with vscode ^1.92.0 + hash = "sha256-ekRBmJiAav1gITWlqBOuWtZMt1YZeseF+3fw326db/s="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; From e85e1bc098be4f24554e40adc7a6b35a0957364b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 3 Aug 2024 17:44:48 +0200 Subject: [PATCH 440/481] python312Packages.diagrams-as-code: init at 0.0.4 --- pkgs/by-name/di/diagrams-as-code/package.nix | 57 ++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/di/diagrams-as-code/package.nix diff --git a/pkgs/by-name/di/diagrams-as-code/package.nix b/pkgs/by-name/di/diagrams-as-code/package.nix new file mode 100644 index 000000000000..cbce445d630a --- /dev/null +++ b/pkgs/by-name/di/diagrams-as-code/package.nix @@ -0,0 +1,57 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + runCommand, + diagrams-as-code, +}: + +python3Packages.buildPythonPackage rec { + pname = "diagrams-as-code"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dmytrostriletskyi"; + repo = "diagrams-as-code"; + rev = "refs/tags/v${version}"; + hash = "sha256-cd602eQvNCUQuCdn/RpcfURcDHjXLZ0gAG+SObB++Q0="; + }; + + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ + diagrams + pydantic + pyyaml + ]; + + pythonRelaxDeps = [ + "diagrams" + "pydantic" + ]; + + pythonImportsCheck = [ "diagrams_as_code" ]; + + doCheck = false; # no tests + + passthru.tests = { + simple = runCommand "${pname}-test" { } '' + # giving full path to diagrams-as-code causes + # a bad path concatenation + cp ${diagrams-as-code.src}/examples/all-fields.yaml . + + ${lib.getExe diagrams-as-code} all-fields.yaml + + cp web-services-architecture-aws.jpg $out + ''; + }; + + meta = { + description = "Declarative configurations using YAML for drawing cloud system architectures"; + homepage = "https://github.com/dmytrostriletskyi/diagrams-as-code"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "diagrams-as-code"; + }; +} From 387225c2735a2da667e82dcb64955601fbeec02d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 16:11:42 +0200 Subject: [PATCH 441/481] metasploit: 6.4.18 -> 6.4.20 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 10 +++++----- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index faeeaec76b95..776c28996f05 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.18" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.20" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 636318cae311..b83ecaba78e9 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 5426fc47cdc588a0f51617712b2419bd1fefe630 - ref: refs/tags/6.4.18 + revision: c364b32438a2e9844762afb4fd178ad98e72822f + ref: refs/tags/6.4.20 specs: - metasploit-framework (6.4.18) + metasploit-framework (6.4.20) aarch64 abbrev actionpack (~> 7.0.0) @@ -31,7 +31,7 @@ GIT faraday (= 2.7.11) faraday-retry faye-websocket - ffi (= 1.16.3) + ffi (< 1.17.0) filesize getoptlong hrr_rb_ssh-ed25519 @@ -485,4 +485,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.5.11 + 2.5.16 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index f7c5d27e8105..b95e8d6e846d 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.18"; + version = "6.4.20"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-56WvRpsqX//yyv7ymGAs1fWFolqJM0JXXSDIb1cHJxs="; + hash = "sha256-fmWe4vyGwUPof3bBRGYBnarPulx3kL3QW7yQQdi9LEQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index e9b9596cf9d8..b991b3aa61d7 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "5426fc47cdc588a0f51617712b2419bd1fefe630"; - sha256 = "06r70xbnzj10bmbl4cw9bai8bxfm5ih9iwpyrbrgyprakd3az9g7"; + rev = "c364b32438a2e9844762afb4fd178ad98e72822f"; + sha256 = "0i1cppc4345wbg8bv43pbjxczalx05k49hbngzl47hc6zki9wrby"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.18"; + version = "6.4.20"; }; metasploit-model = { groups = ["default"]; From aef47a2d1b519dea7d7633fad9eef824b81b3aa0 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sun, 4 Aug 2024 16:21:37 +0200 Subject: [PATCH 442/481] cosmic-icons: 0-unstable-2024-07-04 -> 0-unstable-2024-08-04 --- pkgs/by-name/co/cosmic-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 4af5db06b4ac..8b5c0aef72f9 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "cosmic-icons"; - version = "0-unstable-2024-07-17"; + version = "0-unstable-2024-08-04"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "73be037ba266b08a2fa7b544d78e7f143a2894c5"; - sha256 = "sha256-Lyn9VneGr7RcfMPREOs3tP/HzpoRcnmw/nyo7kzOKCw="; + rev = "f93dcdfa1060c2cf3f8cf0b56b0338292edcafa5"; + sha256 = "sha256-KvEKFmsh7ljt9JbaqyZfTUiFZHZM2Ha1TwUDljXXLDw="; }; nativeBuildInputs = [ just ]; From 27df88c488a4fbcf642084bcc6641590465f6cd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 16:44:15 +0200 Subject: [PATCH 443/481] python312Packages.neo: refactor --- pkgs/development/python-modules/neo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index f910ac452d69..4358aef2f555 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -24,9 +24,9 @@ buildPythonPackage rec { hash = "sha256-aYDZVC55XVNR/VtdnTlBBKR/MNDvfwUR+spqe14ncrw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numpy packaging quantities From 2fec6104fefe6baf4e020e266ddd585969d78192 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 16:51:26 +0200 Subject: [PATCH 444/481] python312Packages.imread: refactor - add changelog to meta --- .../development/python-modules/imread/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 98ae59f9a4cd..632a3aefb8d9 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -18,15 +18,13 @@ buildPythonPackage rec { pyproject = true; src = fetchPypi { - inherit version; - pname = "imread"; + inherit pname version; hash = "sha256-ULPXCJyGJQTCKyVu9R/kWFGzRhbbFMDr/FU2AByZYBU="; }; - nativeBuildInputs = [ - pkg-config - setuptools - ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg @@ -35,7 +33,7 @@ buildPythonPackage rec { libwebp ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -56,7 +54,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to load images as numpy arrays"; - homepage = "https://imread.readthedocs.io/en/latest/"; + homepage = "https://imread.readthedocs.io/"; + changelog = "https://github.com/luispedro/imread/blob/v${version}/ChangeLog"; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; platforms = platforms.unix; From 2f0e580ad336889ba2c6789f38f177090d97b1a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 14:53:36 +0000 Subject: [PATCH 445/481] python312Packages.grpcio-testing: 1.65.1 -> 1.65.4 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index de158fed55a1..7e4c7d8b206e 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.65.1"; + version = "1.65.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-AdYhmtubPYxmrGYIbd5LpSu28icVxMzeYO7Qp4RQysE="; + hash = "sha256-iCbY9Ika+NWuBuFqt+FG+8VZTvQZMj4wMW9NDdBnWcY="; }; postPatch = '' From c78eab1d149491c695fc65898c80ae1055ebc24e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 14:54:45 +0000 Subject: [PATCH 446/481] python312Packages.grpcio-channelz: 1.65.1 -> 1.65.4 --- pkgs/development/python-modules/grpcio-channelz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 8b2ea274b96b..3c72da10f9d8 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.65.1"; + version = "1.65.4"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-LAAFFlzWYPooRJeoDD4izW+0TscLq9FAQUM+vhXu/Ag="; + hash = "sha256-Ia92P8FT3+bv18k402znrt3QTDovPBCgCJ/Eqm8WDic="; }; build-system = [ setuptools ]; From 2ae76df49e315fb3529eb70cbf3e2b763f53882c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 14:55:19 +0000 Subject: [PATCH 447/481] python312Packages.grpcio-reflection: 1.65.1 -> 1.65.4 --- pkgs/development/python-modules/grpcio-reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index dc6aa0d3e90d..3ed0064e081f 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.65.1"; + version = "1.65.4"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-5q5ZAPnYAdyXApglUEL7xCaBVG904IwjNt/9Brl2Wr8="; + hash = "sha256-jGuWDD9DBoHoivWfafq1pXW3eyn1xqHXFuqsXPHBpJ0="; }; build-system = [ setuptools ]; From cf887aa12d08a1adc4e23396591d8aea9d1e8b3e Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 4 Aug 2024 18:18:24 +0300 Subject: [PATCH 448/481] ktailctl: 0.17.1 -> 0.17.2 --- pkgs/applications/networking/ktailctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index 155e415e02bc..d66e8586a6e3 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -23,20 +23,20 @@ }: let - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-urB8NcdQMF6RNX8F2CpzOd0ZkRi3IS4XFyOOXIeChpY="; + hash = "sha256-jACcTRIdzYiSLy7zw5QuDu9tZfee9ufhlEecbTbSr+4="; }; goDeps = (buildGoModule { pname = "ktailctl-go-wrapper"; inherit src version; modRoot = "src/wrapper"; - vendorHash = "sha256-Ls4MVppMJbUUukaKkDAN8Lx/s09JRJTf/RMgk0iDcnw="; + vendorHash = "sha256-V4Bn5/VaoFOZlNGBedA4Ly8Kocw0BWyfIHv8IU6Eay4="; }).goModules; in stdenv.mkDerivation { From bf74ddc5f21ac051de69146d46d34c0937ece570 Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Thu, 1 Aug 2024 19:11:48 +0200 Subject: [PATCH 449/481] just: 1.32.0 -> 1.34.0 --- pkgs/by-name/ju/just/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 6b0668187d1c..08c1c248c382 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.32.0"; + version = "1.34.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4W0Ft4wM2iLeepqg9XnHV/uejJEE9gIBOwm7axnC8bo="; + hash = "sha256-fAzBAiF7eVl5tieSH0m3Wa9UWthVjX7e5tAex5peRQw="; }; - cargoHash = "sha256-kjvc87HKMoKWImeAMiESb7xHuA+znX5z6MsWu6ThrhE="; + cargoHash = "sha256-v3z0Md66fzT0JQfVfISPqhJAunYHl8UmpYL1ASVWxVU="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 0b6a95fb6280a14e7994fa9c140de5aa17c8d32c Mon Sep 17 00:00:00 2001 From: Jaakko Paju <36770267+JPaju@users.noreply.github.com> Date: Sun, 4 Aug 2024 18:41:31 +0300 Subject: [PATCH 450/481] metals: 1.3.4 -> 1.3.5 --- pkgs/development/tools/language-servers/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index d17e4fe88e75..708d62d2ec7b 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.3.4"; + version = "1.3.5"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-g3nOqqoNjZ/lURPO3NVXqmlIbFtwRgKCaz7CJXU1Ups="; + outputHash = "sha256-86/zeoOO5kSAwh7uQTV7nGUGQoIux1rlH5eUgvn3kvY="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; From 160b173705f3f5686a9a2058ec16e8ce1e1229e5 Mon Sep 17 00:00:00 2001 From: jacobi petrucciani Date: Sun, 4 Aug 2024 12:08:40 -0400 Subject: [PATCH 451/481] python312Packages.gamble: 0.13 -> 0.14.0 --- pkgs/development/python-modules/gamble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gamble/default.nix b/pkgs/development/python-modules/gamble/default.nix index 088e253def72..4f39dd06556b 100644 --- a/pkgs/development/python-modules/gamble/default.nix +++ b/pkgs/development/python-modules/gamble/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "gamble"; - version = "0.13"; + version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "jpetrucciani"; repo = "gamble"; rev = "refs/tags/${version}"; - hash = "sha256-eHosY/JfJr317S7WI8phy7DNHf3cZzs6c5MMfw7yzAE="; + hash = "sha256-vzaY5gJ0Ou2ArUJ0kuTWzTeLfiRDhUt/Hxpns9rFiDk="; }; build-system = [ poetry-core ]; From 90cdc2afab40aae177e4bafd16f35b3a71a7283b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 16:09:04 +0000 Subject: [PATCH 452/481] python312Packages.pypinyin: 0.51.0 -> 0.52.0 --- pkgs/development/python-modules/pypinyin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 001474532af2..e51909faab5b 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.51.0"; + version = "0.52.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - hash = "sha256-kbUVif3a3L7BHj1b37FME5wicalK/iild0pvwPawr6Q="; + hash = "sha256-XoRH9vBO0vJl7DqgGrFLfxGFtiQTpXdZoM4FO3TFWeY="; }; postPatch = '' From 14a7ff97f6ce6d4c841ade6b0d1be621ff0db786 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 18:26:28 +0200 Subject: [PATCH 453/481] python312Packages.archinfo: 9.2.112 -> 9.2.113 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.112...v9.2.113 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index dc417d723e99..7f4cee89996d 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.112"; + version = "9.2.113"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-L//vOpW3iKQyWnB0rjBIXMeL/9meMcv58DBD/84GGR0="; + hash = "sha256-+cI6aZZxP8501UkiyKaP2nXulT8CVMImLUXkN7sy5i0="; }; build-system = [ setuptools ]; From f9af41d347511de18a422e0293fe8f26c3726f3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 18:26:36 +0200 Subject: [PATCH 454/481] python312Packages.ailment: 9.2.112 -> 9.2.113 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.112...v9.2.113 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 96c4708c3145..c2b1ad98dacc 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.112"; + version = "9.2.113"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-R1Tvo4xqxKB2yQypiOtmuCzujE1DhHo2kPQUL7RuWGk="; + hash = "sha256-vrCWGteCVhvEYgXQTcJdeWxF9hkmk2Y8b5Bend4cv34="; }; build-system = [ setuptools ]; From b09ae5b2e827798636e5ad62321c332a18304b4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 18:28:07 +0200 Subject: [PATCH 455/481] python312Packages.pyvex: 9.2.112 -> 9.2.113 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index fc0a3830e73f..a35c477f85ea 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.112"; + version = "9.2.113"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-IxrH8Ej1PmyQXtS7CROvxopf9tmjKiOYqwfAc6mLMnw="; + hash = "sha256-mmtRFY++zxc97hgc7aVzRd+M5vHqkgNARfznrL2yLZg="; }; build-system = [ setuptools ]; From 5ee991fa970a70bed423c63c59ce3cd8e1124abc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 18:29:59 +0200 Subject: [PATCH 456/481] python312Packages.cle: 9.2.112 -> 9.2.113 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.112...v9.2.113 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index bd7a2ba4d703..d5d425dfb5ab 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.112"; + version = "9.2.113"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-uVoM6Ae8r9xQ4+EzdQ5A3OrpOdt6hhJATvuzSZVxvy8="; + hash = "sha256-SlML9os4ThZML77SBg2VosGzKWZdb1p9ClDf6nfB+yQ="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-Gdj3LVIYQKhDN5Dnw06D96wmvExyN5/OmNPu/EJeKw0="; + hash = "sha256-wyowItw7KgcIl0nu57s1cDdZc0oFQaL9yRxPa1Wjx90="; }; build-system = [ setuptools ]; From ae232be56012ae234e41a6b8ad4e7d051e0b0170 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 18:31:31 +0200 Subject: [PATCH 457/481] python312Packages.claripy: 9.2.112 -> 9.2.113 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.112...v9.2.113 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index efcf200f4d41..2ed176900d84 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.112"; + version = "9.2.113"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-UfHTV1I3V5NpeKAjXkQmaX6d/f7o+9QOsh1y2Ws02DA="; + hash = "sha256-lGXxu6xI0ndMH9/S8uQCqvpV0mStNzMsCT5mXjBgP9Q="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 9e30dfa2e00a520701ff14d1600eb835de6b0b9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 18:46:15 +0200 Subject: [PATCH 458/481] python311Packages.angr: 9.2.112 -> 9.2.113 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.112...v9.2.113 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 6f715ccbf160..cca249a6e187 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.112"; + version = "9.2.113"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-OrLkKPQFhcDv/9Rj8c6UYhS5QbpjfEXBSAK61Y1I6YQ="; + hash = "sha256-vj166aUVjyce3EJE/d8aY90Ho1VaIgiqRYGep1gNoW0="; }; pythonRelaxDeps = [ "capstone" ]; From 3a719e06c700c84ec93bfd6c1f4da2f1c8ee21d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Aug 2024 18:51:41 +0200 Subject: [PATCH 459/481] nixos/mediawiki: move to php 8.2 There is breakage on PHP 8.1 since the last staging cycle. --- nixos/modules/services/web-apps/mediawiki.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 600ad3053605..22e61ea3a683 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -19,7 +19,7 @@ let stateDir = "/var/lib/mediawiki"; # https://www.mediawiki.org/wiki/Compatibility - php = pkgs.php81; + php = pkgs.php82; pkg = pkgs.stdenv.mkDerivation rec { pname = "mediawiki-full"; From fb78d2fa03d46f5338c9aa6b6ba305fc595cdab5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 17:23:46 +0000 Subject: [PATCH 460/481] python312Packages.grpcio-health-checking: 1.65.1 -> 1.65.4 --- .../python-modules/grpcio-health-checking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index dc48f8799245..f23b61a8b803 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.65.1"; + version = "1.65.4"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-rl8gkRDLLdOFMxqYmrY1SO/AvfhGjNj1Z3+9gCKXOHY="; + hash = "sha256-HoQfbbBaAFGmLMSNQN0tzJ5xdYS7GQSa1R+2cygbnEo="; }; propagatedBuildInputs = [ From c049585eafa9ad783a5636147bc9f19236a383d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 17:31:03 +0000 Subject: [PATCH 461/481] python312Packages.fastcore: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 2dad1964f608..181cf1cab490 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-dVzJtYnsezk7Pb5Y59BUY8TQ/3Z5JLntqjld2zJk6pA="; + hash = "sha256-Ir9cvOTijWv6giFmfiy3juIPZbXekiIehQNulMEqevA="; }; build-system = [ setuptools ]; From 6fcf6083a0970d46cb4dc0886b2dec5528335df4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Aug 2024 20:10:10 +0200 Subject: [PATCH 462/481] thunderbird: 115.13.0 -> 128.0.1esr Migrate to the new ESR track. People who experience issues can pin thunderbird-115 for until the end of september. --- .../networking/mailreaders/thunderbird/packages.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1dce8f5304be..ecfc00f958b2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -47,7 +47,7 @@ let }; in rec { - thunderbird = thunderbird-115; + thunderbird = thunderbird-128; thunderbird-115 = common { version = "115.13.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 150c5785dcc0..82f36e8782f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34103,6 +34103,7 @@ with pkgs; thunderbird-unwrapped = thunderbirdPackages.thunderbird; thunderbird = wrapThunderbird thunderbird-unwrapped { }; + thunderbird-115 = wrapThunderbird thunderbirdPackages.thunderbird-115 { }; thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { }; thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped { From 4635f43856b5dbe99c81414f347fecf8340b71eb Mon Sep 17 00:00:00 2001 From: Armin Date: Sat, 3 Aug 2024 20:56:10 +0200 Subject: [PATCH 463/481] maintainers: add 1nv0k32 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fb83381fd0ea..e0eedeac1147 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -159,6 +159,12 @@ github = "13r0ck"; githubId = 58987761; }; + _1nv0k32 = { + name = "Armin"; + email = "Armin.Mahdilou@gmail.com"; + github = "1nv0k32"; + githubId = 30079271; + }; _21CSM = { name = "21CSM"; email = "21CSM@tutanota.com"; From 04812261f57e4ddc877fc6e5c80174e7fe1e6c5f Mon Sep 17 00:00:00 2001 From: Armin Date: Sat, 3 Aug 2024 20:56:20 +0200 Subject: [PATCH 464/481] alpaca-proxy: init at 2.0.9 --- pkgs/by-name/al/alpaca-proxy/package.nix | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/al/alpaca-proxy/package.nix diff --git a/pkgs/by-name/al/alpaca-proxy/package.nix b/pkgs/by-name/al/alpaca-proxy/package.nix new file mode 100644 index 000000000000..e86402560863 --- /dev/null +++ b/pkgs/by-name/al/alpaca-proxy/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "alpaca-proxy"; + version = "2.0.9"; + + src = fetchFromGitHub { + owner = "samuong"; + repo = "alpaca"; + rev = "v${version}"; + hash = "sha256-Rf8//4FeruVZZ//uba80z20XGUxycwF91Aa09fosRXI="; + }; + + vendorHash = "sha256-JEiHgyPJvWmtPf8R4aX/qlevfZRdKajre324UsgRm5Y="; + + ldflags = [ + "-s" + "-w" + "-X=main.BuildVersion=v${version}" + ]; + + postInstall = '' + # executable is renamed to alpaca-proxy, to avoid collision with the alpaca python application + mv $out/bin/alpaca $out/bin/alpaca-proxy + ''; + + meta = with lib; { + description = "HTTP forward proxy with PAC and NTLM authentication support"; + homepage = "https://github.com/samuong/alpaca"; + changelog = "https://github.com/samuong/alpaca/releases/tag/v${src.rev}"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ _1nv0k32 ]; + mainProgram = "alpaca-proxy"; + }; +} From 6d2276c3ece0b9a1e21d05490cd25b409de52ffa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Aug 2024 20:14:16 +0200 Subject: [PATCH 465/481] firefox-esr: 115.13.0esr -> 128.0esr Upgrades Firefox ESR to the new 128 release track. The 115 series will remain available until the end of september. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82f36e8782f4..019190baa258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30428,7 +30428,7 @@ with pkgs; firefox-devedition-unwrapped = firefoxPackages.firefox-devedition; firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115; firefox-esr-128-unwrapped = firefoxPackages.firefox-esr-128; - firefox-esr-unwrapped = firefoxPackages.firefox-esr-115; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-128; firefox = wrapFirefox firefox-unwrapped { }; firefox-beta = wrapFirefox firefox-beta-unwrapped { @@ -30458,7 +30458,7 @@ with pkgs; wmClass = "firefox-esr"; icon = "firefox-esr"; }; - firefox-esr = firefox-esr-115; + firefox-esr = firefox-esr-128; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; From 11fb6504ee2196c35d3c182e0b547e6eb159147f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 18:40:35 +0000 Subject: [PATCH 466/481] qrtool: 0.11.3 -> 0.11.4 --- pkgs/by-name/qr/qrtool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index c761e4c17863..fb317e6b332b 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-TA4JuFd01gOzLDFYzuP0Ohk+Bd6lT3oZF9sFY9KjOfM="; + sha256 = "sha256-lD/xi2k5baZGUUixy/032jTBevr0uQIT/JmX+d+kPyA="; }; - cargoHash = "sha256-bcrwf7Ufd7o2FPIxEReZGy9EANdWNOgoFBHzSdoYTlI="; + cargoHash = "sha256-lR/LusIgdA+G7YeSLHjxdcC96tOSqSyalVamS42ORs0="; nativeBuildInputs = [ asciidoctor installShellFiles ]; From d01aeead73e66279a2da7a3486888f01221b50f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 18:45:58 +0000 Subject: [PATCH 467/481] halo: 2.17.2 -> 2.18.0 --- pkgs/by-name/ha/halo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index c5a3ada6d0a3..a7787fd8ece6 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.17.2"; + version = "2.18.0"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; - hash = "sha256-8adbW13DsNCWzME7hRA5AUr/bOZVXl4LlVuIFZwpmXM="; + hash = "sha256-XFV+cdqtBJID/s0I3Z6TBfeyzN/e9euUoQVTWy64NYM="; }; nativeBuildInputs = [ From fd6ec505ad83436640906caf795c526258f1c11d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 18:49:19 +0000 Subject: [PATCH 468/481] cnspec: 11.14.0 -> 11.15.1 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 666e1404a66a..1e62aedc614f 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.14.0"; + version = "11.15.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-gG/KlwepzF0JWEzaGh/8KfuHXTgLenIX55ZXYr1n560="; + hash = "sha256-r3UivIoWWE6TShTJ9ipCpJ8vgDSi13or/jVXqB7F0qY="; }; proxyVendor = true; - vendorHash = "sha256-sMUl7jkNb9ki3ChjAraqTJwhMDfUexU+g/eslrLF3ig="; + vendorHash = "sha256-sDTUzWgmosL+jnjXD9T6TPp56dywwEPcJO9+0vXqwHo="; subPackages = [ "apps/cnspec" ]; From d7302093dace41b03b54aec34f1c41cdd25bbead Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 8 Jul 2024 21:13:45 +0200 Subject: [PATCH 469/481] bluesnarfer: init at 0.1 --- pkgs/by-name/bl/bluesnarfer/package.nix | 37 +++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/bl/bluesnarfer/package.nix diff --git a/pkgs/by-name/bl/bluesnarfer/package.nix b/pkgs/by-name/bl/bluesnarfer/package.nix new file mode 100644 index 000000000000..ba3234e61511 --- /dev/null +++ b/pkgs/by-name/bl/bluesnarfer/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchzip, + bluez, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bluesnarfer"; + version = "0.1"; + + src = fetchzip { + url = "http://www.alighieri.org/tools/bluesnarfer.tar.gz"; + stripRoot = false; + hash = "sha256-HGdrJZohKIsOkLETBdHz80w6vxmG25aMEWXrQlpMgRw="; + }; + + sourceRoot = finalAttrs.src.name + "/bluesnarfer"; + + buildInputs = [ bluez ]; + + strictDeps = true; + + installPhase = '' + runHook preInstall + install -Dm755 bluesnarfer $out/bin/bluesnarfer + runHook postInstall + ''; + + meta = { + description = "Bluetooth bluesnarfing utility"; + homepage = "http://www.alighieri.org/project.html"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.linux; + }; +}) From d6bdf12b97a8336bc0c08da2a7de809a0883dff1 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 27 Jul 2024 21:38:55 +0200 Subject: [PATCH 470/481] memray: 1.11.0 -> 1.13.4 --- pkgs/development/tools/memray/default.nix | 28 +++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 8e0b2689984e..e41b3c9ed24c 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -3,19 +3,20 @@ , libunwind , lz4 , pkg-config -, python3 +, elfutils +, python311Packages }: -python3.pkgs.buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "memray"; - version = "1.11.0"; + version = "1.13.4"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = "memray"; rev = "refs/tags/v${version}"; - hash = "sha256-DaJ1Hhg7q4ckA5feUx0twOsmy28v5aBBCTUAkn43xAo="; + hash = "sha256-8ztnXNdsthoMvooWoJLKrB9yGHjkYhQ2jiwF3KujAnw="; }; nativeBuildInputs = [ @@ -25,18 +26,22 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ libunwind lz4 - ] ++ (with python3.pkgs; [ + elfutils # for `-ldebuginfod` + ] ++ (with python311Packages; [ cython ]); - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python311Packages; [ + pkgconfig + textual jinja2 rich ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python311Packages; [ ipython pytestCheckHook + pytest-cov # fix Unknown pytest.mark.no_cover ] ++ lib.optionals (pythonOlder "3.12") [ greenlet ]; @@ -53,6 +58,15 @@ python3.pkgs.buildPythonApplication rec { # Import issue "test_header_allocator" "test_hybrid_stack_of_allocations_inside_ceval" + + # snapshot-based tests are too fragile + # see https://github.com/bloomberg/memray/issues/654 + "TestTUILooks" + "test_tui_basic" + "test_tui_pause" + "test_tui_gradient" + "test_merge_threads" + "test_unmerge_threads" ]; disabledTestPaths = [ From d77e3ba38bcf0090921678fba46eb92f16ecf529 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 Aug 2024 21:34:02 +0200 Subject: [PATCH 471/481] memray: refactor --- pkgs/development/tools/memray/default.nix | 57 +++++++++++------------ 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index e41b3c9ed24c..8dabb8a23969 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -1,16 +1,17 @@ -{ lib -, fetchFromGitHub -, libunwind -, lz4 -, pkg-config -, elfutils -, python311Packages +{ + lib, + elfutils, + fetchFromGitHub, + libunwind, + lz4, + pkg-config, + python3Packages, }: -python311Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "memray"; version = "1.13.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bloomberg"; @@ -19,40 +20,38 @@ python311Packages.buildPythonApplication rec { hash = "sha256-8ztnXNdsthoMvooWoJLKrB9yGHjkYhQ2jiwF3KujAnw="; }; - nativeBuildInputs = [ - pkg-config + build-system = with python3Packages; [ + distutils + setuptools ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libunwind lz4 - elfutils # for `-ldebuginfod` - ] ++ (with python311Packages; [ - cython - ]); + elfutils # for `-ldebuginfod` + ] ++ (with python3Packages; [ cython ]); - propagatedBuildInputs = with python311Packages; [ + dependencies = with python3Packages; [ pkgconfig textual jinja2 rich ]; - nativeCheckInputs = with python311Packages; [ - ipython - pytestCheckHook - pytest-cov # fix Unknown pytest.mark.no_cover - ] ++ lib.optionals (pythonOlder "3.12") [ - greenlet - ]; + nativeCheckInputs = + with python3Packages; + [ + ipython + pytestCheckHook + pytest-cov # fix Unknown pytest.mark.no_cover + ] + ++ lib.optionals (pythonOlder "3.12") [ greenlet ]; - pythonImportsCheck = [ - "memray" - ]; + pythonImportsCheck = [ "memray" ]; - pytestFlagsArray = [ - "tests" - ]; + pytestFlagsArray = [ "tests" ]; disabledTests = [ # Import issue From 1efde08d47fe58a89f296b8f3008322436bfbdac Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Sun, 17 Mar 2024 17:14:26 +0000 Subject: [PATCH 472/481] msmtp: update repo URL https://github.com/marlam/msmtp-mirror now redirects to https://github.com/marlam/msmtp --- pkgs/applications/networking/msmtp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index e68e8f8fe96b..44153a74d95b 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -29,7 +29,7 @@ let src = fetchFromGitHub { owner = "marlam"; - repo = "msmtp-mirror"; + repo = "msmtp"; rev = "msmtp-${version}"; hash = "sha256-Jt/uvGBrYYr6ua6LVPiP0nuRiIkxBJASdgHBNHivzxQ="; }; From 2f2010f63cc0550d9fb1d313e61f96b20a3f731f Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Sun, 17 Mar 2024 18:03:24 +0000 Subject: [PATCH 473/481] msmtp: 1.8.22 -> 1.8.25 msmtpq patches had to be recreated: - removal of the executable check and addition of systemd logging were kept and split into two patches. - renaming of queue and log files was removed as the upstream script had renamed these to add the `MSMTPQ_` prefix (noted as a backwards incompatible change). --- .../manual/release-notes/rl-2411.section.md | 2 + .../applications/networking/msmtp/default.nix | 9 ++- .../msmtp/msmtpq-remove-binary-check.patch | 13 ++++ .../msmtp/msmtpq-systemd-logging.patch | 41 ++++++++++++ .../applications/networking/msmtp/paths.patch | 64 ------------------- 5 files changed, 62 insertions(+), 67 deletions(-) create mode 100644 pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch create mode 100644 pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch delete mode 100644 pkgs/applications/networking/msmtp/paths.patch diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 63287161f084..76cfc47171fc 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -112,6 +112,8 @@ it is set, instead of the previous hardcoded default of `${networking.hostName}.${security.ipa.domain}`. +- The `MSMTP_QUEUE` and `MSMTP_LOG` environment variables accepted by `msmtpq` have now been renamed to `MSMTPQ_Q` and `MSMTPQ_LOG` respectively. + - The fcgiwrap module now allows multiple instances running as distinct users. The option `services.fgciwrap` now takes an attribute set of the configuration of each individual instance. diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 44153a74d95b..6bd0f38ba6f4 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -25,13 +25,13 @@ let inherit (lib) getBin getExe optionals; - version = "1.8.22"; + version = "1.8.25"; src = fetchFromGitHub { owner = "marlam"; repo = "msmtp"; rev = "msmtp-${version}"; - hash = "sha256-Jt/uvGBrYYr6ua6LVPiP0nuRiIkxBJASdgHBNHivzxQ="; + hash = "sha256-UZKUpF/ZwYPM2rPDudL1O8e8LguKJh9sTcJRT3vgsf4="; }; meta = with lib; { @@ -68,7 +68,10 @@ let pname = "msmtp-scripts"; inherit version src meta; - patches = [ ./paths.patch ]; + patches = [ + ./msmtpq-remove-binary-check.patch + ./msmtpq-systemd-logging.patch + ]; postPatch = '' substituteInPlace scripts/msmtpq/msmtpq \ diff --git a/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch b/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch new file mode 100644 index 000000000000..045f71c22a9f --- /dev/null +++ b/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq +index bcb384e..9622e47 100755 +--- a/scripts/msmtpq/msmtpq ++++ b/scripts/msmtpq/msmtpq +@@ -60,8 +60,6 @@ err() { dsp '' "$@" '' ; exit 1 ; } + ## export the location of the msmtp executable before running this script (no quotes !!) + ## e.g. ( export MSMTP=/path/to/msmtp ) + MSMTP="${MSMTP:-msmtp}" +-"$MSMTP" --version >/dev/null 2>&1 || \ +- log_later -e 1 "msmtpq : can't run the msmtp executable [ $MSMTP ]" # if not found - complain ; quit + ## + ## set the queue var to the location of the msmtp queue directory + ## if the queue dir doesn't yet exist, create it (0700) diff --git a/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch b/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch new file mode 100644 index 000000000000..a9db3e645808 --- /dev/null +++ b/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch @@ -0,0 +1,41 @@ +diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq +index bcb384e..dbaf1b5 100755 +--- a/scripts/msmtpq/msmtpq ++++ b/scripts/msmtpq/msmtpq +@@ -92,6 +92,8 @@ if [ ! -v MSMTPQ_LOG ] ; then + fi + fi + [ -d "$(dirname "$MSMTPQ_LOG")" ] || mkdir -p "$(dirname "$MSMTPQ_LOG")" ++ ++JOURNAL=@journal@ + ## ====================================================================================== + + ## msmtpq can use the following environment variables : +@@ -144,6 +146,7 @@ on_exit() { # unlock the queue on exit if the lock was + ## display msg to user, as well + ## + log() { ++ local NAME=msmtpq + local ARG RC PFX + PFX="$('date' +'%Y %d %b %H:%M:%S')" + # time stamp prefix - "2008 13 Mar 03:59:45 " +@@ -161,10 +164,19 @@ log() { + done + fi + ++ if [ "$JOURNAL" = "Y" ]; then ++ for ARG; do ++ [ -n "$ARG" ] && ++ echo "$ARG" | systemd-cat -t "$NAME" -p info ++ done ++ fi ++ + if [ -n "$RC" ] ; then # an error ; leave w/error return + [ -n "$LKD" ] && lock_queue -u # unlock here (if locked) + [ -n "$MSMTPQ_LOG" ] && \ + echo " exit code = $RC" >> "$MSMTPQ_LOG" # logging ok ; send exit code to log ++ [ "$JOURNAL" = "Y" ] && \ ++ echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg + exit "$RC" # exit w/return code + fi + } diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch deleted file mode 100644 index 9298519e4da3..000000000000 --- a/pkgs/applications/networking/msmtp/paths.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq -index d8b4039..1f2a7b5 100755 ---- a/scripts/msmtpq/msmtpq -+++ b/scripts/msmtpq/msmtpq -@@ -60,8 +60,8 @@ err() { dsp '' "$@" '' ; exit 1 ; } - ## e.g. ( export MSMTP=/path/to/msmtp ) - if [ "$MSMTP" = "" ] ; then # If MSMTP is unset or empty... - MSMTP=msmtp --elif [ ! -x "$MSMTP" ] ; then -- log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit -+# elif [ ! -x "$MSMTP" ] ; then -+# log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit - fi - ## - ## set the queue var to the location of the msmtp queue directory -@@ -71,7 +71,7 @@ fi - ## ( chmod 0700 msmtp.queue ) - ## - ## the queue dir - export this variable to reflect where you'd like it to be (no quotes !!) --Q=${Q:-~/.msmtp.queue} -+Q=${MSMTP_QUEUE:-~/.msmtp.queue} - [ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \ - err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit - ## -@@ -85,8 +85,10 @@ Q=${Q:-~/.msmtp.queue} - ## - ## the queue log file - export this variable to change where logs are stored (but no quotes !!) - ## Set it to "" (empty string) to disable logging. --[ -v LOG ] || LOG=~/log/msmtp.queue.log -+LOG=${MSMTP_LOG:-~/log/msmtp.queue.log} - [ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")" -+ -+JOURNAL=@journal@ - ## ====================================================================================== - - ## msmtpq can use the following environment variables : -@@ -139,6 +141,7 @@ on_exit() { # unlock the queue on exit if the lock was - ## display msg to user, as well - ## - log() { -+ local NAME=msmtpq - local ARG RC PFX - PFX="$('date' +'%Y %d %b %H:%M:%S')" - # time stamp prefix - "2008 13 Mar 03:59:45 " -@@ -156,10 +159,19 @@ log() { - done - fi - -+ if [ "$JOURNAL" = "Y" ]; then -+ for ARG; do -+ [ -n "$ARG" ] && -+ echo "$ARG" | systemd-cat -t "$NAME" -p info -+ done -+ fi -+ - if [ -n "$RC" ] ; then # an error ; leave w/error return - [ -n "$LKD" ] && lock_queue -u # unlock here (if locked) - [ -n "$LOG" ] && \ - echo " exit code = $RC" >> "$LOG" # logging ok ; send exit code to log -+ [ "$JOURNAL" = "Y" ] && \ -+ echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg - exit "$RC" # exit w/return code - fi - } From 1714981f49ebed15d0ca748ea14d84eae62ce0a0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 2 Aug 2024 08:16:10 +0200 Subject: [PATCH 474/481] tinymist: 0.11.16 -> 0.11.18 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.11.16...v0.11.18 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/refs/tags/v0.11.18/CHANGELOG.md --- .../myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/Cargo.lock | 47 +++++++------ pkgs/by-name/ti/tinymist/package.nix | 67 ++++++++++--------- 3 files changed, 65 insertions(+), 51 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index d21c263338bb..576aa80933ba 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-AB+jLcY9VfJgqcbh8PEZ9nRiJPv4EcSG1arSeW6dCBo="; + hash = "sha256-eM9FVeMPpNtd3ytTzrB8aVF+h25pUI+F5rXhv+vQmg0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 2b1982415da2..74a7a5a8d94d 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -3500,7 +3500,7 @@ dependencies = [ [[package]] name = "sync-lsp" -version = "0.11.16" +version = "0.11.18" dependencies = [ "anyhow", "clap", @@ -3639,7 +3639,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.16" +version = "0.11.18" dependencies = [ "insta", "lsp-server", @@ -3736,7 +3736,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.16" +version = "0.11.18" dependencies = [ "anyhow", "async-trait", @@ -3768,8 +3768,9 @@ dependencies = [ "reflexo", "serde", "serde_json", + "serde_yaml", "sync-lsp", - "tinymist-assets 0.11.16 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.18 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", "tokio", @@ -3777,6 +3778,7 @@ dependencies = [ "toml 0.8.14", "tower-layer", "tower-service", + "typlite", "typst", "typst-assets", "typst-pdf", @@ -3796,17 +3798,17 @@ dependencies = [ [[package]] name = "tinymist-assets" -version = "0.11.16" +version = "0.11.18" [[package]] name = "tinymist-assets" -version = "0.11.16" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062cb57e1c109783370323fd2aa7c5160b3b1e169bf7f5fffb196e8157bedcd3" +checksum = "a605bc6205d083682a6aab21cce336fa0444bdafbdad067b949fae19ef1e38dd" [[package]] name = "tinymist-query" -version = "0.11.16" +version = "0.11.18" dependencies = [ "anyhow", "biblatex", @@ -3852,7 +3854,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.16" +version = "0.11.18" dependencies = [ "base64 0.22.1", "log", @@ -4127,16 +4129,23 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typlite" -version = "0.11.16" +version = "0.11.18" dependencies = [ + "base64 0.22.1", + "comemo 0.4.0", + "ecow 0.2.2", "insta", + "regex", + "typst", + "typst-assets", + "typst-svg", "typst-syntax 0.11.1", ] [[package]] name = "typst" version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" dependencies = [ "az", "bitflags 2.6.0", @@ -4203,7 +4212,7 @@ checksum = "2b3061f8d268e8eec7481c9ab24540455cb4912983c49aae38fa6e8bf8ef4d9c" [[package]] name = "typst-macros" version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -4214,7 +4223,7 @@ dependencies = [ [[package]] name = "typst-pdf" version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" dependencies = [ "base64 0.22.1", "bytemuck", @@ -4238,7 +4247,7 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.16" +version = "0.11.18" dependencies = [ "clap", "comemo 0.4.0", @@ -4249,7 +4258,7 @@ dependencies = [ "once_cell", "serde", "serde_json", - "tinymist-assets 0.11.16 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.18 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", "tokio-tungstenite", "typst", @@ -4262,7 +4271,7 @@ dependencies = [ [[package]] name = "typst-render" version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" dependencies = [ "bytemuck", "comemo 0.4.0", @@ -4282,7 +4291,7 @@ dependencies = [ [[package]] name = "typst-svg" version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" dependencies = [ "base64 0.22.1", "comemo 0.4.0", @@ -4315,7 +4324,7 @@ dependencies = [ [[package]] name = "typst-syntax" version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" dependencies = [ "comemo 0.4.0", "ecow 0.2.2", @@ -4331,7 +4340,7 @@ dependencies = [ [[package]] name = "typst-timing" version = "0.11.1" -source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=tinymist-v0.11.1#152d935d379f524b12c6b55a14c6343b718956d6" +source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.11.1-2#314749ea26ac3f62622bc3b3c30d3a7d6a457a74" dependencies = [ "parking_lot", "serde", diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index a05bd915fcaf..1f2ee99be5a0 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -1,53 +1,55 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, openssl -, zlib -, stdenv -, darwin -, nix-update-script -, testers -, tinymist +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + openssl, + zlib, + stdenv, + darwin, + nix-update-script, + testers, + tinymist, + vscode-extensions, }: rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.16"; + version = "0.11.18"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-5UNgjK4636XXjUaq2XqYs1a7vY1b+0OGZbI0xajSVcc="; + hash = "sha256-2tf2Dg6HfJrHQgjNKtJNT7kLoUKMoLe6U2O7VsMg7Vs="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.11.1" = "sha256-VDwyTKrtzmjMhVCp/GnZrgL6P6dLyKlLNA+LhoXBDl0="; + "typst-0.11.1" = "sha256-dQf4qYaOni/jwIjRVXXCZLTn6ox3v6EyhCbaONqNtcw="; "typst-syntax-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; "typstfmt_lib-0.2.7" = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; }; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libgit2 - openssl - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.CoreServices - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.frameworks.SystemConfiguration - ]; + buildInputs = + [ + libgit2 + openssl + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.CoreFoundation + darwin.apple_sdk_11_0.frameworks.CoreServices + darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk_11_0.frameworks.SystemConfiguration + ]; checkFlags = [ "--skip=e2e" @@ -58,9 +60,12 @@ rustPlatform.buildRustPackage rec { passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { - command = "${meta.mainProgram} -V"; - package = tinymist; + tests = { + vscode-extension = vscode-extensions.myriad-dreamin.tinymist; + version = testers.testVersion { + command = "${meta.mainProgram} -V"; + package = tinymist; + }; }; }; From 0475b29ace48ddbc6222e99e9f80dc3818eefbb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 22:10:42 +0000 Subject: [PATCH 475/481] emacsPackages.consult-gh: 0.12-unstable-2024-04-23 -> 1.0-unstable-2024-08-02 --- .../elisp-packages/manual-packages/consult-gh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix index 52dfd2ea095c..03adc5fd1f78 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix @@ -12,13 +12,13 @@ melpaBuild { pname = "consult-gh"; - version = "0.12-unstable-2024-04-23"; + version = "1.0-unstable-2024-08-02"; src = fetchFromGitHub { owner = "armindarvish"; repo = "consult-gh"; - rev = "3a07139a1f7e38b959ce177a122c8f47c401d7fa"; - hash = "sha256-BZloG5RuQzC2RwCfvqPPhGcbsCabQWBnRHdU62rwNdo="; + rev = "e12b24e68116ac6c171d628c547c017458d6aa2b"; + hash = "sha256-skZkpYUWncGUf9k0IfEq3LAqDXHIfCJJ3p3b3ey+Rks="; }; packageRequires = [ From b7d82aa962dd09b4214379abbc93579d33802f9b Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 4 Aug 2024 17:56:33 -0500 Subject: [PATCH 476/481] gamescope: 3.14.24 -> 3.14.26 --- pkgs/by-name/ga/gamescope/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index b1f93b041704..e0ac90ed64e9 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -27,6 +27,7 @@ , stb , wlroots , libdecor +, lcms , lib , makeBinaryWrapper , patchelfUnstable @@ -44,14 +45,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.14.24"; + version = "3.14.26"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-+8uojnfx8V8BiYAeUsOaXTXrlcST83z6Eld7qv1oboE="; + hash = "sha256-vCPKySLB1D9oKgCrYrXqt/s0hV+/ocuWOrcDUzKbdKI="; }; patches = [ @@ -132,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: { pixman libcap stb + lcms ]); postInstall = lib.optionalString enableExecutable '' From 37d53b0541f58251fe1f0705dbe4dbaa805b2f59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 23:25:48 +0000 Subject: [PATCH 477/481] terragrunt: 0.63.2 -> 0.66.1 --- pkgs/by-name/te/terragrunt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index a8262a50d84e..600e9159a7ac 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.63.2"; + version = "0.66.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Y6bDXohGeQ5H4Cq50dwA503pOQA8+ab9po4slL3BRDg="; + hash = "sha256-Dp3hZoSpOBO//qpzry0zZ5GBqdyyL5mu4cS/M1GAUQg="; }; nativeBuildInputs = [ go-mockery ]; @@ -21,7 +21,7 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-l0RFHOQIHLSCzSKq09ibtXEMph/Lhv9ie6B+jpLTxbY="; + vendorHash = "sha256-kxMSNh0kn9WJuE4ARnihkjX96Vp9FUfPQE4B4p3KMac="; doCheck = false; From cdb8f95be3107652afcebf82226d1b2589a4e0ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 5 Aug 2024 01:57:50 +0200 Subject: [PATCH 478/481] miniflux: fix panic on youtube channel feed discovery --- pkgs/servers/miniflux/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 9a9be0e85e93..f29e46c2a455 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch2, installShellFiles, nixosTests }: buildGoModule rec { pname = "miniflux"; @@ -11,6 +11,15 @@ buildGoModule rec { hash = "sha256-1EH8KtKdAssxLk0IyhJsbrFU1obDTvmaGtFyLVlnOdQ="; }; + patches = [ + (fetchpatch2 { + # Fix panic during YouTube channel feed discovery + name = "miniflux-pr2742.patch"; + url = "https://github.com/miniflux/v2/commit/79ea9e28b5a8c09f4d1dcbf31b661fb5f8e85e6a.patch"; + hash = "sha256-BZPv83QsJ6iJs12FLALfTN//VZL/BfGkXs3Pzn9cGeU="; + }) + ]; + vendorHash = "sha256-kr2qCKuwp6Fpr0zEjggqk4Mff3V9pxGLU71lRhdRrW8="; nativeBuildInputs = [ installShellFiles ]; From 561c9c4255dfad485115596396de7658a2876a14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Aug 2024 02:15:11 +0000 Subject: [PATCH 479/481] godns: 3.1.6 -> 3.1.7 --- pkgs/by-name/go/godns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix index 1bf3dbd2cf71..4f4a48c257b5 100644 --- a/pkgs/by-name/go/godns/package.nix +++ b/pkgs/by-name/go/godns/package.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "godns"; - version = "3.1.6"; + version = "3.1.7"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-Kr+zMmjpHR2JtCaDyLMcQwOUXlPJeisu94zHRpEYV/I="; + hash = "sha256-aTCYnjv9DTlCohdESGAjMz7JQG0BsLTNMiknyB6Ut50="; }; vendorHash = "sha256-E15h5p4ppRb91EUoz5dyWNFl745rt419NMCSurMLxis="; npmDeps = fetchNpmDeps { src = "${src}/web"; - hash = "sha256-2yeqLly0guU/kpX+yH/QOoDGzyJTxkTaCt8EleJhybU="; + hash = "sha256-gnAUI3lLDhjZ+nLap41COq765ymR6a8FgVY/aqqidTQ="; }; npmRoot = "web"; From de00dc4dd9a39600cbce32ac2c7dbd75e2368410 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Aug 2024 03:34:57 +0000 Subject: [PATCH 480/481] knockpy: 7.0.0 -> 7.0.1 --- pkgs/tools/security/knockpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index 57b653035725..c3ed52db593b 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "7.0.0"; + version = "7.0.1"; pyproject = true; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = "refs/tags/${version}"; - hash = "sha256-Xtv7K19OBS2iHFFoSasNcy9VLL15eQ8AD79wAEhxCHk="; + hash = "sha256-ALsSpygJlqYW/7Z44PZmBcIxfrtOPPrvuuMIOyFE5kE="; }; pythonRelaxDeps = [ From 16f6d7b9c95a165e1cc9ec21c0d1b6d174ae4fa5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 29 Jul 2024 11:30:30 +0200 Subject: [PATCH 481/481] =?UTF-8?q?annapurna-sil:=202.000=20=E2=86=92=202.?= =?UTF-8?q?100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/annapurna-sil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/data/fonts/annapurna-sil/default.nix index 606b0f0161c2..325a1a5bcd57 100644 --- a/pkgs/data/fonts/annapurna-sil/default.nix +++ b/pkgs/data/fonts/annapurna-sil/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "annapurna-sil"; - version = "2.000"; + version = "2.100"; src = fetchzip { url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; - hash = "sha256-tvh1E9uGCikJgjmbn28gD7rUgBdKjtvdwgoRIeccGq8="; + hash = "sha256-TFaCchtd9SRGsU9r+m8QOvZfc7/FJxwclkSfbLwf6/4="; }; installPhase = ''