diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index b44daa528167..e74858f4ce85 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -489,6 +489,18 @@ let
package = mkPackageOption pkgs.plasma5Packages "kwallet-pam" {
pkgsText = "pkgs.plasma5Packages";
};
+
+ forceRun = mkEnableOption null // {
+ description = ''
+ The `force_run` option is used to tell the PAM module for KWallet
+ to forcefully run even if no graphical session (such as a GUI
+ display manager) is detected. This is useful for when you are
+ starting an X Session or a Wayland Session from a TTY. If you
+ intend to log-in from a TTY, it is recommended that you enable
+ this option **and** ensure that `plasma-kwallet-pam.service` is
+ started by `graphical-session.target`.
+ '';
+ };
};
sssdStrictAccess = mkOption {
@@ -861,7 +873,7 @@ let
order = "user,group,default";
debug = true;
}; }
- { name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; }
+ { name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; settings = lib.mkIf cfg.kwallet.forceRun { force_run = true; }; }
{ name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {
auto_start = true;
}; }
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 435cd530c18d..fd86845fa74c 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -139,9 +139,9 @@ let
$0 = substr($0, 1, i-1) repl substr($0, i+length(find))
}
print
- }' "${configFile}" > "${finalConfig}"
+ }' "${configFile}" > ${finalConfig}
else
- touch "${finalConfig}"
+ touch ${finalConfig}
fi
iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}"
diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix
index 29bed0e067fa..51c3156fef06 100644
--- a/nixos/modules/services/web-apps/movim.nix
+++ b/nixos/modules/services/web-apps/movim.nix
@@ -86,8 +86,8 @@ let
# `cfg.podConfig` to prevent confusing situtions where the
# values are rewritten on server reboot
''
- substituteInPlace ${appDir}/app/widgets/AdminMain/adminmain.tpl \
- --replace-warn 'name="${k}"' 'name="${k}" disabled'
+ substituteInPlace ${appDir}/app/Widgets/AdminMain/adminmain.tpl \
+ --replace-warn 'name="${k}"' 'name="${k}" readonly'
'')
[ ]
cfg.podConfig));
diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix
index 0fb635964fe6..853611c41ef7 100644
--- a/nixos/modules/services/web-apps/pretix.nix
+++ b/nixos/modules/services/web-apps/pretix.nix
@@ -249,7 +249,7 @@ in
};
host = mkOption {
- type = with types; nullOr types.path;
+ type = with types; nullOr path;
default = if cfg.settings.database.backend == "postgresql" then "/run/postgresql" else null;
defaultText = literalExpression ''
if config.services.pretix.settings..database.backend == "postgresql" then "/run/postgresql"
@@ -535,7 +535,7 @@ in
fi
'';
serviceConfig = {
- TimeoutStartSec = "5min";
+ TimeoutStartSec = "15min";
ExecStart = "${getExe' pythonEnv "gunicorn"} --bind unix:/run/pretix/pretix.sock ${cfg.gunicorn.extraArgs} pretix.wsgi";
RuntimeDirectory = "pretix";
};
diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix
index a40ab24e9a8d..93594c86052b 100644
--- a/pkgs/applications/audio/mympd/default.nix
+++ b/pkgs/applications/audio/mympd/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
- version = "16.1.0";
+ version = "17.0.0";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
- sha256 = "sha256-fka7FQkJKHB2L28JzN1SOtmDkJvvox9dKguuh96lVo0=";
+ sha256 = "sha256-/8IDwzgZzf63MvXTBP2CoC5IHi7Umr3exU1/oDdadgk=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix
index 373c7086fc4e..603513a71f16 100644
--- a/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cilium-cli";
- version = "0.16.13";
+ version = "0.16.14";
src = fetchFromGitHub {
owner = "cilium";
repo = pname;
rev = "v${version}";
- hash = "sha256-69LDIKaAJYbxTp0qBgfnE/YG6vnyN9/HgyxEBPqFY+4=";
+ hash = "sha256-VYfLy0vR3ON29EHUx1R2jF61+DbxH2RUsUQXFgxjMUU=";
};
vendorHash = null;
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index cf3815376b76..8436a518d6d8 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -21,11 +21,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
- hash = "sha256-nxSYXVliK+x3RbaXxZ2MA2PZ3bX6UYyctCKNCcdqPDM=";
+ hash = "sha256-TxWyUDoBvscKa2ogPrFlzLC2q+5RMyMnAiOpQdpFP4M=";
};
format = "pyproject";
diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
index 2d2c52f7e285..09dc75a223f9 100644
--- a/pkgs/by-name/ca/cargo-make/package.nix
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
- version = "0.37.14";
+ version = "0.37.15";
src = fetchFromGitHub {
owner = "sagiegurari";
repo = "cargo-make";
rev = version;
- hash = "sha256-YyZF45Oi8sqTC/YM8F2dNBUI1rB0mPNeWMT7dYFWB5Q=";
+ hash = "sha256-sIiRlqUn59BxrvOs7N1es3vJVQRerV0EhNntuXXgPJA=";
};
- cargoHash = "sha256-tidV2mZgrJCokeUVKYQKlYENm7v362sGsi2Eb0vLNJ8=";
+ cargoHash = "sha256-MvCGdlEevHND7buW+JuAyH6gRck5ppSAq9xylXSgm5w=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix
index ed57790a27d6..03f0cadd3bd5 100644
--- a/pkgs/by-name/gl/glsl_analyzer/package.nix
+++ b/pkgs/by-name/gl/glsl_analyzer/package.nix
@@ -1,25 +1,22 @@
{ lib
-, pkgs
+, stdenv
, fetchFromGitHub
-, zig_0_12
-, darwin
+, zig_0_13
}:
-let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in
-
stdenv.mkDerivation (finalAttrs: {
pname = "glsl_analyzer";
- version = "1.4.5";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "nolanderc";
repo = "glsl_analyzer";
rev = "v${finalAttrs.version}";
- hash = "sha256-+eYBw/F1RzI5waAkLgbV0J/Td91hbNcAtHcisQaL82k=";
+ hash = "sha256-AIzk05T8JZn8HWSI6JDFUIYl4sutd3HR3Zb+xmJll0g=";
};
nativeBuildInputs = [
- zig_0_12.hook
+ zig_0_13.hook
];
postPatch = ''
diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index fcbba6ae0e20..b57ac5ba9ada 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "grype";
- version = "0.79.3";
+ version = "0.79.4";
src = fetchFromGitHub {
owner = "anchore";
repo = "grype";
rev = "refs/tags/v${version}";
- hash = "sha256-EAolb8r4n0r9SC7eh4wogHIM3iYgf9lKRFHryD4hhGc=";
+ hash = "sha256-h9XqqT4cyOxfAdQuG3DcLQLLXgjrRNjdwmE7eaeLxbg=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -30,7 +30,7 @@ buildGoModule rec {
proxyVendor = true;
- vendorHash = "sha256-/SbEc2YEXwBqR8PPnPj8Q3lDGMp/Kpib8E4lUzFGGV8=";
+ vendorHash = "sha256-qlkGNQC1MUkRg+coKruEwyu3hBrYgILaj8IOhOj7nAc=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix
index 8dfcb9627f83..bd3a4dee4213 100644
--- a/pkgs/by-name/mo/movim/package.nix
+++ b/pkgs/by-name/mo/movim/package.nix
@@ -38,13 +38,13 @@ let
in
php.buildComposerProject (finalAttrs: {
pname = "movim";
- version = "0.25.1";
+ version = "0.26";
src = fetchFromGitHub {
owner = "movim";
repo = "movim";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-VshDFHDCfemHS/TN5qEe8CGizZksf44xENSmvX44uAc=";
+ hash = "sha256-ffAA4aDcjJSuqBIqI6b36daAp7UWj+FpWxYiY+c+f5Q=";
};
php = php.buildEnv ({
@@ -67,17 +67,17 @@ php.buildComposerProject (finalAttrs: {
# pinned commonmark
composerStrictValidation = false;
- vendorHash = "sha256-nxbsw0re/7zKhpWxtA8JAf7JL3RLghqaYsi4rkM6VZg=";
+ vendorHash = "sha256-4KNGWI4hvlDnIxo9nh/hytxkk+KVxjB8uF/HB88XPwQ=";
postPatch = ''
# Our modules are already wrapped, removes missing *.so warnings;
# replacing `$configuration` with actually-used flags.
substituteInPlace src/Movim/Daemon/Session.php \
- --replace-fail "exec php ' . \$configuration " "exec php -dopcache.enable=1 -dopcache.enable_cli=1 ' "
+ --replace-fail \
+ "'exec ' . PHP_BINARY . ' ' . \$configuration . '" \
+ "'exec ' . PHP_BINARY . ' -dopcache.enable=1 -dopcache.enable_cli=1 ' . '"
# Point to PHP + PHP INI in the Nix store
- substituteInPlace src/Movim/{Console/DaemonCommand.php,Daemon/Session.php} \
- --replace-fail "exec php " "exec ${lib.getExe finalAttrs.php} "
substituteInPlace src/Movim/Console/DaemonCommand.php \
--replace-fail "php vendor/bin/phinx migrate" \
"${lib.getBin finalAttrs.php} vendor/bin/phinx migrate" \
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index c561e9c61c41..40a51c1458d1 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -40,13 +40,13 @@ let
};
pname = "pretix";
- version = "2024.6.0";
+ version = "2024.7.0";
src = fetchFromGitHub {
owner = "pretix";
repo = "pretix";
rev = "refs/tags/v${version}";
- hash = "sha256-erI3Ai6zwNSvMiF3YKfnU9ePb9R92rfi5rsxfAOh6EQ=";
+ hash = "sha256-08ykuFPcG3WvinJd9zadirXFqsMt9GbdOGU2CGbW7ls=";
};
npmDeps = buildNpmPackage {
@@ -54,7 +54,7 @@ let
inherit version src;
sourceRoot = "${src.name}/src/pretix/static/npm_dir";
- npmDepsHash = "sha256-//CLPnx5eUxIHIUGc7x2UF8qsfAYRtvHbHXSDNtI/eI=";
+ npmDepsHash = "sha256-BfvKuwB5VLX09Lxji+EpMBvZeKTIQvptVtrHSRYY+14=";
dontBuild = true;
@@ -76,6 +76,26 @@ python.pkgs.buildPythonApplication rec {
# Discover pretix.plugin entrypoints during build and add them into
# INSTALLED_APPS, so that their static files are collected.
./plugin-build.patch
+
+ # https://github.com/pretix/pretix/pull/4362
+ # Fix TOCTOU race in directory creation
+ ./pr4362.patch
+ ];
+
+ pythonRelaxDeps = [
+ "bleach"
+ "importlib-metadata"
+ "pillow"
+ "protobuf"
+ "python-bidi"
+ "requests"
+ "sentry-sdk"
+ ];
+
+ pythonRemoveDeps = [
+ "phonenumberslite" # we provide phonenumbers instead
+ "psycopg2-binary" # we provide psycopg2 instead
+ "vat-moss-forked" # we provide a patched vat-moss package
];
postPatch = ''
@@ -88,22 +108,8 @@ python.pkgs.buildPythonApplication rec {
sed -i "/setuptools-rust/d" pyproject.toml
substituteInPlace pyproject.toml \
- --replace-fail phonenumberslite phonenumbers \
- --replace-fail psycopg2-binary psycopg2 \
- --replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \
- --replace-fail "bleach==5.0.*" bleach \
- --replace-fail "djangorestframework==3.15.*" djangorestframework \
- --replace-fail "django-compressor==4.5" django-compressor \
- --replace-fail "dnspython==2.6.*" dnspython \
- --replace-fail "importlib_metadata==7.*" importlib_metadata \
- --replace-fail "markdown==3.6" markdown \
- --replace-fail "protobuf==5.27.*" protobuf \
- --replace-fail "pycryptodome==3.20.*" pycryptodome \
- --replace-fail "pypdf==4.2.*" pypdf \
- --replace-fail "python-dateutil==2.9.*" python-dateutil \
- --replace-fail "requests==2.31.*" "requests" \
- --replace-fail "sentry-sdk==2.5.*" "sentry-sdk>=2" \
- --replace-fail "stripe==7.9.*" stripe
+ --replace-fail '"backend"' '"setuptools.build_meta"' \
+ --replace-fail 'backend-path = ["_build"]' ""
'';
build-system = with python.pkgs; [
diff --git a/pkgs/by-name/pr/pretix/plugins/default.nix b/pkgs/by-name/pr/pretix/plugins/default.nix
index 70e643705c00..a60316e521e4 100644
--- a/pkgs/by-name/pr/pretix/plugins/default.nix
+++ b/pkgs/by-name/pr/pretix/plugins/default.nix
@@ -10,4 +10,6 @@
reluctant-stripe = callPackage ./reluctant-stripe.nix { };
stretchgoals = callPackage ./stretchgoals.nix { };
+
+ zugferd = callPackage ./zugferd.nix { };
}
diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd.nix b/pkgs/by-name/pr/pretix/plugins/zugferd.nix
new file mode 100644
index 000000000000..3255eeb78bd3
--- /dev/null
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd.nix
@@ -0,0 +1,47 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ pretix-plugin-build,
+ setuptools,
+ drafthorse,
+ ghostscript_headless,
+}:
+
+buildPythonPackage rec {
+ pname = "pretix-zugferd";
+ version = "2.2.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "pretix";
+ repo = "pretix-zugferd";
+ rev = "v${version}";
+ hash = "sha256-ozFDNIA+0feHrHHvxcf+6Jh4L83svmPEE/rerd4Yim8=";
+ };
+
+ postPatch = ''
+ substituteInPlace pretix_zugferd/invoice.py \
+ --replace-fail 'fallback="gs"' 'fallback="${lib.getExe ghostscript_headless}"'
+ '';
+
+ pythonRelaxDeps = [ "drafthorse" ];
+
+ build-system = [
+ pretix-plugin-build
+ setuptools
+ ];
+
+ dependencies = [ drafthorse ];
+
+ doCheck = false; # no tests
+
+ pythonImportsCheck = [ "pretix_zugferd" ];
+
+ meta = with lib; {
+ description = "Annotate pretix' invoices with ZUGFeRD data";
+ homepage = "https://github.com/pretix/pretix-zugferd";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/by-name/pr/pretix/pr4362.patch b/pkgs/by-name/pr/pretix/pr4362.patch
new file mode 100644
index 000000000000..97d4a20c2239
--- /dev/null
+++ b/pkgs/by-name/pr/pretix/pr4362.patch
@@ -0,0 +1,50 @@
+From 5688f3624005d02803f2a434db025f367b4963d3 Mon Sep 17 00:00:00 2001
+From: Martin Weinelt
+Date: Thu, 1 Aug 2024 02:39:59 +0200
+Subject: [PATCH] Prevent race condition in directory creation
+
+Checking whether a path does not exist before trying to create it does
+not follow the Python paradigm of asking for forgiveness, rather than
+permission, and opens up a time-of-check to time-of-use race.
+---
+ src/pretix/settings.py | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/pretix/settings.py b/src/pretix/settings.py
+index 81ff644be..854187f05 100644
+--- a/src/pretix/settings.py
++++ b/src/pretix/settings.py
+@@ -37,6 +37,7 @@ import configparser
+ import logging
+ import os
+ import sys
++from contextlib import suppress
+ from json import loads
+ from urllib.parse import urlparse
+
+@@ -70,14 +71,14 @@ MEDIA_ROOT = os.path.join(DATA_DIR, 'media')
+ PROFILE_DIR = os.path.join(DATA_DIR, 'profiles')
+ CACHE_DIR = config.get('pretix', 'cachedir', fallback=os.path.join(DATA_DIR, 'cache'))
+
+-if not os.path.exists(DATA_DIR):
+- os.mkdir(DATA_DIR)
+-if not os.path.exists(LOG_DIR):
+- os.mkdir(LOG_DIR)
+-if not os.path.exists(MEDIA_ROOT):
+- os.mkdir(MEDIA_ROOT)
+-if not os.path.exists(CACHE_DIR):
+- os.mkdir(CACHE_DIR)
++def mkdir(path):
++ with suppress(FileExistsError):
++ os.mkdir(path)
++
++mkdir(DATA_DIR)
++mkdir(LOG_DIR)
++mkdir(MEDIA_ROOT)
++mkdir(CACHE_DIR)
+
+ if config.has_option('django', 'secret'):
+ SECRET_KEY = config.get('django', 'secret')
+--
+2.45.2
+
diff --git a/pkgs/by-name/pr/progress-tracker/package.nix b/pkgs/by-name/pr/progress-tracker/package.nix
index 6383e5ad0e9c..f67d334d5440 100644
--- a/pkgs/by-name/pr/progress-tracker/package.nix
+++ b/pkgs/by-name/pr/progress-tracker/package.nix
@@ -13,13 +13,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "progress-tracker";
- version = "1.5.2";
+ version = "1.6";
src = fetchFromGitHub {
owner = "smolBlackCat";
repo = "progress-tracker";
rev = "v${finalAttrs.version}";
- hash = "sha256-SM68TPxCMmLELKuryx4jde9TeK4mxfSrZ+uE/lFdP7M=";
+ hash = "sha256-uUw3+BJWRoCT1VH27SZBEBRsEbbpaP4IahKonfSOyeM=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix
index dfac73d89950..b6d8ebc16b42 100644
--- a/pkgs/by-name/si/signaturepdf/package.nix
+++ b/pkgs/by-name/si/signaturepdf/package.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "signaturepdf";
- version = "1.5.1";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "24eme";
repo = "${pname}";
rev = "v${version}";
- hash = "sha256-5isvVyT8s2ZAhLP4x/jjxDssBQ2WAvYDkGOWf3NcjHM=";
+ hash = "sha256-lDvPPnwMKtM/ZxY6ei5GH7qFrZtRPrbZbi+csfL80jE=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index ee53cc4932d7..7f9f2c15fce9 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "stackit-cli";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "stackitcloud";
repo = "stackit-cli";
rev = "v${version}";
- hash = "sha256-lw3KzARVkKrFs8Ql+WlA2LJNj6x6f8+/+XnyLnQwxw4=";
+ hash = "sha256-+kIfw2lCRaQcpz4UUCZt6wTthF/otgma9JTQx3n+N5c=";
};
- vendorHash = "sha256-0cwkFDUKjwEHY5fT1pUJIWEZaGhDm3pEqtC+hDZjE0g=";
+ vendorHash = "sha256-1jUfhLodmJhV5X1EkRgOJ8jQF83Lu+8U+tC8tDoyCdk=";
subPackages = [ "." ];
diff --git a/pkgs/by-name/yg/yggstack/package.nix b/pkgs/by-name/yg/yggstack/package.nix
new file mode 100644
index 000000000000..98751e3178cb
--- /dev/null
+++ b/pkgs/by-name/yg/yggstack/package.nix
@@ -0,0 +1,36 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "yggstack";
+ version = "0-unstable-2024-07-26";
+
+ src = fetchFromGitHub {
+ owner = "yggdrasil-network";
+ repo = "yggstack";
+ rev = "5a87e43f9a7a0efdb20c9bc9a2e342c335a8767b";
+ sha256 = "sha256-1/Tr4LYXO+GIDzVAjFmPPsXD6X9ZKs1lFpLy4K4zeMw=";
+ };
+
+ vendorHash = "sha256-Sw9FCeZ6kIaEuxJ71XnxbbTdknBomxFuEeEyCSXeJcM=";
+
+ ldflags = [
+ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}"
+ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}"
+ "-X github.com/yggdrasil-network/yggdrasil-go/src/config.defaultAdminListen=unix:///var/run/yggdrasil/yggdrasil.sock"
+ "-s"
+ "-w"
+ ];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Yggdrasil as SOCKS proxy / port forwarder";
+ homepage = "https://yggdrasil-network.github.io/";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ ehmry ];
+ };
+}
diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock
index 738ab3da1c3a..742c023129a6 100644
--- a/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/pkgs/by-name/ze/zed-editor/Cargo.lock
@@ -210,9 +210,9 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.3"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
[[package]]
name = "anstyle-parse"
@@ -248,7 +248,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"futures 0.3.28",
- "http 0.1.0",
+ "http_client",
"isahc",
"schemars",
"serde",
@@ -372,15 +372,16 @@ version = "0.1.0"
dependencies = [
"anthropic",
"anyhow",
+ "assets",
"assistant_slash_command",
"async-watch",
- "breadcrumbs",
"cargo_toml",
"chrono",
"client",
"clock",
"collections",
"command_palette_hooks",
+ "completion",
"ctor",
"editor",
"env_logger",
@@ -391,10 +392,11 @@ dependencies = [
"gpui",
"heed",
"html_to_markdown 0.1.0",
- "http 0.1.0",
+ "http_client",
"indexed_docs",
"indoc",
"language",
+ "language_model",
"log",
"menu",
"multi_buffer",
@@ -408,6 +410,7 @@ dependencies = [
"rand 0.8.5",
"regex",
"rope",
+ "roxmltree 0.20.0",
"schemars",
"search",
"semantic_index",
@@ -416,14 +419,11 @@ dependencies = [
"settings",
"similar",
"smol",
- "strsim 0.11.1",
- "strum",
"telemetry_events",
"terminal",
"terminal_view",
"text",
"theme",
- "tiktoken-rs",
"toml 0.8.10",
"ui",
"unindent",
@@ -945,17 +945,6 @@ version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
[[package]]
name = "audio"
version = "0.1.0"
@@ -978,11 +967,12 @@ dependencies = [
"db",
"editor",
"gpui",
- "http 0.1.0",
+ "http_client",
"isahc",
"log",
"markdown_preview",
"menu",
+ "paths",
"release_channel",
"schemars",
"serde",
@@ -1650,7 +1640,7 @@ dependencies = [
[[package]]
name = "blade-graphics"
version = "0.4.0"
-source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818"
+source = "git+https://github.com/zed-industries/blade?rev=7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e#7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e"
dependencies = [
"ash",
"ash-window",
@@ -1680,7 +1670,7 @@ dependencies = [
[[package]]
name = "blade-macros"
version = "0.2.1"
-source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818"
+source = "git+https://github.com/zed-industries/blade?rev=7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e#7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e"
dependencies = [
"proc-macro2",
"quote",
@@ -1690,7 +1680,7 @@ dependencies = [
[[package]]
name = "blade-util"
version = "0.1.0"
-source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818"
+source = "git+https://github.com/zed-industries/blade?rev=7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e#7e497c534d5d4a30c18d9eb182cf39eaf0aaa25e"
dependencies = [
"blade-graphics",
"bytemuck",
@@ -1749,47 +1739,26 @@ dependencies = [
[[package]]
name = "borsh"
-version = "0.10.3"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
+checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
dependencies = [
"borsh-derive",
- "hashbrown 0.13.2",
+ "cfg_aliases 0.2.1",
]
[[package]]
name = "borsh-derive"
-version = "0.10.3"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7"
-dependencies = [
- "borsh-derive-internal",
- "borsh-schema-derive-internal",
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-derive-internal"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb"
+checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-schema-derive-internal"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "syn 2.0.59",
+ "syn_derive",
]
[[package]]
@@ -1919,7 +1888,7 @@ dependencies = [
"fs",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"language",
"live_kit_client",
"log",
@@ -2072,7 +2041,6 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49"
dependencies = [
- "clap 3.2.25",
"heck 0.4.1",
"indexmap 1.9.3",
"log",
@@ -2132,6 +2100,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
[[package]]
name = "channel"
version = "0.1.0"
@@ -2142,7 +2116,7 @@ dependencies = [
"collections",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"language",
"log",
"rand 0.8.5",
@@ -2234,21 +2208,6 @@ dependencies = [
"libloading 0.7.4",
]
-[[package]]
-name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_lex 0.2.4",
- "indexmap 1.9.3",
- "strsim 0.10.0",
- "termcolor",
- "textwrap",
-]
-
[[package]]
name = "clap"
version = "4.4.4"
@@ -2267,8 +2226,8 @@ checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
dependencies = [
"anstream",
"anstyle",
- "clap_lex 0.5.1",
- "strsim 0.10.0",
+ "clap_lex",
+ "strsim",
]
[[package]]
@@ -2283,15 +2242,6 @@ dependencies = [
"syn 2.0.59",
]
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
[[package]]
name = "clap_lex"
version = "0.5.1"
@@ -2303,7 +2253,7 @@ name = "cli"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap 4.4.4",
+ "clap",
"core-foundation",
"core-services",
"exec",
@@ -2377,8 +2327,7 @@ dependencies = [
"fs",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
- "isahc",
+ "http_client",
"lazy_static",
"log",
"once_cell",
@@ -2417,15 +2366,6 @@ dependencies = [
"smallvec",
]
-[[package]]
-name = "cmake"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "cocoa"
version = "0.25.0"
@@ -2489,6 +2429,7 @@ dependencies = [
"clock",
"collab_ui",
"collections",
+ "completion",
"ctor",
"dashmap",
"dev_server_projects",
@@ -2504,9 +2445,10 @@ dependencies = [
"gpui",
"headless",
"hex",
- "http 0.1.0",
+ "http_client",
"indoc",
"language",
+ "language_model",
"live_kit_client",
"live_kit_server",
"log",
@@ -2525,6 +2467,8 @@ dependencies = [
"rand 0.8.5",
"recent_projects",
"release_channel",
+ "remote",
+ "remote_server",
"reqwest",
"rpc",
"rustc-demangle",
@@ -2535,6 +2479,7 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
+ "session",
"settings",
"sha2 0.10.7",
"sqlx",
@@ -2564,6 +2509,7 @@ dependencies = [
"anyhow",
"call",
"channel",
+ "chrono",
"client",
"collections",
"db",
@@ -2572,7 +2518,7 @@ dependencies = [
"futures 0.3.28",
"fuzzy",
"gpui",
- "http 0.1.0",
+ "http_client",
"language",
"lazy_static",
"menu",
@@ -2668,6 +2614,28 @@ dependencies = [
"gpui",
]
+[[package]]
+name = "completion"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "ctor",
+ "editor",
+ "env_logger",
+ "futures 0.3.28",
+ "gpui",
+ "language",
+ "language_model",
+ "project",
+ "rand 0.8.5",
+ "serde",
+ "settings",
+ "smol",
+ "text",
+ "ui",
+ "unindent",
+]
+
[[package]]
name = "concurrent-queue"
version = "2.2.0"
@@ -2690,12 +2658,6 @@ dependencies = [
"windows-sys 0.45.0",
]
-[[package]]
-name = "const-cstr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
-
[[package]]
name = "const-oid"
version = "0.9.5"
@@ -2753,7 +2715,7 @@ dependencies = [
"fs",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"indoc",
"language",
"lsp",
@@ -2927,18 +2889,18 @@ dependencies = [
[[package]]
name = "cranelift-bforest"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a535eb1cf5a6003197dc569320c40c1cb2d2f97ef5d5348eebf067f20957381"
+checksum = "3b57d4f3ffc28bbd6ef1ca7b50b20126717232f97487efe027d135d9d87eb29c"
dependencies = [
"cranelift-entity",
]
[[package]]
name = "cranelift-codegen"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11b5066db32cec1492573827183af2142d2d88fe85a83cfc9e73f0f63d3788d4"
+checksum = "d1f7d0ac7fd53f2c29db3ff9a063f6ff5a8be2abaa8f6942aceb6e1521e70df7"
dependencies = [
"bumpalo",
"cranelift-bforest",
@@ -2957,33 +2919,33 @@ dependencies = [
[[package]]
name = "cranelift-codegen-meta"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64942e5774308e835fbad4dd25f253105412c90324631910e1ec27963147bddb"
+checksum = "b40bf21460a600178956cb7fd900a7408c6587fbb988a8063f7215361801a1da"
dependencies = [
"cranelift-codegen-shared",
]
[[package]]
name = "cranelift-codegen-shared"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39c33db9a86dd6d8d04166a10c53deb477aeea3500eaaefca682e4eda9bb986"
+checksum = "d792ecc1243b7ebec4a7f77d9ed428ef27456eeb1f8c780587a6f5c38841be19"
[[package]]
name = "cranelift-control"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7fc4937613aea3156a0538800a17bf56f345a5da2e79ae3df58488c93d867f"
+checksum = "cea2808043df964b73ad7582e09afbbe06a31f3fb9db834d53e74b4e16facaeb"
dependencies = [
"arbitrary",
]
[[package]]
name = "cranelift-entity"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f85575e79a153ce1ddbfb7fe1813519b4bfe1eb200cc9c8353b45ad123ae4d36"
+checksum = "f1930946836da6f514da87625cd1a0331f3908e0de454628c24a0b97b130c4d4"
dependencies = [
"serde",
"serde_derive",
@@ -2991,9 +2953,9 @@ dependencies = [
[[package]]
name = "cranelift-frontend"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc31d6c0ab2249fe0c21e988256b42f5f401ab2673b4fc40076c82a698bdfb9"
+checksum = "5482a5fcdf98f2f31b21093643bdcfe9030866b8be6481117022e7f52baa0f2b"
dependencies = [
"cranelift-codegen",
"log",
@@ -3003,15 +2965,15 @@ dependencies = [
[[package]]
name = "cranelift-isle"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc14f37e3314c0e4c53779c2f46753bf242efff76ee9473757a1fff3b495ad37"
+checksum = "6f6e1869b6053383bdb356900e42e33555b4c9ebee05699469b7c53cdafc82ea"
[[package]]
name = "cranelift-native"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ea5375f76ab31f9800a23fb2b440810286a6f669a3eb467cdd7ff255ea64268"
+checksum = "a91446e8045f1c4bc164b7bba68e2419c623904580d4b730877a663c6da38964"
dependencies = [
"cranelift-codegen",
"libc",
@@ -3020,9 +2982,9 @@ dependencies = [
[[package]]
name = "cranelift-wasm"
-version = "0.106.0"
+version = "0.106.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79851dba01b1fa83fad95134aa27beca88dc4b027121d92ab19788582389dc5f"
+checksum = "f8b17979b862d3b0d52de6ae3294ffe4d86c36027b56ad0443a7c8c8f921d14f"
dependencies = [
"cranelift-codegen",
"cranelift-entity",
@@ -3069,19 +3031,19 @@ dependencies = [
[[package]]
name = "criterion"
-version = "0.4.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
dependencies = [
"anes",
- "atty",
"cast",
"ciborium",
- "clap 3.2.25",
+ "clap",
"criterion-plot",
+ "is-terminal",
"itertools 0.10.5",
- "lazy_static",
"num-traits",
+ "once_cell",
"oorandom",
"plotters",
"rayon",
@@ -3482,16 +3444,6 @@ dependencies = [
"dirs-sys 0.4.1",
]
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
[[package]]
name = "dirs-sys"
version = "0.3.7"
@@ -3515,17 +3467,6 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
[[package]]
name = "dlib"
version = "0.5.2"
@@ -3593,6 +3534,7 @@ dependencies = [
"aho-corasick",
"anyhow",
"assets",
+ "chrono",
"client",
"clock",
"collections",
@@ -3601,11 +3543,12 @@ dependencies = [
"db",
"emojis",
"env_logger",
+ "file_icons",
"futures 0.3.28",
"fuzzy",
"git",
"gpui",
- "http 0.1.0",
+ "http_client",
"indoc",
"itertools 0.11.0",
"language",
@@ -3740,12 +3683,12 @@ dependencies = [
[[package]]
name = "env_logger"
-version = "0.9.3"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
dependencies = [
- "atty",
"humantime",
+ "is-terminal",
"log",
"regex",
"termcolor",
@@ -3928,7 +3871,7 @@ dependencies = [
"fs",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"indexed_docs",
"isahc",
"language",
@@ -3965,10 +3908,11 @@ name = "extension_cli"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap 4.4.4",
+ "clap",
"env_logger",
"extension",
"fs",
+ "http_client",
"language",
"log",
"rpc",
@@ -4086,7 +4030,7 @@ dependencies = [
"editor",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"human_bytes",
"isahc",
"language",
@@ -4208,9 +4152,9 @@ checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
[[package]]
name = "float-ord"
-version = "0.2.0"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e"
+checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
[[package]]
name = "flume"
@@ -4232,18 +4176,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "font-kit"
-version = "0.11.0"
-source = "git+https://github.com/zed-industries/font-kit?rev=5a5c4d4#5a5c4d4ca395c74eb0abde38508e170ce0fd761a"
+version = "0.14.1"
+source = "git+https://github.com/zed-industries/font-kit?rev=40391b7#40391b7c0041d8a8572af2afa3de32ae088f0120"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
"byteorder",
"core-foundation",
"core-graphics",
"core-text",
- "dirs-next",
+ "dirs 5.0.1",
"dwrote",
"float-ord",
- "freetype",
+ "freetype-sys",
"lazy_static",
"libc",
"log",
@@ -4269,7 +4213,7 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
dependencies = [
- "roxmltree",
+ "roxmltree 0.19.0",
]
[[package]]
@@ -4346,23 +4290,13 @@ dependencies = [
"percent-encoding",
]
-[[package]]
-name = "freetype"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
-dependencies = [
- "freetype-sys",
- "libc",
-]
-
[[package]]
name = "freetype-sys"
-version = "0.13.1"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
+checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134"
dependencies = [
- "cmake",
+ "cc",
"libc",
"pkg-config",
]
@@ -4701,7 +4635,7 @@ dependencies = [
"derive_more",
"git2",
"gpui",
- "http 0.1.0",
+ "http_client",
"lazy_static",
"log",
"parking_lot",
@@ -4741,7 +4675,7 @@ dependencies = [
"futures 0.3.28",
"git",
"gpui",
- "http 0.1.0",
+ "http_client",
"isahc",
"pretty_assertions",
"regex",
@@ -4825,7 +4759,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"futures 0.3.28",
- "http 0.1.0",
+ "http_client",
"serde",
"serde_json",
]
@@ -4895,7 +4829,7 @@ dependencies = [
"foreign-types 0.5.0",
"futures 0.3.28",
"gpui_macros",
- "http 0.1.0",
+ "http_client",
"image",
"itertools 0.11.0",
"lazy_static",
@@ -4975,9 +4909,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.21"
+version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
dependencies = [
"bytes 1.5.0",
"fnv",
@@ -4985,7 +4919,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.9",
- "indexmap 1.9.3",
+ "indexmap 2.2.6",
"slab",
"tokio",
"tokio-util",
@@ -5147,15 +5081,6 @@ dependencies = [
"serde_json",
]
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "hermit-abi"
version = "0.3.9"
@@ -5266,20 +5191,6 @@ dependencies = [
"regex",
]
-[[package]]
-name = "http"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.28",
- "futures-lite 1.13.0",
- "isahc",
- "log",
- "serde",
- "serde_json",
- "url",
-]
-
[[package]]
name = "http"
version = "0.2.9"
@@ -5319,6 +5230,22 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
+[[package]]
+name = "http_client"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "derive_more",
+ "futures 0.3.28",
+ "futures-lite 1.13.0",
+ "http 1.0.0",
+ "isahc",
+ "log",
+ "serde",
+ "serde_json",
+ "url",
+]
+
[[package]]
name = "httparse"
version = "1.8.0"
@@ -5493,7 +5420,6 @@ dependencies = [
"gpui",
"project",
"ui",
- "util",
"workspace",
]
@@ -5523,7 +5449,7 @@ dependencies = [
"gpui",
"heed",
"html_to_markdown 0.1.0",
- "http 0.1.0",
+ "http_client",
"indexmap 1.9.3",
"indoc",
"parking_lot",
@@ -5674,7 +5600,7 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
"libc",
"windows-sys 0.48.0",
]
@@ -5728,6 +5654,17 @@ dependencies = [
"once_cell",
]
+[[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-wsl"
version = "0.4.0"
@@ -5942,6 +5879,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
+ "async-watch",
"clock",
"collections",
"ctor",
@@ -5951,7 +5889,7 @@ dependencies = [
"git",
"globset",
"gpui",
- "http 0.1.0",
+ "http_client",
"indoc",
"itertools 0.11.0",
"lazy_static",
@@ -5989,6 +5927,42 @@ dependencies = [
"util",
]
+[[package]]
+name = "language_model"
+version = "0.1.0"
+dependencies = [
+ "anthropic",
+ "anyhow",
+ "client",
+ "collections",
+ "ctor",
+ "editor",
+ "env_logger",
+ "feature_flags",
+ "futures 0.3.28",
+ "gpui",
+ "http_client",
+ "language",
+ "log",
+ "menu",
+ "ollama",
+ "open_ai",
+ "project",
+ "proto",
+ "rand 0.8.5",
+ "schemars",
+ "serde",
+ "serde_json",
+ "settings",
+ "strum",
+ "text",
+ "theme",
+ "tiktoken-rs",
+ "ui",
+ "unindent",
+ "util",
+]
+
[[package]]
name = "language_selector"
version = "0.1.0"
@@ -6042,7 +6016,7 @@ dependencies = [
"feature_flags",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"language",
"lazy_static",
"log",
@@ -6198,15 +6172,6 @@ dependencies = [
"vcpkg",
]
-[[package]]
-name = "line-wrap"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
-dependencies = [
- "safemem",
-]
-
[[package]]
name = "linkify"
version = "0.10.0"
@@ -6577,11 +6542,11 @@ dependencies = [
[[package]]
name = "metal"
-version = "0.25.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "550b24b0cd4cf923f36bae78eca457b3a10d8a6a14a9c84cb2687b527e6a84af"
+checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
"block",
"core-graphics-types",
"foreign-types 0.5.0",
@@ -6682,13 +6647,14 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
[[package]]
name = "naga"
-version = "0.20.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=425526828f738c95ec50b016c6a761bc00d2fb25#425526828f738c95ec50b016c6a761bc00d2fb25"
+version = "22.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09eeccb9b50f4f7839b214aa3e08be467159506a986c18e0702170ccf720a453"
dependencies = [
"arrayvec",
"bit-set 0.6.0",
"bitflags 2.6.0",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
"codespan-reporting",
"hexf-parse",
"indexmap 2.2.6",
@@ -6802,7 +6768,7 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
dependencies = [
"bitflags 2.6.0",
"cfg-if",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
"libc",
]
@@ -6817,7 +6783,7 @@ dependencies = [
"async-trait",
"async_zip",
"futures 0.3.28",
- "http 0.1.0",
+ "http_client",
"log",
"paths",
"semver",
@@ -6926,23 +6892,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "num-bigint-dig"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9bc3e36fd683e004fd59c64a425e0e991616f5a8b617c3b9a933a93c168facc"
-dependencies = [
- "byteorder",
- "lazy_static",
- "libm",
- "num-integer",
- "num-iter",
- "num-traits",
- "rand 0.8.5",
- "smallvec",
- "zeroize",
-]
-
[[package]]
name = "num-bigint-dig"
version = "0.8.4"
@@ -7057,7 +7006,7 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
"libc",
]
@@ -7113,16 +7062,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
dependencies = [
"malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
]
[[package]]
@@ -7166,7 +7105,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"futures 0.3.28",
- "http 0.1.0",
+ "http_client",
"isahc",
"schemars",
"serde",
@@ -7198,7 +7137,7 @@ dependencies = [
"hkdf",
"hmac 0.12.1",
"num",
- "num-bigint-dig 0.8.4",
+ "num-bigint-dig",
"pbkdf2 0.12.2",
"rand 0.8.5",
"serde",
@@ -7237,7 +7176,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"futures 0.3.28",
- "http 0.1.0",
+ "http_client",
"isahc",
"schemars",
"serde",
@@ -7247,9 +7186,9 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.10.57"
+version = "0.10.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
dependencies = [
"bitflags 2.6.0",
"cfg-if",
@@ -7288,9 +7227,9 @@ dependencies = [
[[package]]
name = "openssl-sys"
-version = "0.9.93"
+version = "0.9.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
dependencies = [
"cc",
"libc",
@@ -7333,12 +7272,6 @@ dependencies = [
"pin-project-lite",
]
-[[package]]
-name = "os_str_bytes"
-version = "6.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
-
[[package]]
name = "ouroboros"
version = "0.17.2"
@@ -7545,8 +7478,9 @@ dependencies = [
[[package]]
name = "pathfinder_simd"
-version = "0.5.3"
-source = "git+https://github.com/servo/pathfinder.git?rev=4968e819c0d9b015437ffc694511e175801a17c7#4968e819c0d9b015437ffc694511e175801a17c7"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2"
dependencies = [
"rustc_version",
]
@@ -7584,17 +7518,6 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-[[package]]
-name = "pem"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
-dependencies = [
- "base64 0.13.1",
- "once_cell",
- "regex",
-]
-
[[package]]
name = "pem-rfc7468"
version = "0.7.0"
@@ -7764,7 +7687,7 @@ checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
dependencies = [
"der 0.7.8",
"pkcs8 0.10.2",
- "spki 0.7.2",
+ "spki 0.7.3",
]
[[package]]
@@ -7784,7 +7707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
dependencies = [
"der 0.7.8",
- "spki 0.7.2",
+ "spki 0.7.3",
]
[[package]]
@@ -7795,14 +7718,13 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "plist"
-version = "1.5.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa"
+checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
dependencies = [
- "base64 0.21.7",
- "indexmap 1.9.3",
- "line-wrap",
- "quick-xml 0.30.0",
+ "base64 0.22.0",
+ "indexmap 2.2.6",
+ "quick-xml 0.32.0",
"serde",
"time",
]
@@ -7958,15 +7880,6 @@ dependencies = [
"syn 2.0.59",
]
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml 0.5.11",
-]
-
[[package]]
name = "proc-macro-crate"
version = "1.3.1"
@@ -8057,7 +7970,7 @@ dependencies = [
"git2",
"globset",
"gpui",
- "http 0.1.0",
+ "http_client",
"itertools 0.11.0",
"language",
"log",
@@ -8072,6 +7985,7 @@ dependencies = [
"rand 0.8.5",
"regex",
"release_channel",
+ "remote",
"rpc",
"schemars",
"serde",
@@ -8105,6 +8019,7 @@ dependencies = [
"db",
"editor",
"file_icons",
+ "futures 0.3.28",
"git",
"gpui",
"language",
@@ -8289,18 +8204,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quick-xml"
-version = "0.30.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
dependencies = [
"memchr",
]
[[package]]
name = "quick-xml"
-version = "0.31.0"
+version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
dependencies = [
"memchr",
]
@@ -8536,6 +8451,7 @@ dependencies = [
"rpc",
"serde",
"serde_json",
+ "settings",
"smol",
"task",
"terminal_view",
@@ -8667,6 +8583,54 @@ dependencies = [
"once_cell",
]
+[[package]]
+name = "remote"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "fs",
+ "futures 0.3.28",
+ "gpui",
+ "log",
+ "parking_lot",
+ "prost",
+ "rpc",
+ "serde",
+ "serde_json",
+ "smol",
+ "tempfile",
+ "util",
+]
+
+[[package]]
+name = "remote_server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "cargo_toml",
+ "client",
+ "clock",
+ "env_logger",
+ "fs",
+ "futures 0.3.28",
+ "gpui",
+ "http_client",
+ "language",
+ "log",
+ "node_runtime",
+ "project",
+ "remote",
+ "rpc",
+ "serde",
+ "serde_json",
+ "settings",
+ "smol",
+ "toml 0.8.10",
+ "util",
+ "worktree",
+]
+
[[package]]
name = "rend"
version = "0.4.0"
@@ -8693,13 +8657,16 @@ dependencies = [
"anyhow",
"async-dispatcher",
"base64 0.13.1",
+ "client",
"collections",
+ "command_palette_hooks",
"editor",
"env_logger",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"image",
+ "indoc",
"language",
"log",
"multi_buffer",
@@ -8897,6 +8864,12 @@ version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+[[package]]
+name = "roxmltree"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
+
[[package]]
name = "rpc"
version = "0.1.0"
@@ -8912,9 +8885,10 @@ dependencies = [
"parking_lot",
"proto",
"rand 0.8.5",
- "rsa 0.4.0",
+ "rsa",
"serde",
"serde_json",
+ "sha2 0.10.7",
"strum",
"tracing",
"util",
@@ -8923,51 +8897,29 @@ dependencies = [
[[package]]
name = "rsa"
-version = "0.4.0"
+version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ef841a26fc5d040ced0417c6c6a64ee851f42489df11cdf0218e545b6f8d28"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
dependencies = [
- "byteorder",
- "digest 0.9.0",
- "lazy_static",
- "num-bigint-dig 0.7.1",
- "num-integer",
- "num-iter",
- "num-traits",
- "pem",
- "rand 0.8.5",
- "simple_asn1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rsa"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8"
-dependencies = [
- "byteorder",
"const-oid",
"digest 0.10.7",
- "num-bigint-dig 0.8.4",
+ "num-bigint-dig",
"num-integer",
- "num-iter",
"num-traits",
"pkcs1",
"pkcs8 0.10.2",
"rand_core 0.6.4",
"signature 2.1.0",
- "spki 0.7.2",
+ "spki 0.7.3",
"subtle",
"zeroize",
]
[[package]]
name = "runtimelib"
-version = "0.12.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a4a788465cf51b7ac8f36e4e4ca3dd26013dcddd5ba8376f98752278244294"
+checksum = "0c3d817764e3971867351e6103955b17d808f5330e9ef63aaaaab55bf8c664c1"
dependencies = [
"anyhow",
"async-dispatcher",
@@ -9026,9 +8978,9 @@ dependencies = [
[[package]]
name = "rust_decimal"
-version = "1.32.0"
+version = "1.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd"
+checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
dependencies = [
"arrayvec",
"borsh",
@@ -9173,12 +9125,6 @@ version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-
[[package]]
name = "salsa20"
version = "0.8.1"
@@ -9450,13 +9396,14 @@ dependencies = [
"client",
"clock",
"collections",
+ "completion",
"env_logger",
"fs",
"futures 0.3.28",
"futures-batch",
"gpui",
"heed",
- "http 0.1.0",
+ "http_client",
"language",
"languages",
"log",
@@ -9598,6 +9545,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "session"
+version = "0.1.0"
+dependencies = [
+ "db",
+ "util",
+ "uuid",
+]
+
[[package]]
name = "settings"
version = "0.1.0"
@@ -9625,6 +9581,21 @@ dependencies = [
"util",
]
+[[package]]
+name = "settings_ui"
+version = "0.1.0"
+dependencies = [
+ "command_palette_hooks",
+ "feature_flags",
+ "fs",
+ "gpui",
+ "project",
+ "settings",
+ "theme",
+ "ui",
+ "workspace",
+]
+
[[package]]
name = "sha-1"
version = "0.9.8"
@@ -9784,18 +9755,6 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec"
-[[package]]
-name = "simple_asn1"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80"
-dependencies = [
- "chrono",
- "num-bigint",
- "num-traits",
- "thiserror",
-]
-
[[package]]
name = "simplecss"
version = "0.2.1"
@@ -9985,9 +9944,9 @@ dependencies = [
[[package]]
name = "spki"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
dependencies = [
"base64ct",
"der 0.7.8",
@@ -10169,7 +10128,7 @@ dependencies = [
"once_cell",
"percent-encoding",
"rand 0.8.5",
- "rsa 0.9.2",
+ "rsa",
"rust_decimal",
"serde",
"sha1",
@@ -10280,7 +10239,7 @@ name = "storybook"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap 4.4.4",
+ "clap",
"collab_ui",
"ctrlc",
"dialoguer",
@@ -10355,12 +10314,6 @@ 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 = "strum"
version = "0.25.0"
@@ -10412,7 +10365,7 @@ dependencies = [
"env_logger",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"language",
"log",
"postage",
@@ -10422,6 +10375,7 @@ dependencies = [
"settings",
"smol",
"supermaven_api",
+ "text",
"theme",
"ui",
"util",
@@ -10433,7 +10387,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"futures 0.3.28",
- "http 0.1.0",
+ "http_client",
"paths",
"serde",
"serde_json",
@@ -10557,6 +10511,18 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.59",
+]
+
[[package]]
name = "sync_wrapper"
version = "0.1.2"
@@ -10831,7 +10797,7 @@ dependencies = [
"ctor",
"env_logger",
"gpui",
- "http 0.1.0",
+ "http_client",
"lazy_static",
"log",
"parking_lot",
@@ -10844,12 +10810,6 @@ dependencies = [
"util",
]
-[[package]]
-name = "textwrap"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
-
[[package]]
name = "theme"
version = "0.1.0"
@@ -10882,7 +10842,7 @@ name = "theme_importer"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap 4.4.4",
+ "clap",
"gpui",
"indexmap 1.9.3",
"log",
@@ -10919,18 +10879,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.61"
+version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
dependencies = [
"proc-macro2",
"quote",
@@ -11103,7 +11063,7 @@ dependencies = [
"extensions_ui",
"feedback",
"gpui",
- "http 0.1.0",
+ "http_client",
"notifications",
"pretty_assertions",
"project",
@@ -11895,7 +11855,7 @@ dependencies = [
"kurbo",
"log",
"pico-args",
- "roxmltree",
+ "roxmltree 0.19.0",
"simplecss",
"siphasher 1.0.1",
"strict-num",
@@ -12168,6 +12128,12 @@ 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"
@@ -12282,9 +12248,9 @@ dependencies = [
[[package]]
name = "wasmtime"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a08af88fa3d324cc5cf6d388d90ef396a787b3fb4bbd51ba185f8645dc0f02c"
+checksum = "4e300c0e3f19dc9064e3b17ce661088646c70dbdde36aab46470ed68ba58db7d"
dependencies = [
"anyhow",
"async-trait",
@@ -12320,9 +12286,9 @@ dependencies = [
[[package]]
name = "wasmtime-asm-macros"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16cdbfcf28542bcda0b5fd68d44603e53e5ad126cbe7b9f25c130e1249fd8211"
+checksum = "110aa598e02a136fb095ca70fa96367fc16bab55256a131e66f9b58f16c73daf"
dependencies = [
"cfg-if",
]
@@ -12353,9 +12319,9 @@ dependencies = [
[[package]]
name = "wasmtime-component-macro"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cdcf690257c623506eeec3a502864b282aab0fdfd6981c1ebb63c7e98f4a23a"
+checksum = "091f32ce586251ac4d07019388fb665b010d9518ffe47be1ddbabb162eed6007"
dependencies = [
"anyhow",
"proc-macro2",
@@ -12368,15 +12334,15 @@ dependencies = [
[[package]]
name = "wasmtime-component-util"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3ae7bf66e2fae1e332ab3634f332d7422e878a6eecc47c8f8f78cc1f24e501"
+checksum = "0dd17dc1ebc0b28fd24b6b9d07638f55b82ae908918ff08fd221f8b0fefa9125"
[[package]]
name = "wasmtime-cranelift"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ea025c969a09117818732fa6f96848e858a7953d4659dab8081a6eea3c0523"
+checksum = "e923262451a4b5b39fe02f69f1338d56356db470e289ea1887346b9c7f592738"
dependencies = [
"anyhow",
"cfg-if",
@@ -12399,9 +12365,9 @@ dependencies = [
[[package]]
name = "wasmtime-cranelift-shared"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcd6dd2f8d8d4860b384f61f89b597633a5b5f0943c546210e5084c5d321fe20"
+checksum = "508898cbbea0df81a5d29cfc1c7c72431a1bc4c9e89fd9514b4c868474c05c7a"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -12415,9 +12381,9 @@ dependencies = [
[[package]]
name = "wasmtime-environ"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f60f3f717658dd77745de03b750d5852126e9be6dad465848c77f90387c44c9"
+checksum = "d7e3f2aa72dbb64c19708646e1ff97650f34e254598b82bad5578ea9c80edd30"
dependencies = [
"anyhow",
"bincode",
@@ -12441,9 +12407,9 @@ dependencies = [
[[package]]
name = "wasmtime-fiber"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf8cd22ab1041bf0e54b6283e57824557902e4fed8b1f3a7eef29cbaba89eebf"
+checksum = "9235b643527bcbac808216ed342e1fba324c95f14a62762acfa6f2e6ca5edbd6"
dependencies = [
"anyhow",
"cc",
@@ -12456,9 +12422,9 @@ dependencies = [
[[package]]
name = "wasmtime-jit-icache-coherence"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2796e4b4989db62899d2117e1e0258b839d088c044591b14e3a0396e7b3ae53a"
+checksum = "c22ca2ef4d87b23d400660373453e274b2251bc2d674e3102497f690135e04b0"
dependencies = [
"cfg-if",
"libc",
@@ -12467,9 +12433,9 @@ dependencies = [
[[package]]
name = "wasmtime-runtime"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf2b7745df452a4f41b9aab21d3f7ba1347b12da2fdc5241e59306127884a68"
+checksum = "1806ee242ca4fd183309b7406e4e83ae7739b7569f395d56700de7c7ef9f5eb8"
dependencies = [
"anyhow",
"cc",
@@ -12496,15 +12462,15 @@ dependencies = [
[[package]]
name = "wasmtime-slab"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83448ef600ad95977019ebaea84a5516fdbc9561d0a8e26b1e099351f993b527"
+checksum = "20c58bef9ce877fd06acb58f08d003af17cb05cc51225b455e999fbad8e584c0"
[[package]]
name = "wasmtime-types"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf6fe7ed3fd18ed4b1e4465fe5c8674acc9f03523fca5b1b9f975b2560cd741b"
+checksum = "cebe297aa063136d9d2e5b347c1528868aa43c2c8d0e1eb0eec144567e38fe0f"
dependencies = [
"cranelift-entity",
"serde",
@@ -12515,9 +12481,9 @@ dependencies = [
[[package]]
name = "wasmtime-versioned-export-macros"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d6d967f01032da7d4c6303da32f6a00d5efe1bac124b156e7342d8ace6ffdfc"
+checksum = "ffaafa5c12355b1a9ee068e9295d50c4ca0a400c721950cdae4f5b54391a2da5"
dependencies = [
"proc-macro2",
"quote",
@@ -12526,9 +12492,9 @@ dependencies = [
[[package]]
name = "wasmtime-wasi"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "371d828b6849ea06d598ae7dd1c316e8dd9e99b76f77d93d5886cb25c7f8e188"
+checksum = "b95961546319d4019625920756967a929879d1d46c4e5f89a74e9f4405655b0c"
dependencies = [
"anyhow",
"async-trait",
@@ -12557,9 +12523,9 @@ dependencies = [
[[package]]
name = "wasmtime-winch"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb8b3fcbc455105760e4a2aa8ee3f39b8357183a62201383b3f72d4836ca2be8"
+checksum = "d618b4e90d3f259b1b77411ce573c9f74aade561957102132e169918aabdc863"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -12574,9 +12540,9 @@ dependencies = [
[[package]]
name = "wasmtime-wit-bindgen"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96326c9800fb6c099f50d1bd2126d636fc2f96950e1675acf358c0f52516cd38"
+checksum = "7c7a253c8505edd7493603e548bff3af937b0b7dbf2b498bd5ff2131b651af72"
dependencies = [
"anyhow",
"heck 0.4.1",
@@ -12586,9 +12552,9 @@ dependencies = [
[[package]]
name = "wasmtime-wmemcheck"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36bd91a4dc55af0bf55e9e2ab0ea13724cfb5c5a1acdf8873039769208f59490"
+checksum = "c9a8c62e9df8322b2166d2a6f096fbec195ddb093748fd74170dcf25ef596769"
[[package]]
name = "wast"
@@ -12761,15 +12727,19 @@ dependencies = [
[[package]]
name = "whoami"
-version = "1.4.1"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+dependencies = [
+ "redox_syscall 0.4.1",
+ "wasite",
+]
[[package]]
name = "wiggle"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1136a209614ace00b0c11f04dc7cf42540773be3b22eff6ad165110aba29c1"
+checksum = "899d3fe5fbacd02f114cacdaa1cca9040280c4153c71833a77b9609c60ccf72b"
dependencies = [
"anyhow",
"async-trait",
@@ -12782,9 +12752,9 @@ dependencies = [
[[package]]
name = "wiggle-generate"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2bd99ce26046f4246d720a4198f6a8fc95bc5da82ae4ef62263e24641c3076"
+checksum = "2df5887f452cff44ffe1e1aba69b7fafe812deed38498446fa7a46b55e962cd5"
dependencies = [
"anyhow",
"heck 0.4.1",
@@ -12797,9 +12767,9 @@ dependencies = [
[[package]]
name = "wiggle-macro"
-version = "19.0.0"
+version = "19.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512d816dbcd0113103b2eb2402ec9018e7f0755202a5b3e67db726f229d8dcae"
+checksum = "acdb12de36507498abaa3a042f895a43ee00a2f6125b6901b9a27edf72bfdbe7"
dependencies = [
"proc-macro2",
"quote",
@@ -12840,9 +12810,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "winch-codegen"
-version = "0.17.0"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d285c833af9453c037cd220765f86c5c9961e8906a815829107c8801d535b8e4"
+checksum = "2d15869abc9e3bb29c017c003dbe007a08e9910e8ff9023a962aa13c1b2ee6af"
dependencies = [
"anyhow",
"cranelift-codegen",
@@ -13336,11 +13306,10 @@ dependencies = [
"derive_more",
"dev_server_projects",
"env_logger",
- "file_icons",
"fs",
"futures 0.3.28",
"gpui",
- "http 0.1.0",
+ "http_client",
"itertools 0.11.0",
"language",
"lazy_static",
@@ -13352,6 +13321,7 @@ dependencies = [
"schemars",
"serde",
"serde_json",
+ "session",
"settings",
"smallvec",
"sqlez",
@@ -13376,7 +13346,7 @@ dependencies = [
"git",
"git2",
"gpui",
- "http 0.1.0",
+ "http_client",
"ignore",
"language",
"log",
@@ -13534,7 +13504,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"cargo_toml",
- "clap 4.4.4",
+ "clap",
"toml 0.8.10",
]
@@ -13552,11 +13522,10 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
[[package]]
name = "yeslogic-fontconfig-sys"
-version = "3.2.0"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386"
+checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd"
dependencies = [
- "const-cstr",
"dlib",
"once_cell",
"pkg-config",
@@ -13628,7 +13597,7 @@ dependencies = [
[[package]]
name = "zed"
-version = "0.145.1"
+version = "0.146.3"
dependencies = [
"activity_indicator",
"anyhow",
@@ -13642,7 +13611,7 @@ dependencies = [
"call",
"channel",
"chrono",
- "clap 4.4.4",
+ "clap",
"cli",
"client",
"collab_ui",
@@ -13666,13 +13635,14 @@ dependencies = [
"go_to_line",
"gpui",
"headless",
- "http 0.1.0",
+ "http_client",
"image_viewer",
"inline_completion_button",
"install_cli",
"isahc",
"journal",
"language",
+ "language_model",
"language_selector",
"language_tools",
"languages",
@@ -13695,12 +13665,15 @@ dependencies = [
"quick_action_bar",
"recent_projects",
"release_channel",
+ "remote",
"repl",
"rope",
"search",
"serde",
"serde_json",
+ "session",
"settings",
+ "settings_ui",
"simplelog",
"smol",
"snippet_provider",
@@ -13715,6 +13688,7 @@ dependencies = [
"tree-sitter-markdown",
"tree-sitter-rust",
"ui",
+ "url",
"urlencoding",
"util",
"uuid",
@@ -13735,9 +13709,10 @@ dependencies = [
[[package]]
name = "zed_astro"
-version = "0.0.2"
+version = "0.0.3"
dependencies = [
- "zed_extension_api 0.0.4",
+ "serde",
+ "zed_extension_api 0.0.6",
]
[[package]]
@@ -13793,7 +13768,7 @@ dependencies = [
name = "zed_erlang"
version = "0.0.1"
dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
]
[[package]]
@@ -13870,7 +13845,7 @@ dependencies = [
[[package]]
name = "zed_php"
-version = "0.1.1"
+version = "0.1.2"
dependencies = [
"zed_extension_api 0.0.6",
]
@@ -13891,7 +13866,14 @@ dependencies = [
[[package]]
name = "zed_ruby"
-version = "0.0.6"
+version = "0.0.8"
+dependencies = [
+ "zed_extension_api 0.0.6",
+]
+
+[[package]]
+name = "zed_ruff"
+version = "0.0.2"
dependencies = [
"zed_extension_api 0.0.6",
]
@@ -13941,8 +13923,9 @@ dependencies = [
[[package]]
name = "zed_vue"
-version = "0.0.3"
+version = "0.1.0"
dependencies = [
+ "serde",
"zed_extension_api 0.0.6",
]
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index b6d8cd3ec00b..fe819582d213 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;
rustPlatform.buildRustPackage rec {
pname = "zed";
- version = "0.145.1";
+ version = "0.146.3";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
- hash = "sha256-fO1VT2LiZa9XkQxP7QcEG9uCTtEm3soces7FCFwosbU=";
+ hash = "sha256-7KDoJ9yEZkPl6PBYXLQ+c+pnJk50LOn3qxBjBEq8nFY=";
fetchSubmodules = true;
};
@@ -50,13 +50,11 @@ rustPlatform.buildRustPackage rec {
outputHashes = {
"alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI=";
"async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
- "blade-graphics-0.4.0" = "sha256-c0KhzG/FCpAyiafGZTbxDMz1ktCTURNDxO3fkB16nUw=";
+ "blade-graphics-0.4.0" = "sha256-o3iYBrHcLXSrdvd0J/LXJb7VkTcFyB/S2Nk9WrmZupI=";
"cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM=";
- "font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8=";
+ "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo=";
"lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";
- "naga-0.20.0" = "sha256-07lLKQLfWYyOwWmvzFQ0vMeuC5pxmclz6Ub72ooSmwk=";
"nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8=";
- "pathfinder_simd-0.5.3" = "sha256-94/qS5d0UKYXAdx+Lswj6clOTuuK2yxqWuhpYZ8x1nI=";
"tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE=";
"tree-sitter-go-0.20.0" = "sha256-/mE21JSa3LWEiOgYPJcq0FYzTbBuNwp9JdZTZqmDIUU=";
"tree-sitter-gowork-0.0.1" = "sha256-lM4L4Ap/c8uCr4xUw9+l/vaGb3FxxnuZI0+xKYFDPVg=";
@@ -142,6 +140,9 @@ rustPlatform.buildRustPackage rec {
checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
# Fails on certain hosts (including Hydra) for unclear reason
"--skip=test_open_paths_action"
+
+ # Flaky: unreliably fails on certain hosts (including Hydra)
+ "--skip=zed::tests::test_window_edit_state_restoring_enabled"
];
installPhase = ''
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index d26723aefdfd..675e2b6891b4 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
@@ -7,7 +7,6 @@
, libXext
, libXfixes
, libXtst
-, libxml2
, libxfce4ui
, libxfce4util
, wayland
@@ -23,10 +22,10 @@
mkXfceDerivation {
category = "apps";
pname = "xfce4-screenshooter";
- version = "1.11.0";
+ version = "1.11.1";
odd-unstable = false;
- sha256 = "sha256-DMLGaDHmwDDHvOMev/QKvmDr6AQ6Qnzxf3YCbf0/nXg=";
+ sha256 = "sha256-/N79YK233k9rVg5fGr27b8AZD9bCXllNQvrN4ghir/M=";
nativeBuildInputs = [
wayland-scanner
@@ -39,7 +38,6 @@ mkXfceDerivation {
libXext
libXfixes
libXtst
- libxml2
libxfce4ui
libxfce4util
wayland
diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index 91e2ddb01c8a..e7c5c30089c2 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -23,9 +23,9 @@
let unwrapped = mkXfceDerivation {
category = "xfce";
pname = "thunar";
- version = "4.18.10";
+ version = "4.18.11";
- sha256 = "sha256-jne+jETPmM6VksdwJAxruji/GKH42iftWm74Ok9qX44=";
+ sha256 = "sha256-B417gkrU9EG4ZsEdeuH8P2v4FqYUiTwqgKcO4cSi4SI=";
nativeBuildInputs = [
docbook_xsl
@@ -60,6 +60,13 @@ let unwrapped = mkXfceDerivation {
sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
'';
+ preFixup = ''
+ gappsWrapperArgs+=(
+ # https://github.com/NixOS/nixpkgs/issues/329688
+ --prefix PATH : ${lib.makeBinPath [ exo ]}
+ )
+ '';
+
meta = with lib; {
description = "Xfce file manager";
mainProgram = "thunar";
diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix
new file mode 100644
index 000000000000..ee89de4ac751
--- /dev/null
+++ b/pkgs/development/compilers/llvm/common/bolt/default.nix
@@ -0,0 +1,76 @@
+{
+ lib,
+ stdenv,
+ llvm_meta,
+ monorepoSrc,
+ runCommand,
+ cmake,
+ libxml2,
+ libllvm,
+ libclang,
+ version,
+ python3,
+ buildLlvmTools,
+ patches ? [ ],
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "bolt";
+ inherit version patches;
+
+ # Blank llvm dir just so relative path works
+ src = runCommand "bolt-src-${finalAttrs.version}" { } ''
+ mkdir $out
+ cp -r ${monorepoSrc}/cmake "$out"
+ cp -r ${monorepoSrc}/${finalAttrs.pname} "$out"
+ cp -r ${monorepoSrc}/third-party "$out"
+
+ # tablegen stuff, probably not the best way but it works...
+ cp -r ${monorepoSrc}/llvm/ "$out"
+ chmod -R +w $out/llvm
+ '';
+
+ sourceRoot = "${finalAttrs.src.name}/bolt";
+
+ nativeBuildInputs = [
+ cmake
+ python3
+ ];
+
+ buildInputs = [
+ libllvm
+ libclang
+ libxml2
+ ];
+
+ cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+ (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.llvm}/bin/llvm-tblgen")
+ ];
+
+ postUnpack = ''
+ chmod -R u+w -- $sourceRoot/..
+ '';
+
+ prePatch = ''
+ cd ..
+ '';
+
+ postPatch = ''
+ cd bolt
+ '';
+
+ postInstall = ''
+ mkdir -p $dev/lib
+ mv $out/lib/libLLVMBOLT*.a $dev/lib
+ '';
+
+ outputs = [
+ "out"
+ "dev"
+ ];
+
+ meta = llvm_meta // {
+ homepage = "https://github.com/llvm/llvm-project/tree/main/bolt";
+ description = "LLVM post-link optimizer.";
+ };
+})
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 0c7602e4f2fa..6ba1123dac19 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -633,6 +633,16 @@ let
mlir = callPackage ./mlir { };
libclc = callPackage ./libclc.nix { };
}
+ // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") {
+ bolt = callPackage ./bolt {
+ patches = lib.optionals (lib.versions.major metadata.release_version == "19") [
+ (fetchpatch {
+ url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch";
+ hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M=";
+ })
+ ];
+ };
+ }
);
libraries = lib.makeExtensible (
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index 76fb985c2c01..90ea6d629466 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -7,13 +7,14 @@ mkCoqDerivation {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
- { case = range "8.12" "8.19"; out = "3.4.1"; }
+ { case = range "8.12" "8.20"; out = "3.4.2"; }
{ case = range "8.12" "8.18"; out = "3.4.0"; }
{ case = range "8.12" "8.17"; out = "3.3.0"; }
{ case = range "8.8" "8.16"; out = "3.2.0"; }
{ case = range "8.8" "8.13"; out = "3.1.0"; }
{ case = range "8.5" "8.9"; out = "3.0.2"; }
] null;
+ release."3.4.2".sha256 = "sha256-aBTF8ZKu67Rb3ryCqFyejUXf/65KgG8i5je/ZMFSrj4=";
release."3.4.1".sha256 = "sha256-REhvIBl3EaL8CQqI34Gn7Xjf9NhPI3nrUAO26pSLbm0=";
release."3.4.0".sha256 = "sha256-LIj2SwTvVBxSAO58VYCQix/uxQQe8ey6hqFOSh3PNcg=";
release."3.3.1".sha256 = "sha256-YCvd4aIt2BxLKBYSWzN7aqo0AuY7z8oADmKvybhYBQI=";
diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix
index 51d9590490f0..cc42c515c09e 100644
--- a/pkgs/development/coq-modules/reglang/default.nix
+++ b/pkgs/development/coq-modules/reglang/default.nix
@@ -12,7 +12,7 @@ mkCoqDerivation {
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [
- { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.2.1"; }
+ { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.2.1"; }
{ cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0") ]; out = "1.2.0"; }
{ cases = [ (range "8.10" "8.20") (isLt "2.0.0") ]; out = "1.1.3"; }
] null;
diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix
index 7d3f698129ef..34bd276532c0 100644
--- a/pkgs/development/python-modules/aioopenexchangerates/default.nix
+++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aioopenexchangerates";
- version = "0.4.13";
+ version = "0.4.14";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = "aioopenexchangerates";
rev = "refs/tags/v${version}";
- hash = "sha256-xVEyBE33gncw1h0/T7UJap8jd2KELBHSIlNE13YfIZA=";
+ hash = "sha256-tQPLGtz6lqwa61tpAm+O3+5EM9zJqZEyWh5TPHXBlag=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index 460ac35b5351..d6ed789655f5 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "censys";
- version = "2.2.12";
+ version = "2.2.13";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "refs/tags/v${version}";
- hash = "sha256-Gw3JbAdg/ObWdD6vl8Wuct6VCcP4GAZbiesXSSnW1Mg=";
+ hash = "sha256-ejAgPSHeE2842WvGjH+2HbaA7HoNDuIGNvmqXgCjuLE=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
index 6d29cacb8c54..5900e4a42ff5 100644
--- a/pkgs/development/python-modules/django-hijack/default.nix
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "django-hijack";
- version = "3.5.4";
+ version = "3.6.0";
pyproject = true;
src = fetchFromGitHub {
owner = "django-hijack";
repo = "django-hijack";
rev = "refs/tags/${version}";
- hash = "sha256-d8rKn4Hab7y/e/VLhVfr3A3TUhoDtjP7RhCj+o6IbyE=";
+ hash = "sha256-uece+tR3Nd32nfKn1gtcWqckN4z5iUP+C0dJxyDPXBA=";
};
postPatch = ''
@@ -58,7 +58,7 @@ buildPythonPackage rec {
];
preCheck = ''
- export DJANGO_SETTINGS_MODULE=hijack.tests.test_app.settings
+ export DJANGO_SETTINGS_MODULE=tests.test_app.settings
'';
# needed for npmDeps update
diff --git a/pkgs/development/python-modules/drafthorse/default.nix b/pkgs/development/python-modules/drafthorse/default.nix
new file mode 100644
index 000000000000..4efde1b74bb8
--- /dev/null
+++ b/pkgs/development/python-modules/drafthorse/default.nix
@@ -0,0 +1,40 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ lxml,
+ pypdf,
+ pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+ pname = "drafthorse";
+ version = "2.4.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "pretix";
+ repo = "python-drafthorse";
+ rev = version;
+ hash = "sha256-3W5rQ0YhyhIoZ+KsaOjlEJOrcoejPoTIJaylK7DOwKc=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ lxml
+ pypdf
+ ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "drafthorse" ];
+
+ meta = with lib; {
+ description = "Pure-python ZUGFeRD implementation";
+ homepage = "https://github.com/pretix/python-drafthorse";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ hexa ];
+ };
+}
diff --git a/pkgs/development/python-modules/jsonslicer/default.nix b/pkgs/development/python-modules/jsonslicer/default.nix
index da6f546f2c42..8f5420d194c8 100644
--- a/pkgs/development/python-modules/jsonslicer/default.nix
+++ b/pkgs/development/python-modules/jsonslicer/default.nix
@@ -2,26 +2,33 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ gitUpdater,
+ setuptools,
pkg-config,
yajl,
}:
buildPythonPackage rec {
pname = "jsonslicer";
- version = "0.1.7";
- format = "setuptools";
+ version = "0.1.8";
+ pyproject = true;
src = fetchFromGitHub {
owner = "AMDmi3";
repo = "jsonslicer";
rev = version;
- hash = "sha256-uKIe/nJLCTe8WFIMB7+g3c0Yv3addgZEKYaBI6EpBSY=";
+ hash = "sha256-nPifyqr+MaFqoCYFbFSSBDjvifpX0CFnHCdMCvhwYTA=";
};
- nativeBuildInputs = [ pkg-config ];
+ build-system = [
+ setuptools
+ pkg-config
+ ];
buildInputs = [ yajl ];
+ passthru.updateScript = gitUpdater { };
+
meta = with lib; {
description = "Stream JSON parser for Python";
homepage = "https://github.com/AMDmi3/jsonslicer";
diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix
index c18f52714c3c..0c35e6579696 100644
--- a/pkgs/development/python-modules/python-bidi/default.nix
+++ b/pkgs/development/python-modules/python-bidi/default.nix
@@ -1,21 +1,39 @@
{
lib,
buildPythonPackage,
- fetchPypi,
- six,
+ fetchFromGitHub,
+ rustPlatform,
+ pytestCheckHook,
}:
buildPythonPackage rec {
pname = "python-bidi";
- version = "0.4.2";
- format = "setuptools";
+ version = "0.6.0";
+ pyproject = true;
- src = fetchPypi {
- inherit pname version;
- sha256 = "U0f3HoKz6Zdtxlfwne0r/jm6jWd3yoGlssVsMBIcSW4=";
+ src = fetchFromGitHub {
+ owner = "MeirKriheli";
+ repo = "python-bidi";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-LrXt9qaXfy8Rn9HjU4YSTFT4WsqzwCgh0flcxXOTF6E=";
};
- propagatedBuildInputs = [ six ];
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-34R8T8cXiX1iRx/Zb51Eb/nf0wLpN38hz0VnsmzPzws=";
+ };
+
+ build-system = [
+ rustPlatform.cargoSetupHook
+ rustPlatform.maturinBuildHook
+ ];
+
+ preCheck = ''
+ rm -rf bidi
+ '';
+
+ nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
homepage = "https://github.com/MeirKriheli/python-bidi";
diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix
index 11faea189227..2a30bc9433a2 100644
--- a/pkgs/development/python-modules/python-kasa/default.nix
+++ b/pkgs/development/python-modules/python-kasa/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "python-kasa";
- version = "0.7.0.5";
+ version = "0.7.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "python-kasa";
repo = "python-kasa";
rev = "refs/tags/${version}";
- hash = "sha256-ITXezc6m7ocOqSHTVP583lZZmYaZQn9nQSErEB9fV/M=";
+ hash = "sha256-ASS84thd54R1Z7+J7nMfUOPmQtJoybWis7C2US/mORs=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 38200db6976f..cd522d2b06e6 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -63,14 +63,14 @@
buildPythonPackage rec {
pname = "sentry-sdk";
- version = "2.11.0";
+ version = "2.12.0";
pyproject = true;
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-python";
rev = version;
- hash = "sha256-ajinOND8MC9Z69WPxF65wjOmJfU5CZUzTRWJwLLh/OQ=";
+ hash = "sha256-34/QDus1KKCD2fe0ZTmgB1hTqMC7M6/fuuqKYRRsJ2E=";
};
postPatch = ''
@@ -189,6 +189,7 @@ buildPythonPackage rec {
"test_auto_session_tracking_with_aggregates"
# timing sensitive
"test_profile_captured"
+ "test_continuous_profiler_manual_start_and_stop"
];
pythonImportsCheck = [ "sentry_sdk" ];
diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix
index 4050296e5042..0ccf377ad50d 100644
--- a/pkgs/development/python-modules/weaviate-client/default.nix
+++ b/pkgs/development/python-modules/weaviate-client/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "weaviate-client";
- version = "4.6.7";
+ version = "4.7.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "weaviate";
repo = "weaviate-python-client";
rev = "refs/tags/v${version}";
- hash = "sha256-Y+KX9ZJhQgXGdweLtnh7vQO7U7WBvT9RR94ro9kw7qg=";
+ hash = "sha256-JgnasbhAcdJwa3lpdID+B3Iwuc9peRQZBAC7tBBm54c=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix
index f74727188166..476445e0d462 100644
--- a/pkgs/development/python-modules/webauthn/default.nix
+++ b/pkgs/development/python-modules/webauthn/default.nix
@@ -2,8 +2,10 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
asn1crypto,
cbor2,
+ cryptography,
pythonOlder,
pyopenssl,
pytestCheckHook,
@@ -11,8 +13,8 @@
buildPythonPackage rec {
pname = "webauthn";
- version = "2.1.0";
- format = "setuptools";
+ version = "2.2.0";
+ pyproject = true;
disabled = pythonOlder "3.8";
@@ -20,12 +22,15 @@ buildPythonPackage rec {
owner = "duo-labs";
repo = "py_webauthn";
rev = "refs/tags/v${version}";
- hash = "sha256-AfQ3lt0WvoThU5kCE7MzhAXwbqmNaCrUqOMWI937hO4=";
+ hash = "sha256-NBCR5GwmXA6COP9NOYnoD3l1vuOpym/kyNawd8FstLc=";
};
+ build-system = [ setuptools ];
+
propagatedBuildInputs = [
asn1crypto
cbor2
+ cryptography
pyopenssl
];
@@ -35,7 +40,7 @@ buildPythonPackage rec {
disabledTests = [
# TypeError: X509StoreContextError.__init__() missing 1 required...
- "test_throws_on_bad_root_cert"
+ #"test_throws_on_bad_root_cert"
];
meta = with lib; {
diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix
index 4873085e372c..178b10b0be09 100644
--- a/pkgs/development/tools/rust/cargo-component/default.nix
+++ b/pkgs/development/tools/rust/cargo-component/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-component";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "cargo-component";
rev = "v${version}";
- hash = "sha256-+fCK+PnZHjXWMfk2g2d4ecVPM3l+tAnbrNAOSNogpko=";
+ hash = "sha256-jdGNZg/LXOoudxVhJbFeWEC9L3s0HW1S4nhfsGR4mEI=";
};
- cargoHash = "sha256-8B/xpwxeJgNWfvTAQ4kXdvLK8amVNJeeDFBeJZNWbH0=";
+ cargoHash = "sha256-YW++YcpQM1Al7qD+KoVJitfK41i59sLjb3edBge1cvA=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix
index 8c539eeb9651..3787173f0fff 100644
--- a/pkgs/development/tools/rust/cargo-modules/default.nix
+++ b/pkgs/development/tools/rust/cargo-modules/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
- version = "0.16.6";
+ version = "0.16.8";
src = fetchFromGitHub {
owner = "regexident";
repo = pname;
rev = "v${version}";
- hash = "sha256-noUlwAoJMDim1TI3aiacLtOXsHd2IEZbrjYQoeoo7yM=";
+ hash = "sha256-F1hVKktU9zhdxXWhpLgymehJQlOX6WbXL2cqQGB+Y5k=";
};
- cargoHash = "sha256-EbhLIVe9FizxNmyoEo3b/IZQ6jbL6vQUunFzfM2QRL8=";
+ cargoHash = "sha256-j3AYWKq7SrlNlsY7A80iwcWKW8wi6hx0U9UwDIQkXZs=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 64bdf7b0d99e..466bd1c90938 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -192,7 +192,7 @@ stdenv.mkDerivation rec {
'';
license = lib.licenses.agpl3Plus;
platforms = lib.platforms.all;
- maintainers = [ lib.maintainers.viric ];
+ maintainers = [ lib.maintainers.tobim ];
mainProgram = "gs";
};
}
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix
index cff4dac83a5e..17f1fc2da464 100644
--- a/pkgs/os-specific/linux/kernel/perf/default.nix
+++ b/pkgs/os-specific/linux/kernel/perf/default.nix
@@ -177,7 +177,7 @@ stdenv.mkDerivation {
homepage = "https://perf.wiki.kernel.org/";
description = "Linux tools to profile with performance counters";
mainProgram = "perf";
- maintainers = with maintainers; [ viric ];
+ maintainers = with maintainers; [ tobim ];
platforms = platforms.linux;
broken = kernel.kernelOlder "5";
};
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index de092af473de..28cf291fd785 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -8,7 +8,7 @@ assert enablePython -> swig != null && python3 != null;
with lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
pname = "libselinux";
version = "3.6";
inherit (libsepol) se_url;
@@ -96,4 +96,6 @@ stdenv.mkDerivation rec {
meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
description = "SELinux core library";
};
-}
+} // lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") {
+ NIX_LDFLAGS = "--undefined-version";
+})
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 966971a89c1a..8ea24064aa09 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -70,6 +70,7 @@
, libpwquality
, qrencode
, libarchive
+, llvmPackages
# the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to
# be available during build time.
@@ -370,6 +371,9 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals withPasswordQuality [ libpwquality ]
++ lib.optionals withQrencode [ qrencode ]
++ lib.optionals withLibarchive [ libarchive ]
+ ++ lib.optional (withBootloader && stdenv.targetPlatform.useLLVM or false) (llvmPackages.compiler-rt.override {
+ doFakeLibgcc = true;
+ })
;
mesonBuildType = "release";
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
index a9b3a154a0de..8b586f1515a4 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
@@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "mushroom";
- version = "3.6.4";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "piitaya";
repo = "lovelace-mushroom";
rev = "v${version}";
- hash = "sha256-0ck+TjNtu0XfYIYifBH/psPPynnNHIvTXPTxVyaXWv4=";
+ hash = "sha256-yoSMwNrldDfFfJWyGBZ+bJjIGYUl3FZEQ5EvLG7XzVw=";
};
- npmDepsHash = "sha256-k7g45qLhKXwKaoDbnHGAevW6rgDfvs7F4hlVvHzdFJE=";
+ npmDepsHash = "sha256-3N/tsv/mtq4r9tWldxu6MIHkkfsmaU6omgtG0hIadXA=";
installPhase = ''
runHook preInstall
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index 1de32cefab14..1447b497784a 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -11,19 +11,19 @@
buildGoModule rec {
pname = "trivy";
- version = "0.53.0";
+ version = "0.54.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = "trivy";
rev = "refs/tags/v${version}";
- hash = "sha256-DzCPJU99cLDnVGsFImy2lQX2WBXXMaiF3dM8P/ZIdvA=";
+ hash = "sha256-lzLwIa+JCqQQSpA0AFyikpODb6u9oSaEqGGx0ckL+V8=";
};
# Hash mismatch on across Linux and Darwin
proxyVendor = true;
- vendorHash = "sha256-QRdXhISiTVFWn54qYT+0hXMr2RYkRAV29HFv3zUPeHE=";
+ vendorHash = "sha256-TSnwCulL4aI/SgL+WKoLwAnmKrUAfXgl+EV/HFt4j1U=";
subPackages = [ "cmd/trivy" ];
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 955a2b97e745..e448bfdcd13b 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
- version = "6.9.2";
+ version = "6.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- hash = "sha256-Q4ZbsnLcCrJYXeNgVDTYG6IXV48Il79wDNNsFKxAZSo=";
+ hash = "sha256-M4KoTj/P4f/eoHphqz9OhmZdOPo18fNFSNXfhnQj4N8=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 8162a60d558c..a61e7329ebb1 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -270,8 +270,6 @@ python.pkgs.buildPythonApplication rec {
# Fails because it fails to determine llvm version
"test_item3_deflate_llvm_bitcode"
- # Fails ever since an update to imagemagick
- "test_has_visuals"
]
++ lib.optionals stdenv.isDarwin [
# Disable flaky tests on Darwin
diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index 017cb0b1cb6c..d25f0dd7168b 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/logrotate/logrotate";
description = "Rotates and compresses system logs";
license = licenses.gpl2Plus;
- maintainers = [ maintainers.viric ];
+ maintainers = [ maintainers.tobim ];
platforms = platforms.all;
mainProgram = "logrotate";
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf89168a4ddc..892af65ce0fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15995,6 +15995,7 @@ with pkgs;
lld_19 = llvmPackages_19.lld;
lldb_19 = llvmPackages_19.lldb;
llvm_19 = llvmPackages_19.llvm;
+ bolt_19 = llvmPackages_19.bolt;
llvmPackages_git = llvmPackagesSet.git;
}) llvmPackages_13
@@ -16012,6 +16013,7 @@ with pkgs;
lld_19
lldb_19
llvm_19
+ bolt_19
llvmPackages_git;
lorri = callPackage ../tools/misc/lorri {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69b4d2db6f37..b7cce422d313 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3617,6 +3617,8 @@ self: super: with self; {
dploot = callPackage ../development/python-modules/dploot { };
+ drafthorse = callPackage ../development/python-modules/drafthorse { };
+
draftjs-exporter = callPackage ../development/python-modules/draftjs-exporter { };
dragonfly = callPackage ../development/python-modules/dragonfly { };