diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 022e459c3945..073df78797c7 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -100,6 +100,32 @@ rec {
];
};
+ # given two patterns, return a pattern which is their logical AND.
+ # Since a pattern is a list-of-disjuncts, this needs to
+ patternLogicalAnd = pat1_: pat2_:
+ let
+ # patterns can be either a list or a (bare) singleton; turn
+ # them into singletons for uniform handling
+ pat1 = lib.toList pat1_;
+ pat2 = lib.toList pat2_;
+ in
+ lib.concatMap (attr1:
+ map (attr2:
+ lib.recursiveUpdateUntil
+ (path: subattr1: subattr2:
+ if (builtins.intersectAttrs subattr1 subattr2) == {} || subattr1 == subattr2
+ then true
+ else throw ''
+ pattern conflict at path ${toString path}:
+ ${builtins.toJSON subattr1}
+ ${builtins.toJSON subattr2}
+ '')
+ attr1
+ attr2
+ )
+ pat2)
+ pat1;
+
matchAnyAttrs = patterns:
if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
else matchAttrs patterns;
diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix
index 3a0f59f62afb..89cb81f3a78f 100644
--- a/nixos/modules/services/display-managers/greetd.nix
+++ b/nixos/modules/services/display-managers/greetd.nix
@@ -59,6 +59,7 @@ in
security.pam.services.greetd = {
allowNullPassword = true;
startSession = true;
+ enableGnomeKeyring = mkDefault config.services.gnome.gnome-keyring.enable;
};
# This prevents nixos-rebuild from killing greetd by activating getty again
diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix
index f579c2529c0a..6ce8718c35d8 100644
--- a/nixos/modules/services/matrix/appservice-discord.nix
+++ b/nixos/modules/services/matrix/appservice-discord.nix
@@ -100,9 +100,9 @@ in {
serviceDependencies = mkOption {
type = with types; listOf str;
- default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
+ default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = literalExpression ''
- optional config.services.matrix-synapse.enable "matrix-synapse.service"
+ optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
'';
description = lib.mdDoc ''
List of Systemd services to require and wait for when starting the application service,
diff --git a/nixos/modules/services/matrix/matrix-sliding-sync.nix b/nixos/modules/services/matrix/matrix-sliding-sync.nix
index 7e464d6ed589..9807cde40919 100644
--- a/nixos/modules/services/matrix/matrix-sliding-sync.nix
+++ b/nixos/modules/services/matrix/matrix-sliding-sync.nix
@@ -80,8 +80,11 @@ in
} ];
};
- systemd.services.matrix-sliding-sync = {
- after = lib.optional cfg.createDatabase "postgresql.service";
+ systemd.services.matrix-sliding-sync = rec {
+ after =
+ lib.optional cfg.createDatabase "postgresql.service"
+ ++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
+ wants = after;
wantedBy = [ "multi-user.target" ];
environment = cfg.settings;
serviceConfig = {
@@ -90,6 +93,8 @@ in
ExecStart = lib.getExe cfg.package;
StateDirectory = "matrix-sliding-sync";
WorkingDirectory = "%S/matrix-sliding-sync";
+ Restart = "on-failure";
+ RestartSec = "1s";
};
};
};
diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix
index bab6865496dd..671040500df8 100644
--- a/nixos/modules/services/matrix/mautrix-facebook.nix
+++ b/nixos/modules/services/matrix/mautrix-facebook.nix
@@ -145,7 +145,7 @@ in {
wantedBy = [ "multi-user.target" ];
wants = [
"network-online.target"
- ] ++ optional config.services.matrix-synapse.enable "matrix-synapse.service"
+ ] ++ optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
++ optional cfg.configurePostgresql "postgresql.service";
after = wants;
diff --git a/nixos/modules/services/matrix/mautrix-telegram.nix b/nixos/modules/services/matrix/mautrix-telegram.nix
index 97a6ba858e00..168c8bf436ac 100644
--- a/nixos/modules/services/matrix/mautrix-telegram.nix
+++ b/nixos/modules/services/matrix/mautrix-telegram.nix
@@ -122,9 +122,9 @@ in {
serviceDependencies = mkOption {
type = with types; listOf str;
- default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
+ default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = literalExpression ''
- optional config.services.matrix-synapse.enable "matrix-synapse.service"
+ optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
'';
description = lib.mdDoc ''
List of Systemd services to require and wait for when starting the application service.
diff --git a/nixos/modules/services/matrix/mautrix-whatsapp.nix b/nixos/modules/services/matrix/mautrix-whatsapp.nix
index c4dc48213495..4b561a4b07a3 100644
--- a/nixos/modules/services/matrix/mautrix-whatsapp.nix
+++ b/nixos/modules/services/matrix/mautrix-whatsapp.nix
@@ -100,9 +100,9 @@ in {
serviceDependencies = lib.mkOption {
type = with lib.types; listOf str;
- default = lib.optional config.services.matrix-synapse.enable "matrix-synapse.service";
+ default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = lib.literalExpression ''
- optional config.services.matrix-synapse.enable "matrix-synapse.service"
+ optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnits
'';
description = lib.mdDoc ''
List of Systemd services to require and wait for when starting the application service.
diff --git a/nixos/modules/services/matrix/mx-puppet-discord.nix b/nixos/modules/services/matrix/mx-puppet-discord.nix
index 36c9f8b122ea..70828804b556 100644
--- a/nixos/modules/services/matrix/mx-puppet-discord.nix
+++ b/nixos/modules/services/matrix/mx-puppet-discord.nix
@@ -66,9 +66,9 @@ in {
};
serviceDependencies = mkOption {
type = with types; listOf str;
- default = optional config.services.matrix-synapse.enable "matrix-synapse.service";
+ default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
defaultText = literalExpression ''
- optional config.services.matrix-synapse.enable "matrix-synapse.service"
+ optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
'';
description = lib.mdDoc ''
List of Systemd services to require and wait for when starting the application service.
diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index 12e27ef26ff3..9cc769c2d0db 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -296,6 +296,18 @@ in {
services.matrix-synapse = {
enable = mkEnableOption (lib.mdDoc "matrix.org synapse");
+ serviceUnit = lib.mkOption {
+ type = lib.types.str;
+ readOnly = true;
+ description = lib.mdDoc ''
+ The systemd unit (a service or a target) for other services to depend on if they
+ need to be started after matrix-synapse.
+
+ This option is useful as the actual parent unit for all matrix-synapse processes
+ changes when configuring workers.
+ '';
+ };
+
configFile = mkOption {
type = types.path;
readOnly = true;
@@ -1021,6 +1033,7 @@ in {
port = 9093;
});
+ services.matrix-synapse.serviceUnit = if hasWorkers then "matrix-synapse.target" else "matrix-synapse.service";
services.matrix-synapse.configFile = configFile;
services.matrix-synapse.package = wrapped;
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 0066c77438f4..038d574bd878 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -779,9 +779,6 @@ in
admins = ${toLua cfg.admins}
- -- we already build with libevent, so we can just enable it for a more performant server
- use_libevent = true
-
modules_enabled = {
${ lib.concatStringsSep "\n " (lib.mapAttrsToList
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 279b26bb8957..25367f8e61d4 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -108,6 +108,13 @@ let
containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
getGutenprint = pkgs: head (filterGutenprint pkgs);
+ parsePorts = addresses: let
+ splitAddress = addr: lib.strings.splitString ":" addr;
+ extractPort = addr: builtins.elemAt (builtins.tail (splitAddress addr)) 0;
+ toInt = str: lib.strings.toInt str;
+ in
+ builtins.map (address: toInt (extractPort address)) addresses;
+
in
{
@@ -172,6 +179,15 @@ in
'';
};
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to open the firewall for TCP/UDP ports specified in
+ listenAdrresses option.
+ '';
+ };
+
bindirCmds = mkOption {
type = types.lines;
internal = true;
@@ -463,6 +479,13 @@ in
security.pam.services.cups = {};
+ networking.firewall = let
+ listenPorts = parsePorts cfg.listenAddresses;
+ in mkIf cfg.openFirewall {
+ allowedTCPPorts = listenPorts;
+ allowedUDPPorts = listenPorts;
+ };
+
};
meta.maintainers = with lib.maintainers; [ matthewbauer ];
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index 6f0a62d0ea89..1086ab80b14f 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -67,6 +67,8 @@ let
'';
in {
+ meta.maintainers = with lib.maintainers; [ julienmalka ];
+
imports =
[ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ])
];
diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix
index 65e97d53724f..4ee5b0badded 100644
--- a/nixos/modules/virtualisation/oci-containers.nix
+++ b/nixos/modules/virtualisation/oci-containers.nix
@@ -214,6 +214,13 @@ let
'';
};
+ hostname = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = lib.mdDoc "The hostname of the container.";
+ example = "hello-world";
+ };
+
extraOptions = mkOption {
type = with types; listOf str;
default = [];
@@ -280,6 +287,8 @@ let
"--log-driver=${container.log-driver}"
] ++ optional (container.entrypoint != null)
"--entrypoint=${escapeShellArg container.entrypoint}"
+ ++ optional (container.hostname != null)
+ "--hostname=${escapeShellArg container.hostname}"
++ lib.optionals (cfg.backend == "podman") [
"--cidfile=/run/podman-${escapedName}.ctr-id"
"--cgroups=no-conmon"
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index e06c52a5f41c..b7deb95b2c19 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -9,13 +9,13 @@ in {
nodes.hass = { pkgs, ... }: {
services.postgresql = {
enable = true;
- ensureDatabases = [ "hass" ];
- ensureUsers = [{
- name = "hass";
- ensurePermissions = {
- "DATABASE hass" = "ALL PRIVILEGES";
- };
- }];
+
+ # FIXME: hack for https://github.com/NixOS/nixpkgs/issues/216989
+ # Should be replaced with ensureUsers again when a solution for that is found
+ initialScript = pkgs.writeText "hass-setup-db.sql" ''
+ CREATE ROLE hass WITH LOGIN;
+ CREATE DATABASE hass WITH OWNER hass;
+ '';
};
services.home-assistant = {
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 7df042e72e90..29c5d810f215 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -19,6 +19,7 @@ import ./make-test-python.nix (
startWhenNeeded = socket;
listenAddresses = [ "*:631" ];
defaultShared = true;
+ openFirewall = true;
extraConf = ''
Order allow,deny
@@ -26,7 +27,6 @@ import ./make-test-python.nix (
'';
};
- networking.firewall.allowedTCPPorts = [ 631 ];
# Add a HP Deskjet printer connected via USB to the server.
hardware.printers.ensurePrinters = [{
name = "DeskjetLocal";
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 7fd824967206..4bad56991cc6 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -471,7 +471,7 @@ let
services.knot = {
enable = true;
extraArgs = [ "-v" ];
- extraConfig = ''
+ settingsFile = pkgs.writeText "knot.conf" ''
server:
listen: 127.0.0.1@53
@@ -969,7 +969,7 @@ let
pgbouncer = {
exporterConfig = {
enable = true;
- connectionString = "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable";
+ connectionStringFile = pkgs.writeText "connection.conf" "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable";
};
metricProvider = {
diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix
index 7d334326cca9..13007d0d80d8 100644
--- a/nixos/tests/systemd-boot.nix
+++ b/nixos/tests/systemd-boot.nix
@@ -18,7 +18,7 @@ in
{
basic = makeTest {
name = "systemd-boot";
- meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];
nodes.machine = common;
@@ -42,7 +42,7 @@ in
# Check that specialisations create corresponding boot entries.
specialisation = makeTest {
name = "systemd-boot-specialisation";
- meta.maintainers = with pkgs.lib.maintainers; [ lukegb ];
+ meta.maintainers = with pkgs.lib.maintainers; [ lukegb julienmalka ];
nodes.machine = { pkgs, lib, ... }: {
imports = [ common ];
@@ -65,7 +65,7 @@ in
# Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI"
fallback = makeTest {
name = "systemd-boot-fallback";
- meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];
nodes.machine = { pkgs, lib, ... }: {
imports = [ common ];
@@ -91,7 +91,7 @@ in
update = makeTest {
name = "systemd-boot-update";
- meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
+ meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];
nodes.machine = common;
@@ -113,7 +113,7 @@ in
memtest86 = makeTest {
name = "systemd-boot-memtest86";
- meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
+ meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];
nodes.machine = { pkgs, lib, ... }: {
imports = [ common ];
@@ -128,7 +128,7 @@ in
netbootxyz = makeTest {
name = "systemd-boot-netbootxyz";
- meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
+ meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];
nodes.machine = { pkgs, lib, ... }: {
imports = [ common ];
@@ -143,7 +143,7 @@ in
entryFilename = makeTest {
name = "systemd-boot-entry-filename";
- meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
+ meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];
nodes.machine = { pkgs, lib, ... }: {
imports = [ common ];
@@ -160,7 +160,7 @@ in
extraEntries = makeTest {
name = "systemd-boot-extra-entries";
- meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
+ meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];
nodes.machine = { pkgs, lib, ... }: {
imports = [ common ];
@@ -179,7 +179,7 @@ in
extraFiles = makeTest {
name = "systemd-boot-extra-files";
- meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
+ meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];
nodes.machine = { pkgs, lib, ... }: {
imports = [ common ];
@@ -196,7 +196,7 @@ in
switch-test = makeTest {
name = "systemd-boot-switch-test";
- meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
+ meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];
nodes = {
inherit common;
@@ -256,7 +256,7 @@ in
# itself, systems with such firmware won't boot without this fix
uefiLargeFileWorkaround = makeTest {
name = "uefi-large-file-workaround";
-
+ meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ];
nodes.machine = { pkgs, ... }: {
imports = [common];
virtualisation.efi.OVMF = pkgs.OVMF.overrideAttrs (old: {
diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix
index 73900262c5de..2d706b4204ce 100644
--- a/pkgs/applications/accessibility/wvkbd/default.nix
+++ b/pkgs/applications/accessibility/wvkbd/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "wvkbd";
- version = "0.14.1";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "jjsullivan5196";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-a1VOSLpvSKiEkR73V/Q3Es9irueDihMKcQvO9alPCqo=";
+ sha256 = "sha256-U4xq9FY2uZlnBwm8Se1wReU1c1RAJMx6FIoD0D2BlM4=";
};
postPatch = ''
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index 6e6110fe22e4..56546404ad90 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "schismtracker";
- version = "20230906";
+ version = "20231029";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-eW1sqfcAR3lutSyQKj7j1elkFTa8jfZqgrJYYAzMlzo=";
+ sha256 = "sha256-ELCV5c79fFX1C4+S9bnDFOx3jAs/R2TERH1Q9fkBGnY=";
};
configureFlags = [ "--enable-dependency-tracking" ]
diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix
index 7854c76a16ab..40dfe70debd3 100644
--- a/pkgs/applications/blockchains/electrs/default.nix
+++ b/pkgs/applications/blockchains/electrs/default.nix
@@ -3,25 +3,25 @@
, rustPlatform
, fetchFromGitHub
, llvmPackages
-, rocksdb_6_23
+, rocksdb_7_10
, Security
}:
let
- rocksdb = rocksdb_6_23;
+ rocksdb = rocksdb_7_10;
in
rustPlatform.buildRustPackage rec {
pname = "electrs";
- version = "0.9.13";
+ version = "0.10.1";
src = fetchFromGitHub {
owner = "romanz";
repo = pname;
rev = "v${version}";
- hash = "sha256-GV/cwFdYpXJXRTgdVfuzJpmwNhe0kVJnYAJe+DPmRV8=";
+ hash = "sha256-cRnCo/N0k5poiOh308Djw6bySFQFIY3GiD2qjRyMjLM=";
};
- cargoHash = "sha256-eQAizO26oQRosbMGJLwMmepBN3pocmnbc0qsHsAJysg=";
+ cargoHash = "sha256-fsYJ+80se5VsIaRkFgwJaPPgRw/WdsecRTt6EIjoQTQ=";
# needed for librocksdb-sys
nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index 9311ba4c544c..2abfe5f16d54 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "exodus";
- version = "23.9.25";
+ version = "23.10.24";
src = fetchurl {
name = "exodus-linux-x64-${version}.zip";
url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip";
curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
- sha256 = "a3e314de257e1ec01baa1023886f327ade4b233d833f7fe79f6c3e0f26d07ced";
+ sha256 = "sha256-g28jSQaqjnM34sCpyYLSipUoU3pqAcXQIyWhlrR4xz4=";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix
index b58c6bddafa0..ec8d4360a6ff 100644
--- a/pkgs/applications/blockchains/nearcore/default.nix
+++ b/pkgs/applications/blockchains/nearcore/default.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
description = "Reference client for NEAR Protocol";
homepage = "https://github.com/near/nearcore";
license = licenses.gpl3;
- maintainers = with maintainers; [ mic92 mikroskeem ];
+ maintainers = with maintainers; [ mikroskeem ];
# only x86_64 is supported in nearcore because of sse4+ support, macOS might
# be also possible
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 0f28ed8f8f02..7e59c5f067f2 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -57,6 +57,8 @@ in
inherit (pkgs) python3 git go gopls pyright;
};
+ lspce = callPackage ./manual-packages/lspce { };
+
matrix-client = callPackage ./manual-packages/matrix-client {
_map = self.map;
};
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix
new file mode 100644
index 000000000000..29157c802411
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix
@@ -0,0 +1,72 @@
+{ lib
+, emacs
+, f
+, fetchFromGitHub
+, markdown-mode
+, rustPlatform
+, trivialBuild
+, yasnippet
+}:
+
+let
+ version = "unstable-2023-10-30";
+
+ src = fetchFromGitHub {
+ owner = "zbelial";
+ repo = "lspce";
+ rev = "34c59787bcdbf414c92d9b3bf0a0f5306cb98d64";
+ hash = "sha256-kUHGdeJo2zXA410FqXGclgXmgWrll30Zv8fSprcmnIo=";
+ };
+
+ meta = {
+ homepage = "https://github.com/zbelial/lspce";
+ description = "LSP Client for Emacs implemented as a module using rust";
+ license = lib.licenses.gpl3Only;
+ maintainers = [ lib.maintainers.marsam ];
+ inherit (emacs.meta) platforms;
+ };
+
+ lspce-module = rustPlatform.buildRustPackage {
+ inherit version src meta;
+ pname = "lspce-module";
+
+ cargoHash = "sha256-eqSromwJrFhtJWedDVJivfbKpAtSFEtuCP098qOxFgI=";
+
+ checkFlags = [
+ # flaky test
+ "--skip=msg::tests::serialize_request_with_null_params"
+ ];
+
+ postFixup = ''
+ for f in $out/lib/*; do
+ mv $f $out/lib/lspce-module.''${f##*.}
+ done
+ '';
+ };
+in
+trivialBuild rec {
+ inherit version src meta;
+ pname = "lspce";
+
+ preBuild = ''
+ ln -s ${lspce-module}/lib/lspce-module* .
+
+ # Fix byte-compilation
+ substituteInPlace lspce-util.el \
+ --replace "(require 'yasnippet)" "(require 'yasnippet)(require 'url-util)"
+ substituteInPlace lspce-calltree.el \
+ --replace "(require 'compile)" "(require 'compile)(require 'cl-lib)"
+ '';
+
+ buildInputs = propagatedUserEnvPkgs;
+
+ propagatedUserEnvPkgs = [
+ f
+ markdown-mode
+ yasnippet
+ ];
+
+ postInstall = ''
+ install lspce-module* $LISPDIR
+ '';
+}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 720718cb7bb7..2034da80c658 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -47,7 +47,7 @@ let
Enhancing productivity for every C and C++
developer on Linux, macOS and Windows.
'';
- maintainers = with maintainers; [ edwtjo mic92 tymscar ];
+ maintainers = with maintainers; [ edwtjo tymscar ];
};
}).overrideAttrs (attrs: {
nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5f3f82dd8ab0..2ae3d7333ae4 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1744,6 +1744,22 @@ let
};
};
+ griimick.vhs = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vhs";
+ publisher = "griimick";
+ version = "0.0.4";
+ sha256 = "sha256-zAy8o5d2pK5ra/dbwoLgPAQAYfRQtUYQjisWYgIhsXA=";
+ };
+ meta = {
+ description = "Visual Studio Code extension providing syntax support for VHS .tape files";
+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=griimick.vhs";
+ homepage = "https://github.com/griimick/vscode-vhs";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.drupol ];
+ };
+ };
+
gruntfuggly.todo-tree = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "todo-tree";
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 185847e28028..baf26daefb56 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -30,21 +30,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "1061hpazgs2gbn1xbn3in1sh7img71l5fx1irlgr86k70jdjw0qp";
- x86_64-darwin = "17n16az3b8lnh1wq7mj4fd2kvvbh3l4d72iwxqx2z08vpsiaivad";
- aarch64-linux = "0ggjh58nxwz5hlv4hwig2w32lcg2vsvszsr7dq6p7rd3c7l13mqr";
- aarch64-darwin = "0irvjlzx79a2p8jbv8kiblkrzkslpv6qmqzi5yj7gl2dl2f5y1lx";
- armv7l-linux = "1nyaz1nmswyy6qkz83cqb8nw1ajlhchqcwbj5msq3camkjdjr8g6";
+ x86_64-linux = "01xw0dpwb4ih2xlpgc0yq48wqb5nmicz98srbgz01sbmyji8x1lf";
+ x86_64-darwin = "13i449px6pajb94ymvi6vwmm25vyyh4vjrb86yiq4dcx1plcrxfc";
+ aarch64-linux = "174zl811pv5rznxz3fh7bkwz9iini8lmb8xfjs4i14sym7sxw5x3";
+ aarch64-darwin = "05kjmhr3dwbj16k4ilc8nl6ckm21fyak6pr1zzdxywqb5qd7qwr8";
+ armv7l-linux = "0icc4cx5p5fxsi8cz3mxik4vnmrv2dvfzm220nl9p13bn1ri3f6s";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.83.1";
+ version = "1.84.0";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
- rev = "f1b07bd25dfad64b0167beb15359ae573aecd2cc";
+ rev = "d037ac076cee195194f93ce6fe2bdfe2969cc82d";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
- sha256 = "0hbqbkzynqxp99rhqq46878cp1jnjklqy8vgbf0dm2cwfw86jbrw";
+ sha256 = "017g82h3jcygm6hi0s36ij8vxggz7p5j36nww5f53kn6a1s1wzcx";
};
};
diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix
index 3371bf15c5c9..24997cbdcdc4 100644
--- a/pkgs/applications/emulators/yuzu/sources.nix
+++ b/pkgs/applications/emulators/yuzu/sources.nix
@@ -1,19 +1,19 @@
# Generated by ./update.sh - do not update manually!
-# Last updated: 2023-10-20
+# Last updated: 2023-11-05
{
compatList = {
- rev = "9d17cbd71408476c6a28cbf0fa8177155c511681";
+ rev = "e9c4e5da6e5e88e889c87582dfd826d204ca8782";
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
};
mainline = {
- version = "1595";
- hash = "sha256:09b0w6z4w9z4ms2pvik2vrmklfcx25jxcgs61bff3nflilnw9m97";
+ version = "1611";
+ hash = "sha256:18rrw63j2zjwakbn99wbzprb1rpmlznl6gb09ay9sq8brxy7zjsv";
};
ea = {
- version = "3940";
- distHash = "sha256:0g0vv274sh3iy56n7s324km87g302005ahi9zh2qhwkiirbnc811";
- fullHash = "sha256:0ywppc4z5d4b1zl1cr8yfnba58hgi0z2szficwpinapai7q0pyid";
+ version = "3966";
+ distHash = "sha256:1p60455s0h3dwigxm2lxdfgxgv4l2ibwybisja1khcy4i8lgss03";
+ fullHash = "sha256:1jq2bfbv9a6i3dlqsdgmi87rccvks45iyybxwf8p6rxdjqh4bvl2";
};
}
diff --git a/pkgs/applications/emulators/zesarux/default.nix b/pkgs/applications/emulators/zesarux/default.nix
deleted file mode 100644
index 4a00f9b03496..000000000000
--- a/pkgs/applications/emulators/zesarux/default.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, SDL2
-, aalib
-, alsa-lib
-, libXext
-, libXxf86vm
-, libcaca
-, libpulseaudio
-, libsndfile
-, ncurses
-, openssl
-, which
-}:
-
-stdenv.mkDerivation rec {
- pname = "zesarux";
- version = "10.0";
-
- src = fetchFromGitHub {
- owner = "chernandezba";
- repo = pname;
- rev = version;
- hash = "sha256-cxV2dAzGnIzJiCRdq8vN/Cl4AQeJqjmiCAahijIJQ9k=";
- };
-
- nativeBuildInputs = [
- which
- ];
-
- buildInputs = [
- SDL2
- aalib
- alsa-lib
- libXxf86vm
- libXext
- libcaca
- libpulseaudio
- libsndfile
- ncurses
- openssl
- ];
-
- patches = [
- # Patch the shell scripts; remove it when the next version arrives
- (fetchpatch {
- name = "000-fix-shebangs.patch";
- url = "https://github.com/chernandezba/zesarux/commit/4493439b38f565c5be7c36239ecaf0cf80045627.diff";
- sha256 = "sha256-f+21naPcPXdcVvqU8ymlGfl1WkYGOeOBe9B/WFUauTI=";
- })
-
- # Patch pending upstream release for libcaca-0.99.beta20 support:
- # https://github.com/chernandezba/zesarux/pull/1
- (fetchpatch {
- name = "libcaca-0.99.beta20.patch";
- url = "https://github.com/chernandezba/zesarux/commit/542786338d00ab6fcdf712bbd6f5e891e8b26c34.diff";
- sha256 = "sha256-UvXvBb9Nzw5HNz0uiv2SV1Oeiw7aVCa0jhEbThDRVec=";
- })
- ];
-
- postPatch = ''
- cd src
- patchShebangs ./configure *.sh
- '';
-
- configureFlags = [
- "--prefix=${placeholder "out"}"
- "--c-compiler ${stdenv.cc.targetPrefix}cc"
- "--enable-cpustats"
- "--enable-memptr"
- "--enable-sdl2"
- "--enable-ssl"
- "--enable-undoc-scfccf"
- "--enable-visualmem"
- ];
-
- installPhase = ''
- runHook preInstall
-
- ./generate_install_sh.sh
- patchShebangs ./install.sh
- ./install.sh
-
- runHook postInstall
- '';
-
- meta = with lib; {
- homepage = "https://github.com/chernandezba/zesarux";
- description = " ZX Second-Emulator And Released for UniX";
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ AndersonTorres ];
- platforms = platforms.unix;
- };
-}
-# TODO: Darwin support
diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix
index 37369ccdb206..577bad9e6945 100644
--- a/pkgs/applications/file-managers/clifm/default.nix
+++ b/pkgs/applications/file-managers/clifm/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline }:
+{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline, python3 }:
stdenv.mkDerivation rec {
pname = "clifm";
- version = "1.14.6";
+ version = "1.15";
src = fetchFromGitHub {
owner = "leo-arch";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-0EOG7BAZL3OPP2/qePNkljAa0/Qb3zwuJWz2P4l8GZc=";
+ sha256 = "sha256-4Z2u1APNfJ9Ai95MMWb5FCUgCA2Hrbp+5eBJZD3tN+U=";
};
- buildInputs = [ libcap acl file readline ];
+ buildInputs = [ libcap acl file readline python3];
makeFlags = [
"DESTDIR=${placeholder "out"}"
diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix
index eeab22eaac7c..6f30c52261aa 100644
--- a/pkgs/applications/file-managers/felix-fm/default.nix
+++ b/pkgs/applications/file-managers/felix-fm/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
- version = "2.9.0";
+ version = "2.10.1";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = "felix";
rev = "v${version}";
- hash = "sha256-bTe8fPFVWuAATXdeyUvtdK3P4vDpGXX+H4TQ+h9bqUI=";
+ hash = "sha256-pDJW/QhkJtEAq7xusYn/t/pPizT77OYmlbVlF/RTXic=";
};
- cargoHash = "sha256-q86NiJPtr1X9D9ym8iLN1ed1FMmEb217Jx3Ei4Bn5y0=";
+ cargoHash = "sha256-AGQt06fMXuyOEmQIEiUCzuK1Atx3gQMUCB+hPWlrldk=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix
index a2ecaec7c37a..c52d729f9b51 100644
--- a/pkgs/applications/graphics/xpano/default.nix
+++ b/pkgs/applications/graphics/xpano/default.nix
@@ -15,21 +15,16 @@
stdenv.mkDerivation rec {
pname = "xpano";
- version = "0.16.1";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "krupkat";
repo = pname;
rev = "v${version}";
- sha256 = "1f95spf7bbbdvbr4gqfyrs161049jj1wnkvf5wgsd0ga3vb15mcj";
+ sha256 = "aKO9NYHFjb69QopseNOJvUvvVT1povP9tyGSOHJFWVo=";
fetchSubmodules = true;
};
- patches = [
- # force install desktop + icon files
- ./skip_prefix_check.patch
- ];
-
nativeBuildInputs = [
cmake
ninja
@@ -42,7 +37,7 @@ stdenv.mkDerivation rec {
SDL2
gtk3
spdlog
- # exiv2 # TODO: enable when 0.28.0 is available
+ exiv2
];
checkInputs = [
@@ -53,6 +48,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_TESTING=ON"
+ "-DXPANO_INSTALL_DESKTOP_FILES=ON"
];
meta = with lib; {
diff --git a/pkgs/applications/graphics/xpano/skip_prefix_check.patch b/pkgs/applications/graphics/xpano/skip_prefix_check.patch
deleted file mode 100644
index 496cbc718bef..000000000000
--- a/pkgs/applications/graphics/xpano/skip_prefix_check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -167,7 +167,6 @@ install(FILES
- TYPE BIN
- )
-
--if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*")
- install(FILES
- "misc/build/linux/xpano.desktop"
- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications"
-@@ -184,7 +183,6 @@ if(CMAKE_INSTALL_PREFIX MATCHES "^/usr.*|^/app.*")
- "misc/build/linux/cz.krupkat.Xpano.metainfo.xml"
- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo"
- )
--endif()
-
- install(DIRECTORY
- "${CMAKE_SOURCE_DIR}/misc/assets"
diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
index 0c83c8a9b81f..a4bbdc2eb7b3 100644
--- a/pkgs/applications/misc/etesync-dav/default.nix
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -7,54 +7,7 @@
, radicale3
}:
-let
- python = python3.override {
- packageOverrides = self: super: {
- flask = super.flask.overridePythonAttrs (old: rec {
- version = "2.0.3";
- src = old.src.override {
- inherit version;
- hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
- };
-
- patches = [
- # Pulling in this patch lets us continue running tests without any
- # other changes using setuptools >= 67.5.0.
- (fetchpatch {
- name = "remove-deprecated-pkg-resources.patch";
- url = "https://github.com/pallets/flask/commit/751d85f3de3f726446bb12e4ddfae885a6645ba1.patch";
- hash = "sha256-T4vKSSe3P0xtb2/iQjm0RH2Bwk1ZHWiPoX1Ycr63EqU=";
- includes = [ "src/flask/cli.py" ];
- })
- ];
- });
- flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
- version = "0.15.1";
- format = "setuptools";
- src = old.src.override {
- inherit version;
- pname = "Flask-WTF";
- hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw=";
- };
- disabledTests = [
- "test_outside_request"
- ];
- disabledTestPaths = [
- "tests/test_form.py"
- "tests/test_html5.py"
- ];
- patches = [ ];
- });
- werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
- version = "2.0.3";
- src = old.src.override {
- inherit version;
- hash = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";
- };
- });
- };
- };
-in python.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "etesync-dav";
version = "0.32.1";
@@ -71,7 +24,7 @@ in python.pkgs.buildPythonApplication rec {
})
];
- propagatedBuildInputs = with python.pkgs; [
+ propagatedBuildInputs = with python3.pkgs; [
appdirs
etebase
etesync
diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix
index 2bc2053b254d..893ae8aed005 100644
--- a/pkgs/applications/misc/flashprint/default.nix
+++ b/pkgs/applications/misc/flashprint/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flashprint";
- version = "5.8.0";
+ version = "5.8.1";
src = fetchurl {
url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb";
- hash = "sha256-T7NHSTDFqM/LygTU3zO64Ut/tdd3vDPQoZuhAv7PWHU=";
+ hash = "sha256-X5CsJmJa3qGQxdZ1xg3xoVnIaChzxZ/GaLZFqBE2dIk=";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ];
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index e1c289dfabfe..a80a86317a56 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "gallery-dl";
- version = "1.26.1";
+ version = "1.26.2";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "gallery_dl";
- sha256 = "sha256-SJshEdvmPDQZ5mqiQfJpWcQ43WGXUxPvMMJiY/4Cxsc=";
+ sha256 = "sha256-Agccsz0TlzCDnhR5Vy7Tt3jrqz9+hwaclQgXJBhGY9w=";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 03b03724aeef..62bed5a34f0e 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -12,9 +12,11 @@
, widevine-cdm
, enableVulkan ? stdenv.isLinux
, vulkan-loader
+, buildPackages
}:
let
+ isQt6 = lib.versions.major qtbase.version == "6";
pdfjs = let
version = "3.9.179";
in
@@ -50,10 +52,14 @@ python3.pkgs.buildPythonApplication {
];
propagatedBuildInputs = with python3.pkgs; ([
- pyyaml pyqt6-webengine jinja2 pygments
+ pyyaml (if isQt6 then pyqt6-webengine else pyqtwebengine) jinja2 pygments
# scripts and userscripts libs
tldextract beautifulsoup4
- readability-lxml pykeepass stem
+ readability-lxml pykeepass
+ ] ++ lib.optionals ((builtins.tryEval stem.outPath).success) [
+ # error: stem-1.8.2 not supported for interpreter python3.11
+ stem
+ ] ++ [
pynacl
# extensive ad blocking
adblock
@@ -80,7 +86,7 @@ python3.pkgs.buildPythonApplication {
runHook preInstall
make -f misc/Makefile \
- PYTHON=${python3}/bin/python3 \
+ PYTHON=${buildPackages.python3}/bin/python3 \
PREFIX=. \
DESTDIR="$out" \
DATAROOTDIR=/share \
diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix
index 53e37c554406..55ccd893befc 100644
--- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubectl-gadget";
- version = "0.21.0";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "inspektor-gadget";
repo = "inspektor-gadget";
rev = "v${version}";
- hash = "sha256-e93rQRIF3CmXjQhpACxBp4WnPtQ5IJnm7H5BcHGqH0c=";
+ hash = "sha256-tVkuLoQ0xKnPQG7a6tShTIJ7/kDYlmmLPHlPfhk01qw=";
};
- vendorHash = "sha256-YkOw4HpbX6e6uIAUa7zQPah/ifRfB4ICi90AxleKNNE=";
+ vendorHash = "sha256-45KvBV9R7a7GcZtszxTaOOert1vWH4eltVr/AWGqOSY=";
CGO_ENABLED = 0;
diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix
index dc9f8c25b5c8..db40df70f934 100644
--- a/pkgs/applications/networking/cluster/kubectl-klock/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix
@@ -2,21 +2,21 @@
buildGo121Module rec {
pname = "kubectl-klock";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
- owner = "jillejr";
+ owner = "applejag";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-HO9/hr/CBmJkrbNdX8tp2pNRfZDaWNW8shyCR46G77A=";
+ sha256 = "sha256-fR97rTMFwtqVH9wqKy1+EzKKg753c18v8VDCQ2Y69+s=";
};
- vendorHash = "sha256-QvD5yVaisq5Zz/M81HAMKpgQJRB5qPCYveLgldHHGf0=";
+ vendorHash = "sha256-AkYKKM4PR/msG44MwdSq6XAf6EvdtJHoXyw7Xj7MXso=";
meta = with lib; {
description = "A kubectl plugin to render watch output in a more readable fashion";
- homepage = "https://github.com/jillejr/kubectl-klock";
- changelog = "https://github.com/jillejr/kubectl-klock/releases/tag/v${version}";
+ homepage = "https://github.com/applejag/kubectl-klock";
+ changelog = "https://github.com/applejag/kubectl-klock/releases/tag/v${version}";
license = licenses.gpl3Plus;
maintainers = [ maintainers.scm2342 ];
};
diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix
index 32e738a8e24a..0d2a26478e7c 100644
--- a/pkgs/applications/networking/cluster/nerdctl/default.nix
+++ b/pkgs/applications/networking/cluster/nerdctl/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
- version = "1.6.2";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
- hash = "sha256-izFDqaJFJrgeb3YPP/7rIf/IjvrtlwjbktNy702zVTU=";
+ hash = "sha256-PR3vhNfY84vKQaAMKmPPmY7kK3BRxELAC34NfMYXQPk=";
};
- vendorHash = "sha256-4I+qCh/A/Yj5kUZLFvXTUV85l/2LVGPUCivTdDlA1ao=";
+ vendorHash = "sha256-qLxUAICm/SGy2iHAbg+12xmId+P335dFyjltYlB45iw=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
index f1361fea1392..d06ff70fa2b6 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
@@ -1,38 +1,55 @@
{ lib
, python3
, fetchFromGitHub
+, testers
+, deltachat-cursed
}:
python3.pkgs.buildPythonApplication rec {
pname = "deltachat-cursed";
- version = "0.7.2";
+ version = "0.8.0";
+
+ pyproject = true;
src = fetchFromGitHub {
owner = "adbenitez";
repo = "deltachat-cursed";
rev = "v${version}";
- hash = "sha256-Cv2QT8GsPAcA5TTZGfNvFNwnUITSR0PmQE0QCO1nFNk=";
+ hash = "sha256-1QNhNPa6ZKn0lGQXs/cmfdSFHscwlYwFC/2DpnMoHvY=";
};
- nativeBuildInputs = [
- python3.pkgs.setuptools-scm
+ nativeBuildInputs = with python3.pythonForBuild.pkgs; [
+ setuptools
+ setuptools-scm
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
propagatedBuildInputs = with python3.pkgs; [
+ appdirs
deltachat
emoji
notify-py
+ setuptools # for pkg_resources
urwid-readline
];
doCheck = false; # no tests implemented
+ passthru.tests = {
+ version = testers.testVersion rec {
+ package = deltachat-cursed;
+ command = ''
+ HOME="$TEMP" ${lib.getExe package} --version
+ '';
+ };
+ };
+
meta = with lib; {
description = "Lightweight Delta Chat client";
homepage = "https://github.com/adbenitez/deltachat-cursed";
license = licenses.gpl3Plus;
+ mainProgram = "curseddelta";
maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 6fae9b25fd52..deff202d2e68 100644
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildNpmPackage
, copyDesktopItems
-, electron_22
+, electron_26
, buildGoModule
, esbuild
, fetchFromGitHub
@@ -33,16 +33,16 @@ let
in
buildNpmPackage rec {
pname = "deltachat-desktop";
- version = "1.40.4";
+ version = "unstable-2023-11-03";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
- rev = "v${version}";
- hash = "sha256-cNCM0McWBmHUUutMDa/Cy0qOxhx4NJnhjrW++HRl/nU=";
+ rev = "40152e9543eb773fc27e7a4f96ef1eecebe9310e";
+ hash = "sha256-9GPXFUCu9GKa/bJgO8CIPMLccI6WAJ6PhfoyJ6s/DHE=";
};
- npmDepsHash = "sha256-CoWa0l2If+SGqD47nP91qsvUlTzOEWP5or5zNUdV7P0=";
+ npmDepsHash = "sha256-g3nkgqZNoq+xuwXbXLHEMVpHH6Sq3792xhITCx7WvOc=";
nativeBuildInputs = [
makeWrapper
@@ -92,7 +92,7 @@ buildNpmPackage rec {
$out/lib/node_modules/deltachat-desktop/html-dist/fonts
done
- makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \
+ makeWrapper ${electron_26}/bin/electron $out/bin/deltachat \
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
--add-flags $out/lib/node_modules/deltachat-desktop
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
index 92fc2a96623e..2ff8a8d81a89 100644
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
@@ -19,18 +19,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "teams-for-linux";
- version = "1.3.14";
+ version = "1.3.18";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "v${finalAttrs.version}";
- hash = "sha256-2H7j8e2wPMd4cHXDKxSmyC2Ng/B3jb3/tGVTpUOU3XM=";
+ hash = "sha256-evOwjHUmeGw8AUpXSig8zVW2cpJbWkNTH/RUuNipFsQ=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
- hash = "sha256-zB6H14VAf13pAHQmsWC51d/qqyfRmAEbltyLD5ucG4Y=";
+ hash = "sha256-tMC8/qHYli7+OTdxVWRDEyCNzrkYA+zKlHJXlTsl+W0=";
};
nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ];
diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix
index 062c61fa5c9e..a7d9462a7fbd 100644
--- a/pkgs/applications/science/chemistry/nwchem/default.nix
+++ b/pkgs/applications/science/chemistry/nwchem/default.nix
@@ -54,13 +54,13 @@ let
in
stdenv.mkDerivation rec {
pname = "nwchem";
- version = "7.2.1";
+ version = "7.2.2";
src = fetchFromGitHub {
owner = "nwchemgit";
repo = "nwchem";
rev = "v${version}-release";
- hash = "sha256-nnNTZ+c7VVGAqwOBMkBlW3rImNjs08Ne35XRkI3ssGo=";
+ hash = "sha256-BcYRqPaPR24OTRY0MJgBxi46HvUG4uFaY0unZmu5b9k=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
index 5817b49e5ede..a3b2e81fa686 100644
--- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
+++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
- version = "20.6.3";
+ version = "20.6.4";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
- sha256 = "sha256-lfFCcmLvdvlY3NvHmF+JDcnA6zGsIKvX8BUg9GwYPs4=";
+ sha256 = "sha256-IrVz4rHAmaj/ACBNEF0x3kJa3fFPTTT7Pv9GnWJm8Vg=";
};
meta = with lib; {
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 72216d095488..62e424422fb0 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-slim";
- version = "1.40.4";
+ version = "1.40.6";
src = fetchFromGitHub {
owner = "slimtoolkit";
repo = "slim";
rev = version;
- hash = "sha256-A5qMg+mgcvK0YyJLbnFdZRS3s+OFWFaLKmnyvKj4r4g=";
+ hash = "sha256-0rn+tqdPVjkIPxOwL9rDnolrpcsDOwOah0Y7924mjD4=";
};
vendorHash = null;
diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix
index 4e62d4da8d0c..14a32c61375d 100644
--- a/pkgs/by-name/ab/aba/package.nix
+++ b/pkgs/by-name/ab/aba/package.nix
@@ -6,7 +6,7 @@
, scdoc
}:
let
- version = "0.7.0";
+ version = "0.7.1";
in
rustPlatform.buildRustPackage {
pname = "aba";
@@ -16,27 +16,35 @@ rustPlatform.buildRustPackage {
owner = "~onemoresuza";
repo = "aba";
rev = version;
- hash = "sha256-YPE5HYa90BcNy5jdYbzkT81KavJcbSeGrsWRILnIiEE=";
+ hash = "sha256-Sz9I1Dw7wmoUPpTBNfbYbehfNO8FK6r/ubofx+FGb04=";
domain = "sr.ht";
};
- cargoSha256 = "sha256-wzI+UMcVeFQNFlWDkyxk8tjpU7beNRKoPYbid8b15/Q=";
+ cargoSha256 = "sha256-Ihoh+yp12qN74JHvJbEDoYz+eoMwPOQar+yBEy+bqb0=";
nativeBuildInputs = [
just
scdoc
];
+ postPatch = ''
+ # Suppress messages of command not found. jq is not needed for the build, but just calls it anyway.
+ sed -i '/[[:space:]]*|[[:space:]]*jq -r/s/jq -r .*/: \\/' ./justfile
+ # Let only nix strip the binary by disabling cargo's `strip = true`, like buildRustPackage does.
+ sed -i '/strip[[:space:]]*=[[:space:]]*true/s/true/false/' ./Cargo.toml
+ '';
+
+ preBuild = ''
+ justFlagsArray+=(
+ PREFIX=${builtins.placeholder "out"}
+ MANIFEST_OPTS="--frozen --locked --profile=release"
+ INSTALL_OPTS=--no-track
+ )
+ '';
+
# There are no tests
doCheck = false;
-
- dontUseJustBuild = true;
dontUseJustCheck = true;
- dontUseJustInstall = true;
-
- postInstall = ''
- just --set PREFIX $out install-doc
- '';
passthru.updateScript = nix-update-script { };
@@ -47,7 +55,6 @@ rustPlatform.buildRustPackage {
downloadPage = "https://git.sr.ht/~onemoresuza/aba/refs/${version}";
maintainers = with lib.maintainers; [ onemoresuza ];
license = lib.licenses.isc;
- platforms = lib.platforms.unix;
mainProgram = "aba";
};
}
diff --git a/pkgs/os-specific/darwin/dark-mode-notify/default.nix b/pkgs/by-name/da/dark-mode-notify/package.nix
similarity index 95%
rename from pkgs/os-specific/darwin/dark-mode-notify/default.nix
rename to pkgs/by-name/da/dark-mode-notify/package.nix
index 31d1a2c8d8b9..777400e8057c 100644
--- a/pkgs/os-specific/darwin/dark-mode-notify/default.nix
+++ b/pkgs/by-name/da/dark-mode-notify/package.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation (final: {
platforms = [ "aarch64-darwin" ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ YorikSar ];
+ mainProgram = "dark-mode-notify";
};
})
diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix
index 84c08eaaa38d..9e9be57ec204 100644
--- a/pkgs/by-name/de/decker/package.nix
+++ b/pkgs/by-name/de/decker/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "decker";
- version = "1.31";
+ version = "1.32";
src = fetchFromGitHub {
owner = "JohnEarnest";
repo = "Decker";
rev = "v${version}";
- hash = "sha256-9utCIf7LO/ms46QqagkcXZ3BuvRuLa6nE78MgkbaEjA=";
+ hash = "sha256-ch/Lit9qA6XEkPJdcQ03+r0asOKMwy0jRJMHG9VMEig=";
};
buildInputs = [
diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix
new file mode 100644
index 000000000000..3de470c08524
--- /dev/null
+++ b/pkgs/by-name/de/deltachat-repl/package.nix
@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, libdeltachat
+, perl
+, pkg-config
+}:
+
+rustPlatform.buildRustPackage {
+ pname = "deltachat-repl";
+
+ inherit (libdeltachat) version src cargoLock buildInputs;
+
+ nativeBuildInputs = [
+ perl
+ pkg-config
+ ];
+
+ cargoBuildFlags = [ "--package" "deltachat-repl" ];
+
+ doCheck = false;
+
+ meta = libdeltachat.meta // {
+ description = "Delta Chat CLI client";
+ mainProgram = "deltachat-repl";
+ };
+}
diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix
index c698e6edef6c..8461ab3c29cf 100644
--- a/pkgs/by-name/fa/fantomas/package.nix
+++ b/pkgs/by-name/fa/fantomas/package.nix
@@ -2,9 +2,9 @@
buildDotnetGlobalTool {
pname = "fantomas";
- version = "6.2.2";
+ version = "6.2.3";
- nugetSha256 = "sha256-r5F44iwAV3QSeh3TyGTVhrN2oL4A68eD5dKiz/VnwdI=";
+ nugetSha256 = "sha256-Aol10o5Q7l8s6SdX0smVdi3ec2IgAx+gMksAMjXhIfU=";
meta = with lib; {
description = "F# source code formatter";
diff --git a/pkgs/by-name/ga/gato/package.nix b/pkgs/by-name/ga/gato/package.nix
new file mode 100644
index 000000000000..38297c71dc18
--- /dev/null
+++ b/pkgs/by-name/ga/gato/package.nix
@@ -0,0 +1,54 @@
+{ lib
+, python3
+, git
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "gato";
+ version = "1.5";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "praetorian-inc";
+ repo = "gato";
+ rev = "refs/tags/${version}";
+ hash = "sha256-M9ONeLjEKQD5Kys7OriM34dEBWDKW3qrBk9lu2TitGE=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace "--cov=gato" ""
+ '';
+
+ nativeBuildInputs = with python3.pkgs; [
+ setuptools
+ wheel
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ colorama
+ cryptography
+ packaging
+ pyyaml
+ requests
+ ];
+
+ nativeCheckInputs = with python3.pkgs; [
+ git
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "gato"
+ ];
+
+ meta = with lib; {
+ description = "GitHub Self-Hosted Runner Enumeration and Attack Tool";
+ homepage = "https://github.com/praetorian-inc/gato";
+ changelog = "https://github.com/praetorian-inc/gato/releases/tag/${version}";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ mainProgram = "gato";
+ };
+}
diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix
index 19ec2d3c912d..366796bd7c01 100644
--- a/pkgs/by-name/gi/gickup/package.nix
+++ b/pkgs/by-name/gi/gickup/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "gickup";
- version = "0.10.21";
+ version = "0.10.22";
src = fetchFromGitHub {
owner = "cooperspencer";
repo = "gickup";
rev = "refs/tags/v${version}";
- hash = "sha256-o8uLdkk0aZWIj+mKsp/XGKcwpV0rGFcZnmV4MuHKlUg=";
+ hash = "sha256-pF8sckOSmih5rkDv7kvSL9gU4XwBrEIycjzEce01i64=";
};
- vendorHash = "sha256-NAYkQsCt32mtHFXZC0g3OrlrOceUaeGH4bKWF7B08po=";
+ vendorHash = "sha256-kEy6Per8YibUHRp7E4jzkOgATq3Ub5WCNIe0WiHo2Ro=";
ldflags = ["-X main.version=${version}"];
diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix
index 4e10eaa80ad8..23171c71fbec 100644
--- a/pkgs/by-name/ja/jasper/package.nix
+++ b/pkgs/by-name/ja/jasper/package.nix
@@ -48,5 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
+
+ # The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling.
+ broken = stdenv.buildPlatform != stdenv.hostPlatform;
};
})
diff --git a/pkgs/games/meritous/default.nix b/pkgs/by-name/me/meritous/package.nix
similarity index 60%
rename from pkgs/games/meritous/default.nix
rename to pkgs/by-name/me/meritous/package.nix
index c7631f2370db..8b0a176938aa 100644
--- a/pkgs/games/meritous/default.nix
+++ b/pkgs/by-name/me/meritous/package.nix
@@ -1,20 +1,21 @@
{ lib, stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "meritous";
- version = "1.4";
+ version = "1.5";
src = fetchFromGitLab {
owner = "meritous";
repo = "meritous";
- rev = "314af46d84d2746eec4c30a0f63cbc2e651d5303";
- sha256 = "1hrwm65isg5nwzydyd8gvgl3p36sbj09rsn228sppr8g5p9sm10x";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-6KK2anjX+fPsYf4HSOHQ0EQBINqZiVbxo1RmBR6pslg=";
};
prePatch = ''
substituteInPlace Makefile \
- --replace "CPPFLAGS +=" "CPPFLAGS += -DSAVES_IN_HOME -DDATADIR=\\\"$out/share/meritous\\\"" \
- --replace sld-config ${lib.getDev SDL}/bin/sdl-config
+ --replace "prefix=/usr/local" "prefix=$out" \
+ --replace sdl-config ${lib.getDev SDL}/bin/sdl-config
+
substituteInPlace src/audio.c \
--replace "filename[64]" "filename[256]"
'';
@@ -31,10 +32,11 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Action-adventure dungeon crawl game";
- homepage = "http://www.asceai.net/meritous/";
- license = licenses.gpl3;
+ homepage = "https://gitlab.com/meritous/meritous";
+ changelog = "https://gitlab.com/meritous/meritous/-/blob/master/NEWS";
+ license = licenses.gpl3Only;
+ mainProgram = "meritous";
maintainers = [ maintainers.alexvorobiev ];
platforms = platforms.linux;
};
-}
-
+})
diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix
index 85810054da07..d2f8a4cec2f4 100644
--- a/pkgs/by-name/my/mystmd/package.nix
+++ b/pkgs/by-name/my/mystmd/package.nix
@@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "mystmd";
- version = "1.1.23";
+ version = "1.1.26";
src = fetchFromGitHub {
owner = "executablebooks";
repo = "mystmd";
rev = "mystmd@${version}";
- hash = "sha256-+zgAm3v7XcNhhVOFueRqJijteQqMCZmE33hDyR4d5bA=";
+ hash = "sha256-hDXqUjJXQqEpaGCdfxGuAnUraB5/RjZB4MmomAG4aPM=";
};
- npmDepsHash = "sha256-8brgDSV0BBggYUnizV+24RQMXxPd6HUBDYrw9fJtL+M=";
+ npmDepsHash = "sha256-uq3HbmkeJl3A46/rfm29v+oXFnZOwp2SFArm6Wtv+wo=";
dontNpmInstall = true;
diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix
index a0c13b8ebb36..21862ae9a5f9 100644
--- a/pkgs/by-name/ux/uxn/package.nix
+++ b/pkgs/by-name/ux/uxn/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "uxn";
- version = "unstable-2023-09-29";
+ version = "unstable-2023-10-23";
src = fetchFromSourcehut {
owner = "~rabbits";
repo = "uxn";
- rev = "c71842aa8472f26c0ea7fbf92624659313c038ba";
- hash = "sha256-Lo1AkK81Hv8A0jBfpR4lxlBJcWkh9LttURiXVoibKSs=";
+ rev = "798ebafdc8c27529217f159f8ff53edb0a8a328f";
+ hash = "sha256-OVCnJEdc/DdJJCks6c2jP9wK31VSNP1NBOsJZ2SFY+0=";
};
outputs = [ "out" "projects" ];
@@ -31,8 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs build.sh
substituteInPlace build.sh \
- --replace "-L/usr/local/lib " "" \
- --replace "\$(brew --prefix)/lib/libSDL2.a " ""
+ --replace "-L/usr/local/lib " ""
'';
buildPhase = ''
@@ -65,9 +64,5 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ AndersonTorres ];
mainProgram = "uxnemu";
inherit (SDL2.meta) platforms;
- # ofborg complains about an error trying to link inexistent SDL2 library
- # For full logs, run:
- # 'nix log /nix/store/bmyhh0lpifl9swvkpflqldv43vcrgci1-uxn-unstable-2023-08-10.drv'.
- broken = stdenv.isDarwin;
};
})
diff --git a/pkgs/tools/networking/wtfis/default.nix b/pkgs/by-name/wt/wtfis/package.nix
similarity index 68%
rename from pkgs/tools/networking/wtfis/default.nix
rename to pkgs/by-name/wt/wtfis/package.nix
index ba6175f59b33..720d08a06093 100644
--- a/pkgs/tools/networking/wtfis/default.nix
+++ b/pkgs/by-name/wt/wtfis/package.nix
@@ -5,30 +5,37 @@
let
pname = "wtfis";
- version = "0.6.1";
-in python3.pkgs.buildPythonApplication {
- inherit pname version;
-
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "pirxthepilot";
repo = "wtfis";
rev = "refs/tags/v${version}";
- hash = "sha256-bHgv5+HoM1hFhpkqml+HxqiMDvKbMqsTH+zYtDrV7Ko=";
+ hash = "sha256-X3e0icyhNPg8P6+N9k6a9WwBJ8bXRPdo3fj4cj+yY6w=";
};
-
- patches = [
- # TODO: get rid of that newbie patch
- ./000-pyproject-remove-versions.diff
- ];
+in python3.pkgs.buildPythonApplication {
+ inherit pname version src;
format = "pyproject";
+ nativeBuildInputs = [
+ python3.pkgs.pythonRelaxDepsHook
+ ];
+
propagatedBuildInputs = [
python3.pkgs.hatchling
python3.pkgs.pydantic
+ python3.pkgs.python-dotenv
python3.pkgs.rich
python3.pkgs.shodan
- python3.pkgs.python-dotenv
+ ];
+
+ pythonRelaxDeps = [
+ "pydantic"
+ "python-dotenv"
+ "requests"
+ "rich"
+ "shodan"
+ "types-requests"
];
meta = {
diff --git a/pkgs/by-name/ze/zesarux/package.nix b/pkgs/by-name/ze/zesarux/package.nix
new file mode 100644
index 000000000000..e19dd5b60f08
--- /dev/null
+++ b/pkgs/by-name/ze/zesarux/package.nix
@@ -0,0 +1,82 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, SDL2
+, aalib
+, alsa-lib
+, libXext
+, libXxf86vm
+, libcaca
+, libpulseaudio
+, libsndfile
+, ncurses
+, openssl
+, which
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "zesarux";
+ version = "unstable-2023-10-31";
+
+ src = fetchFromGitHub {
+ owner = "chernandezba";
+ repo = "zesarux";
+ rev = "02e734b088c3b880b2d260a9812404f029dfc92a";
+ hash = "sha256-1PWFpUNekDKyCUNuV/cNUZ7hWGZBMu0nxswD6pap8pg=";
+ };
+
+ nativeBuildInputs = [
+ which
+ ];
+
+ buildInputs = [
+ SDL2
+ aalib
+ alsa-lib
+ libXxf86vm
+ libXext
+ libcaca
+ libpulseaudio
+ libsndfile
+ ncurses
+ openssl
+ ];
+
+ strictDeps = true;
+
+ sourceRoot = "${finalAttrs.src.name}/src";
+
+ postPatch = ''
+ patchShebangs ./configure *.sh
+ '';
+
+ configureFlags = [
+ "--prefix=${placeholder "out"}"
+ "--c-compiler ${stdenv.cc.targetPrefix}cc"
+ "--enable-cpustats"
+ "--enable-memptr"
+ "--enable-sdl2"
+ "--enable-ssl"
+ "--enable-undoc-scfccf"
+ "--enable-visualmem"
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ ./generate_install_sh.sh
+ patchShebangs ./install.sh
+ ./install.sh
+
+ runHook postInstall
+ '';
+
+ meta = {
+ homepage = "https://github.com/chernandezba/zesarux";
+ description = "ZX Second-Emulator And Released for UniX";
+ license = with lib.licenses; [ gpl3Plus ];
+ maintainers = with lib.maintainers; [ AndersonTorres ];
+ platforms = lib.platforms.unix;
+ };
+})
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 022c4e543127..c9ffed829b2d 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -148,6 +148,11 @@ let
# See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277
substituteInPlace spec/compiler/loader/unix_spec.cr \
--replace 'it "parses file paths"' 'pending "parses file paths"'
+ '' + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) ''
+ # Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require
+ # libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205).
+ substituteInPlace src/llvm/lib_llvm.cr \
+ --replace '@[Link("stdc++")]' '@[Link("c++", "-l${stdenv.cc.libcxx.cxxabi.libName}")]'
'';
# Defaults are 4
diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix
index 104b7ce688bc..35ebea77782f 100644
--- a/pkgs/development/compilers/lunarml/default.nix
+++ b/pkgs/development/compilers/lunarml/default.nix
@@ -5,16 +5,19 @@
, lua5_3
}:
+let
+ version = "0.0.20230924";
+in
stdenvNoCC.mkDerivation {
- pname = "lunarml";
+ inherit version;
- version = "unstable-2023-09-21";
+ pname = "lunarml";
src = fetchFromGitHub {
owner = "minoki";
repo = "LunarML";
- rev = "c6e23ae68149bda550ddb75c0df9f422aa379b3a";
- sha256 = "DY4gOCXfGV1OVdGXd6GGvbHlQdWWxMg5TZzkceeOu9o=";
+ rev = "refs/tags/v${version}";
+ sha256 = "QN5iJEpJJZZuUfY/z57bpOQHDU31ecmJPWQtkXsLmDg=";
};
outputs = [ "out" "doc" ];
diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/development/embedded/nmrpflash/default.nix
index 323e54578a7b..62dea5d4c4d8 100644
--- a/pkgs/development/embedded/nmrpflash/default.nix
+++ b/pkgs/development/embedded/nmrpflash/default.nix
@@ -7,13 +7,13 @@
}:
stdenv.mkDerivation rec {
pname = "nmrpflash";
- version = "0.9.21";
+ version = "0.9.22";
src = fetchFromGitHub {
owner = "jclehner";
repo = "nmrpflash";
rev = "v${version}";
- sha256 = "sha256-nW+VD2a0vmgODbJi4H8Esnq502bEkeCKjXQi23DfdqA=";
+ sha256 = "sha256-gr/7tZYnuXFvfIUh2MmtgSbFoELTomQ4h05y/WFDhjo=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock
index 1e9b02504bd6..80f4eb3346f8 100644
--- a/pkgs/development/libraries/libdeltachat/Cargo.lock
+++ b/pkgs/development/libraries/libdeltachat/Cargo.lock
@@ -17,9 +17,9 @@ dependencies = [
[[package]]
name = "addr2line"
-version = "0.20.0"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
dependencies = [
"gimli",
]
@@ -43,31 +43,21 @@ dependencies = [
[[package]]
name = "ahash"
-version = "0.7.6"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom 0.2.10",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
dependencies = [
"cfg-if",
"once_cell",
"version_check",
+ "zerocopy",
]
[[package]]
name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
dependencies = [
"memchr",
]
@@ -89,9 +79,9 @@ dependencies = [
[[package]]
name = "allocator-api2"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
[[package]]
name = "android-tzdata"
@@ -125,15 +115,15 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.1"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
[[package]]
name = "anyhow"
-version = "1.0.71"
+version = "1.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
dependencies = [
"backtrace",
]
@@ -169,7 +159,7 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
- "time 0.3.22",
+ "time 0.3.30",
]
[[package]]
@@ -197,15 +187,28 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
dependencies = [
"concurrent-queue",
- "event-listener",
+ "event-listener 2.5.3",
"futures-core",
]
+[[package]]
+name = "async-channel"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "336d835910fab747186c56586562cb46f42809c2843ef3a84f47509009522838"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 3.0.0",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
[[package]]
name = "async-compression"
version = "0.3.15"
@@ -221,12 +224,12 @@ dependencies = [
[[package]]
name = "async-imap"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8"
+checksum = "936c1b580be4373b48c9c687e0c79285441664398354df28d0860087cac0c069"
dependencies = [
- "async-channel",
- "base64 0.21.2",
+ "async-channel 1.9.0",
+ "base64 0.21.5",
"bytes",
"chrono",
"futures",
@@ -247,7 +250,7 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e"
dependencies = [
- "event-listener",
+ "event-listener 2.5.3",
]
[[package]]
@@ -281,13 +284,13 @@ dependencies = [
[[package]]
name = "async-trait"
-version = "0.1.70"
+version = "0.1.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -312,13 +315,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "axum"
-version = "0.6.18"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
dependencies = [
"async-trait",
"axum-core",
- "base64 0.21.2",
+ "base64 0.21.5",
"bitflags 1.3.2",
"bytes",
"futures-util",
@@ -364,9 +367,9 @@ dependencies = [
[[package]]
name = "backtrace"
-version = "0.3.68"
+version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
dependencies = [
"addr2line",
"cc",
@@ -409,9 +412,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.2"
+version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
[[package]]
name = "base64ct"
@@ -442,22 +445,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.3.3"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]]
name = "blake3"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
dependencies = [
"arrayref",
"arrayvec",
"cc",
"cfg-if",
"constant_time_eq",
- "digest 0.10.7",
]
[[package]]
@@ -499,9 +501,9 @@ dependencies = [
[[package]]
name = "brotli"
-version = "3.3.4"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -510,9 +512,9 @@ dependencies = [
[[package]]
name = "brotli-decompressor"
-version = "2.3.4"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
+checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -520,9 +522,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.5.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
dependencies = [
"memchr",
"serde",
@@ -540,27 +542,27 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]]
name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
[[package]]
name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
[[package]]
name = "camellia"
@@ -574,18 +576,18 @@ dependencies = [
[[package]]
name = "camino"
-version = "1.1.4"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
dependencies = [
"serde",
]
[[package]]
name = "cargo-platform"
-version = "0.1.2"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
+checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
dependencies = [
"serde",
]
@@ -620,9 +622,12 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.79"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
[[package]]
name = "cfb-mode"
@@ -651,17 +656,16 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.26"
+version = "0.4.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
"num-traits",
- "time 0.1.45",
"wasm-bindgen",
- "winapi",
+ "windows-targets",
]
[[package]]
@@ -703,18 +707,18 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.3.10"
+version = "4.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
+checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
-version = "4.3.10"
+version = "4.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
+checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
dependencies = [
"anstyle",
"clap_lex",
@@ -722,9 +726,9 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
[[package]]
name = "clipboard-win"
@@ -751,33 +755,33 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "concurrent-queue"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
+checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "const-oid"
-version = "0.9.3"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
[[package]]
name = "const_format"
-version = "0.2.31"
+version = "0.2.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
dependencies = [
"const_format_proc_macros",
]
[[package]]
name = "const_format_proc_macros"
-version = "0.2.31"
+version = "0.2.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
dependencies = [
"proc-macro2",
"quote",
@@ -786,9 +790,9 @@ dependencies = [
[[package]]
name = "constant_time_eq"
-version = "0.2.6"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
[[package]]
name = "convert_case"
@@ -820,9 +824,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cpufeatures"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
+checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4"
dependencies = [
"libc",
]
@@ -880,16 +884,6 @@ dependencies = [
"itertools",
]
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-deque"
version = "0.8.3"
@@ -937,9 +931,9 @@ dependencies = [
[[package]]
name = "crypto-bigint"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124"
dependencies = [
"generic-array",
"rand_core 0.6.4",
@@ -957,16 +951,6 @@ dependencies = [
"typenum",
]
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "curve25519-dalek"
version = "3.2.0"
@@ -982,9 +966,9 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.0.0-rc.3"
+version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7"
+checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -1005,7 +989,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -1098,22 +1082,22 @@ dependencies = [
"netlink-sys",
"once_cell",
"system-configuration",
- "windows 0.32.0",
+ "windows",
]
[[package]]
name = "deltachat"
-version = "1.121.0"
+version = "1.128.0"
dependencies = [
"ansi_term",
"anyhow",
- "async-channel",
+ "async-channel 2.0.0",
"async-imap",
"async-native-tls",
"async-smtp",
"async_zip",
"backtrace",
- "base64 0.21.2",
+ "base64 0.21.5",
"brotli",
"chrono",
"criterion",
@@ -1122,10 +1106,12 @@ dependencies = [
"encoded-words",
"escaper",
"fast-socks5",
+ "fd-lock",
"format-flowed",
"futures",
"futures-lite",
"hex",
+ "hickory-resolver",
"humansize",
"image",
"iroh",
@@ -1135,13 +1121,14 @@ dependencies = [
"log",
"mailparse",
"mime",
- "num-derive 0.4.0",
+ "num-derive",
"num-traits",
"num_cpus",
"once_cell",
"parking_lot",
"percent-encoding",
"pgp",
+ "pin-project",
"pretty_assertions",
"pretty_env_logger",
"proptest",
@@ -1157,7 +1144,7 @@ dependencies = [
"serde",
"serde_json",
"sha-1",
- "sha2 0.10.7",
+ "sha2 0.10.8",
"smallvec",
"strum",
"strum_macros",
@@ -1172,19 +1159,18 @@ dependencies = [
"tokio-tar",
"tokio-util",
"toml",
- "trust-dns-resolver",
"url",
"uuid",
]
[[package]]
name = "deltachat-jsonrpc"
-version = "1.121.0"
+version = "1.128.0"
dependencies = [
"anyhow",
- "async-channel",
+ "async-channel 2.0.0",
"axum",
- "base64 0.21.2",
+ "base64 0.21.5",
"deltachat",
"env_logger",
"futures",
@@ -1203,7 +1189,7 @@ dependencies = [
[[package]]
name = "deltachat-repl"
-version = "1.121.0"
+version = "1.128.0"
dependencies = [
"ansi_term",
"anyhow",
@@ -1218,7 +1204,7 @@ dependencies = [
[[package]]
name = "deltachat-rpc-server"
-version = "1.121.0"
+version = "1.128.0"
dependencies = [
"anyhow",
"deltachat",
@@ -1238,12 +1224,12 @@ name = "deltachat_derive"
version = "2.0.0"
dependencies = [
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
name = "deltachat_ffi"
-version = "1.121.0"
+version = "1.128.0"
dependencies = [
"anyhow",
"deltachat",
@@ -1273,9 +1259,9 @@ dependencies = [
[[package]]
name = "der"
-version = "0.7.7"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
dependencies = [
"const-oid",
"pem-rfc7468 0.7.0",
@@ -1308,6 +1294,15 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "deranged"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+]
+
[[package]]
name = "derive_builder"
version = "0.12.0"
@@ -1416,7 +1411,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -1438,7 +1433,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -1466,9 +1461,9 @@ dependencies = [
[[package]]
name = "dyn-clone"
-version = "1.0.11"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd"
[[package]]
name = "ecdsa"
@@ -1484,13 +1479,13 @@ dependencies = [
[[package]]
name = "ecdsa"
-version = "0.16.7"
+version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
dependencies = [
- "der 0.7.7",
+ "der 0.7.8",
"digest 0.10.7",
- "elliptic-curve 0.13.5",
+ "elliptic-curve 0.13.6",
"rfc6979 0.4.0",
"signature 2.1.0",
"spki 0.7.2",
@@ -1508,9 +1503,9 @@ dependencies = [
[[package]]
name = "ed25519"
-version = "2.2.1"
+version = "2.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
dependencies = [
"pkcs8 0.10.2",
"signature 2.1.0",
@@ -1533,22 +1528,22 @@ dependencies = [
[[package]]
name = "ed25519-dalek"
-version = "2.0.0-rc.3"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa8e9049d5d72bfc12acbc05914731b5322f79b5e2f195e9f2d705fca22ab4c"
+checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
dependencies = [
- "curve25519-dalek 4.0.0-rc.3",
- "ed25519 2.2.1",
+ "curve25519-dalek 4.1.1",
+ "ed25519 2.2.3",
"serde",
- "sha2 0.10.7",
+ "sha2 0.10.8",
"zeroize",
]
[[package]]
name = "educe"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae"
+checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f"
dependencies = [
"enum-ordinalize",
"proc-macro2",
@@ -1558,9 +1553,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "elliptic-curve"
@@ -1583,12 +1578,12 @@ dependencies = [
[[package]]
name = "elliptic-curve"
-version = "0.13.5"
+version = "0.13.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
dependencies = [
"base16ct 0.2.0",
- "crypto-bigint 0.5.2",
+ "crypto-bigint 0.5.3",
"digest 0.10.7",
"ff 0.13.0",
"generic-array",
@@ -1597,7 +1592,7 @@ dependencies = [
"pem-rfc7468 0.7.0",
"pkcs8 0.10.2",
"rand_core 0.6.4",
- "sec1 0.7.2",
+ "sec1 0.7.3",
"subtle",
"zeroize",
]
@@ -1605,7 +1600,7 @@ dependencies = [
[[package]]
name = "email"
version = "0.0.21"
-source = "git+https://github.com/deltachat/rust-email?branch=master#25702df99254d059483b41417cd80696a258df8e"
+source = "git+https://github.com/deltachat/rust-email?branch=master#37778c89d5eb5a94b7983f3f37ff67769bde3cf9"
dependencies = [
"base64 0.11.0",
"chrono",
@@ -1697,9 +1692,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
[[package]]
name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
dependencies = [
"cfg-if",
]
@@ -1718,27 +1713,27 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca"
[[package]]
name = "enum-as-inner"
-version = "0.5.1"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
+checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.38",
]
[[package]]
name = "enum-ordinalize"
-version = "3.1.13"
+version = "3.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1"
+checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee"
dependencies = [
"num-bigint",
"num-traits",
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -1756,29 +1751,18 @@ dependencies = [
[[package]]
name = "equivalent"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
-version = "0.3.1"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
"libc",
+ "windows-sys",
]
[[package]]
@@ -1806,6 +1790,27 @@ version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+[[package]]
+name = "event-listener"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160"
+dependencies = [
+ "event-listener 3.0.0",
+ "pin-project-lite",
+]
+
[[package]]
name = "fallible-iterator"
version = "0.2.0"
@@ -1842,12 +1847,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "1.9.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
[[package]]
name = "fd-lock"
@@ -1856,8 +1858,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5"
dependencies = [
"cfg-if",
- "rustix 0.38.2",
- "windows-sys 0.48.0",
+ "rustix",
+ "windows-sys",
]
[[package]]
@@ -1891,27 +1893,27 @@ dependencies = [
[[package]]
name = "fiat-crypto"
-version = "0.1.20"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d"
[[package]]
name = "filetime"
-version = "0.2.21"
+version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.2.16",
- "windows-sys 0.48.0",
+ "redox_syscall 0.3.5",
+ "windows-sys",
]
[[package]]
name = "flate2"
-version = "1.0.26"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -2014,9 +2016,9 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-lite"
-version = "1.13.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+checksum = "9c1155db57329dca6d018b61e76b1488ce9a2e5e44028cac420a5898f4fcef63"
dependencies = [
"fastrand",
"futures-core",
@@ -2035,7 +2037,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -2115,9 +2117,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.27.3"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]]
name = "group"
@@ -2143,9 +2145,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.20"
+version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
dependencies = [
"bytes",
"fnv",
@@ -2171,27 +2173,24 @@ name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.6",
-]
[[package]]
name = "hashbrown"
-version = "0.14.0"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
dependencies = [
- "ahash 0.8.3",
+ "ahash",
"allocator-api2",
]
[[package]]
name = "hashlink"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
dependencies = [
- "hashbrown 0.14.0",
+ "hashbrown 0.14.2",
]
[[package]]
@@ -2202,9 +2201,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
[[package]]
name = "hex"
@@ -2212,6 +2211,51 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+[[package]]
+name = "hickory-proto"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna",
+ "ipnet",
+ "once_cell",
+ "rand 0.8.5",
+ "thiserror",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot",
+ "rand 0.8.5",
+ "resolv-conf",
+ "smallvec",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
[[package]]
name = "hkdf"
version = "0.12.3"
@@ -2236,7 +2280,7 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -2280,15 +2324,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "human-panic"
-version = "1.1.5"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38a841f87949b0dd751864e769a870be79dc34abcee1cf31d737a61d498b22b6"
+checksum = "b82da652938b83f94cfdaaf9ae7aaadb8430d84b0dfda226998416318727eac2"
dependencies = [
"backtrace",
"os_info",
@@ -2330,7 +2374,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.4.10",
"tokio",
"tower-service",
"tracing",
@@ -2352,16 +2396,16 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "windows 0.48.0",
+ "windows-core",
]
[[package]]
@@ -2388,17 +2432,6 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
[[package]]
name = "idna"
version = "0.4.0"
@@ -2411,9 +2444,9 @@ dependencies = [
[[package]]
name = "image"
-version = "0.24.6"
+version = "0.24.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
dependencies = [
"bytemuck",
"byteorder",
@@ -2446,12 +2479,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
dependencies = [
"equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.2",
]
[[package]]
@@ -2463,53 +2496,32 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "ipconfig"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
dependencies = [
- "socket2 0.5.3",
+ "socket2 0.5.5",
"widestring",
- "windows-sys 0.48.0",
- "winreg 0.50.0",
+ "windows-sys",
+ "winreg",
]
[[package]]
name = "ipnet"
-version = "2.8.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
[[package]]
name = "iroh"
version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546"
+source = "git+https://github.com/deltachat/iroh?branch=0.4-update-quic#36ca9ca017a101c00dfdf74a917b92bdc505ddbd"
dependencies = [
"abao",
"anyhow",
- "base64 0.21.2",
+ "base64 0.21.5",
"blake3",
"bytes",
"default-net",
@@ -2526,8 +2538,9 @@ dependencies = [
"quinn",
"rand 0.7.3",
"rcgen",
- "ring",
+ "ring 0.16.20",
"rustls",
+ "rustls-webpki",
"serde",
"serde-error",
"ssh-key",
@@ -2540,20 +2553,19 @@ dependencies = [
"tracing-futures",
"tracing-subscriber",
"walkdir",
- "webpki",
"x509-parser",
"zeroize",
]
[[package]]
name = "is-terminal"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
- "rustix 0.38.2",
- "windows-sys 0.48.0",
+ "rustix",
+ "windows-sys",
]
[[package]]
@@ -2567,9 +2579,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "jpeg-decoder"
@@ -2639,15 +2651,15 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.147"
+version = "0.2.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
[[package]]
name = "libm"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "libsqlite3-sys"
@@ -2669,21 +2681,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
-version = "0.3.8"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
[[package]]
name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
"scopeguard",
@@ -2691,9 +2697,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.19"
+version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
name = "lru-cache"
@@ -2727,27 +2733,22 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
]
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
[[package]]
name = "matchit"
-version = "0.7.0"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
[[package]]
name = "md-5"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
dependencies = [
+ "cfg-if",
"digest 0.10.7",
]
@@ -2759,9 +2760,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1"
[[package]]
name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "memoffset"
@@ -2796,13 +2797,13 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.8"
+version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
dependencies = [
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -2898,14 +2899,13 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.26.2"
+version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
- "static_assertions",
]
[[package]]
@@ -2939,9 +2939,9 @@ dependencies = [
[[package]]
name = "num-bigint"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
dependencies = [
"autocfg",
"num-integer",
@@ -2968,24 +2968,13 @@ dependencies = [
[[package]]
name = "num-derive"
-version = "0.3.3"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -3022,9 +3011,9 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
"autocfg",
"libm",
@@ -3042,9 +3031,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.31.1"
+version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
dependencies = [
"memchr",
]
@@ -3078,11 +3067,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
-version = "0.10.55"
+version = "0.10.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
+checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
"cfg-if",
"foreign-types",
"libc",
@@ -3099,7 +3088,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -3110,18 +3099,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-src"
-version = "111.26.0+1.1.1u"
+version = "300.1.6+3.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37"
+checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
-version = "0.9.90"
+version = "0.9.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
+checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
dependencies = [
"cc",
"libc",
@@ -3147,15 +3136,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "output_vt100"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "overload"
version = "0.1.1"
@@ -3170,7 +3150,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
dependencies = [
"ecdsa 0.14.8",
"elliptic-curve 0.12.3",
- "sha2 0.10.7",
+ "sha2 0.10.8",
]
[[package]]
@@ -3179,10 +3159,10 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
dependencies = [
- "ecdsa 0.16.7",
- "elliptic-curve 0.13.5",
+ "ecdsa 0.16.8",
+ "elliptic-curve 0.13.6",
"primeorder",
- "sha2 0.10.7",
+ "sha2 0.10.8",
]
[[package]]
@@ -3193,7 +3173,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
dependencies = [
"ecdsa 0.14.8",
"elliptic-curve 0.12.3",
- "sha2 0.10.7",
+ "sha2 0.10.8",
]
[[package]]
@@ -3202,17 +3182,17 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
dependencies = [
- "ecdsa 0.16.7",
- "elliptic-curve 0.13.5",
+ "ecdsa 0.16.8",
+ "elliptic-curve 0.13.6",
"primeorder",
- "sha2 0.10.7",
+ "sha2 0.10.8",
]
[[package]]
name = "parking"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "parking_lot"
@@ -3234,14 +3214,14 @@ dependencies = [
"libc",
"redox_syscall 0.3.5",
"smallvec",
- "windows-targets 0.48.1",
+ "windows-targets",
]
[[package]]
name = "paste"
-version = "1.0.13"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "pem"
@@ -3278,12 +3258,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pgp"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0"
+checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132"
dependencies = [
"aes",
- "base64 0.21.2",
+ "base64 0.21.5",
"bitfield",
"block-padding",
"blowfish",
@@ -3296,11 +3276,12 @@ dependencies = [
"chrono",
"cipher",
"crc24",
+ "curve25519-dalek 4.1.1",
"derive_builder",
"des",
"digest 0.10.7",
- "ed25519-dalek 2.0.0-rc.3",
- "elliptic-curve 0.13.5",
+ "ed25519-dalek 2.0.0",
+ "elliptic-curve 0.13.6",
"flate2",
"generic-array",
"hex",
@@ -3309,15 +3290,15 @@ dependencies = [
"md-5",
"nom",
"num-bigint-dig",
- "num-derive 0.3.3",
+ "num-derive",
"num-traits",
"p256 0.13.2",
"p384 0.13.0",
"rand 0.8.5",
"ripemd",
- "rsa 0.9.0-pre.2",
+ "rsa 0.9.2",
"sha1",
- "sha2 0.10.7",
+ "sha2 0.10.8",
"sha3",
"signature 2.1.0",
"smallvec",
@@ -3329,29 +3310,29 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.2"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.2"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
name = "pin-project-lite"
-version = "0.2.10"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "pin-utils"
@@ -3377,7 +3358,7 @@ version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
dependencies = [
- "der 0.7.7",
+ "der 0.7.8",
"pkcs8 0.10.2",
"spki 0.7.2",
]
@@ -3398,7 +3379,7 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
dependencies = [
- "der 0.7.7",
+ "der 0.7.8",
"spki 0.7.2",
]
@@ -3410,9 +3391,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "platforms"
-version = "3.0.2"
+version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8"
[[package]]
name = "plotters"
@@ -3444,9 +3425,9 @@ dependencies = [
[[package]]
name = "png"
-version = "0.17.9"
+version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
dependencies = [
"bitflags 1.3.2",
"crc32fast",
@@ -3457,15 +3438,15 @@ dependencies = [
[[package]]
name = "portable-atomic"
-version = "1.3.3"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
+checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
[[package]]
name = "postcard"
-version = "1.0.4"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00"
+checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb"
dependencies = [
"cobs",
"const_format",
@@ -3484,6 +3465,12 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@@ -3492,13 +3479,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "pretty_assertions"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
+checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
dependencies = [
- "ctor",
"diff",
- "output_vt100",
"yansi",
]
@@ -3518,7 +3503,7 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
dependencies = [
- "elliptic-curve 0.13.5",
+ "elliptic-curve 0.13.6",
]
[[package]]
@@ -3547,27 +3532,26 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
[[package]]
name = "proptest"
-version = "1.2.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65"
+checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e"
dependencies = [
- "bitflags 1.3.2",
- "byteorder",
+ "bitflags 2.4.1",
"lazy_static",
"num-traits",
"rand 0.8.5",
"rand_chacha 0.3.1",
"rand_xorshift",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.7.5",
"unarray",
]
@@ -3579,11 +3563,12 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142"
[[package]]
name = "quic-rpc"
-version = "0.5.2"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d453504fc3e456160ae3b9ebe4d83c1f6477af167aa9b67e2d7bf11a096f179d"
+checksum = "6d60c2fc2390baad4b9d41ae9957ae88c3095496f88e252ef50722df8b5b78d7"
dependencies = [
"bincode",
+ "educe",
"flume",
"futures",
"pin-project",
@@ -3603,18 +3588,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quick-xml"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
dependencies = [
"memchr",
]
[[package]]
name = "quinn"
-version = "0.9.3"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1"
+checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
dependencies = [
"bytes",
"pin-project-lite",
@@ -3625,17 +3610,17 @@ dependencies = [
"thiserror",
"tokio",
"tracing",
- "webpki",
]
[[package]]
name = "quinn-proto"
-version = "0.9.2"
-source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1"
dependencies = [
"bytes",
"rand 0.8.5",
- "ring",
+ "ring 0.16.20",
"rustc-hash",
"rustls",
"rustls-native-certs",
@@ -3643,26 +3628,26 @@ dependencies = [
"thiserror",
"tinyvec",
"tracing",
- "webpki",
]
[[package]]
name = "quinn-udp"
-version = "0.3.2"
-source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
dependencies = [
+ "bytes",
"libc",
- "quinn-proto",
- "socket2 0.4.9",
+ "socket2 0.5.5",
"tracing",
- "windows-sys 0.45.0",
+ "windows-sys",
]
[[package]]
name = "quote"
-version = "1.0.29"
+version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2",
]
@@ -3769,9 +3754,9 @@ version = "1.0.0"
[[package]]
name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
dependencies = [
"either",
"rayon-core",
@@ -3779,14 +3764,12 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
dependencies = [
- "crossbeam-channel",
"crossbeam-deque",
"crossbeam-utils",
- "num_cpus",
]
[[package]]
@@ -3796,8 +3779,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
dependencies = [
"pem",
- "ring",
- "time 0.3.22",
+ "ring 0.16.20",
+ "time 0.3.30",
"yasna",
]
@@ -3832,13 +3815,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.8.4"
+version = "1.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.7.2",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
]
[[package]]
@@ -3850,6 +3834,17 @@ dependencies = [
"regex-syntax 0.6.29",
]
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
[[package]]
name = "regex-syntax"
version = "0.6.29"
@@ -3858,17 +3853,23 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.7.2"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "reqwest"
-version = "0.11.18"
+version = "0.11.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
+checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
dependencies = [
- "base64 0.21.2",
+ "base64 0.21.5",
"bytes",
"encoding_rs",
"futures-core",
@@ -3889,6 +3890,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded",
+ "system-configuration",
"tokio",
"tokio-native-tls",
"tower-service",
@@ -3896,7 +3898,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "winreg 0.10.1",
+ "winreg",
]
[[package]]
@@ -3940,11 +3942,25 @@ dependencies = [
"libc",
"once_cell",
"spin 0.5.2",
- "untrusted",
+ "untrusted 0.7.1",
"web-sys",
"winapi",
]
+[[package]]
+name = "ring"
+version = "0.17.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+dependencies = [
+ "cc",
+ "getrandom 0.2.10",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys",
+]
+
[[package]]
name = "ripemd"
version = "0.1.3"
@@ -3977,9 +3993,9 @@ dependencies = [
[[package]]
name = "rsa"
-version = "0.9.0-pre.2"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65db0998ad35adcaca498b7358992e088ee16cc783fe6fb899da203e113a63e5"
+checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8"
dependencies = [
"byteorder",
"const-oid",
@@ -3992,6 +4008,7 @@ dependencies = [
"pkcs8 0.10.2",
"rand_core 0.6.4",
"signature 2.1.0",
+ "spki 0.7.2",
"subtle",
"zeroize",
]
@@ -4002,7 +4019,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.1",
"fallible-iterator",
"fallible-streaming-iterator",
"hashlink",
@@ -4048,40 +4065,26 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.37.22"
+version = "0.38.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
-dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.1",
"errno",
"libc",
- "linux-raw-sys 0.4.3",
- "windows-sys 0.48.0",
+ "linux-raw-sys",
+ "windows-sys",
]
[[package]]
name = "rustls"
-version = "0.20.8"
+version = "0.21.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
+checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
dependencies = [
- "ring",
+ "ring 0.17.5",
+ "rustls-webpki",
"sct",
- "webpki",
]
[[package]]
@@ -4102,14 +4105,24 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [
- "base64 0.21.2",
+ "base64 0.21.5",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring 0.17.5",
+ "untrusted 0.9.0",
]
[[package]]
name = "rustversion"
-version = "1.0.13"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]]
name = "rustyline"
@@ -4117,7 +4130,7 @@ version = "12.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9"
dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.1",
"cfg-if",
"clipboard-win",
"fd-lock",
@@ -4136,9 +4149,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.14"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
name = "safemem"
@@ -4157,9 +4170,9 @@ dependencies = [
[[package]]
name = "sanitize-filename"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c"
+checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603"
dependencies = [
"lazy_static",
"regex",
@@ -4171,14 +4184,14 @@ version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
name = "schemars"
-version = "0.8.12"
+version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
dependencies = [
"dyn-clone",
"schemars_derive",
@@ -4188,9 +4201,9 @@ dependencies = [
[[package]]
name = "schemars_derive"
-version = "0.8.12"
+version = "0.8.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
dependencies = [
"proc-macro2",
"quote",
@@ -4200,18 +4213,18 @@ dependencies = [
[[package]]
name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sct"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.5",
+ "untrusted 0.9.0",
]
[[package]]
@@ -4230,12 +4243,12 @@ dependencies = [
[[package]]
name = "sec1"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
dependencies = [
"base16ct 0.2.0",
- "der 0.7.7",
+ "der 0.7.8",
"generic-array",
"pkcs8 0.10.2",
"subtle",
@@ -4244,9 +4257,9 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.9.1"
+version = "2.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
@@ -4257,9 +4270,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.9.0"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
dependencies = [
"core-foundation-sys",
"libc",
@@ -4273,18 +4286,18 @@ checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6"
[[package]]
name = "semver"
-version = "1.0.17"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
dependencies = [
"serde",
]
[[package]]
name = "serde"
-version = "1.0.166"
+version = "1.0.190"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
dependencies = [
"serde_derive",
]
@@ -4300,22 +4313,22 @@ dependencies = [
[[package]]
name = "serde_bytes"
-version = "0.11.10"
+version = "0.11.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e"
+checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
dependencies = [
"serde",
]
[[package]]
name = "serde_derive"
-version = "1.0.166"
+version = "1.0.190"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -4331,9 +4344,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.100"
+version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
dependencies = [
"itoa",
"ryu",
@@ -4342,9 +4355,9 @@ dependencies = [
[[package]]
name = "serde_path_to_error"
-version = "0.1.12"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55"
+checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
dependencies = [
"itoa",
"serde",
@@ -4352,9 +4365,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
dependencies = [
"serde",
]
@@ -4384,9 +4397,9 @@ dependencies = [
[[package]]
name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -4408,9 +4421,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -4429,9 +4442,9 @@ dependencies = [
[[package]]
name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
dependencies = [
"lazy_static",
]
@@ -4467,36 +4480,36 @@ dependencies = [
[[package]]
name = "simd-adler32"
-version = "0.3.5"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]]
name = "slab"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
dependencies = [
"autocfg",
]
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
[[package]]
name = "smawk"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
+checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
[[package]]
name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
dependencies = [
"libc",
"winapi",
@@ -4504,12 +4517,12 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.3"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
dependencies = [
"libc",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -4544,7 +4557,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
dependencies = [
"base64ct",
- "der 0.7.7",
+ "der 0.7.8",
]
[[package]]
@@ -4555,7 +4568,7 @@ checksum = "19cfdc32e0199062113edf41f344fbf784b8205a94600233c84eb838f45191e1"
dependencies = [
"base64ct",
"pem-rfc7468 0.6.0",
- "sha2 0.10.7",
+ "sha2 0.10.8",
]
[[package]]
@@ -4570,25 +4583,19 @@ dependencies = [
"rand_core 0.6.4",
"rsa 0.7.2",
"sec1 0.3.0",
- "sha2 0.10.7",
+ "sha2 0.10.8",
"signature 1.6.4",
"ssh-encoding",
"zeroize",
]
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
[[package]]
name = "stop-token"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b"
dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
"cfg-if",
"futures-core",
"pin-project-lite",
@@ -4614,15 +4621,15 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
[[package]]
name = "strum_macros"
-version = "0.25.1"
+version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -4644,9 +4651,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.23"
+version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
"proc-macro2",
"quote",
@@ -4708,38 +4715,37 @@ dependencies = [
[[package]]
name = "tagger"
-version = "4.3.4"
+version = "4.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aaa6f5d645d1dae4cd0286e9f8bf15b75a31656348e5e106eb1a940abd34b63"
+checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5"
[[package]]
name = "tempfile"
-version = "3.6.0"
+version = "3.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
dependencies = [
- "autocfg",
"cfg-if",
"fastrand",
"redox_syscall 0.3.5",
- "rustix 0.37.22",
- "windows-sys 0.48.0",
+ "rustix",
+ "windows-sys",
]
[[package]]
name = "termcolor"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
dependencies = [
"winapi-util",
]
[[package]]
name = "testdir"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48b7965698cfb3d1ac1e6e54b4b45f5caa9e89bda223c8cf723d9cf53d7cefa7"
+checksum = "480060a2e7e1d3c779d3dea588a81c0df78b6a6322b7ce25c0d2ec14a0d5d869"
dependencies = [
"anyhow",
"backtrace",
@@ -4762,22 +4768,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.41"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.41"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -4803,11 +4809,13 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.22"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
dependencies = [
+ "deranged",
"itoa",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -4815,15 +4823,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.9"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
dependencies = [
"time-core",
]
@@ -4855,11 +4863,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.29.1"
+version = "1.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
dependencies = [
- "autocfg",
"backtrace",
"bytes",
"libc",
@@ -4868,9 +4875,9 @@ dependencies = [
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.4.9",
+ "socket2 0.5.5",
"tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
@@ -4891,7 +4898,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
@@ -4947,9 +4954,9 @@ dependencies = [
[[package]]
name = "tokio-tungstenite"
-version = "0.18.0"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd"
+checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
dependencies = [
"futures-util",
"log",
@@ -4959,9 +4966,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.8"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
dependencies = [
"bytes",
"futures-core",
@@ -4973,9 +4980,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.5"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
dependencies = [
"serde",
"serde_spanned",
@@ -4985,20 +4992,20 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.19.11"
+version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
"serde",
"serde_spanned",
"toml_datetime",
@@ -5035,11 +5042,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
- "cfg-if",
"log",
"pin-project-lite",
"tracing-attributes",
@@ -5048,20 +5054,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
[[package]]
name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
dependencies = [
"once_cell",
"valuable",
@@ -5079,12 +5085,12 @@ dependencies = [
[[package]]
name = "tracing-log"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
dependencies = [
- "lazy_static",
"log",
+ "once_cell",
"tracing-core",
]
@@ -5106,51 +5112,6 @@ dependencies = [
"tracing-log",
]
-[[package]]
-name = "trust-dns-proto"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
-dependencies = [
- "async-trait",
- "cfg-if",
- "data-encoding",
- "enum-as-inner",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.2.3",
- "ipnet",
- "lazy_static",
- "rand 0.8.5",
- "smallvec",
- "thiserror",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
-dependencies = [
- "cfg-if",
- "futures-util",
- "ipconfig",
- "lazy_static",
- "lru-cache",
- "parking_lot",
- "resolv-conf",
- "smallvec",
- "thiserror",
- "tokio",
- "tracing",
- "trust-dns-proto",
-]
-
[[package]]
name = "try-lock"
version = "0.2.4"
@@ -5159,13 +5120,13 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "tungstenite"
-version = "0.18.0"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
dependencies = [
- "base64 0.13.1",
"byteorder",
"bytes",
+ "data-encoding",
"http",
"httparse",
"log",
@@ -5187,15 +5148,15 @@ dependencies = [
[[package]]
name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "typescript-type-def"
-version = "0.5.6"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e6b74ffbd5684d318252bb7182051df8c4ecc098b542f63fddf792e7f42aa02"
+checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83"
dependencies = [
"serde_json",
"typescript-type-def-derive",
@@ -5203,9 +5164,9 @@ dependencies = [
[[package]]
name = "typescript-type-def-derive"
-version = "0.5.6"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10a4f5dd87c279f90beef31edb7055bfd1ceb66e73148de107a5c9005e9f864"
+checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69"
dependencies = [
"darling 0.13.4",
"ident_case",
@@ -5229,19 +5190,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.10"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-linebreak"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
-dependencies = [
- "hashbrown 0.12.3",
- "regex",
-]
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
[[package]]
name = "unicode-normalization"
@@ -5260,9 +5217,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "unicode-xid"
@@ -5277,13 +5234,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
-name = "url"
-version = "2.4.0"
+name = "untrusted"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
dependencies = [
"form_urlencoded",
- "idna 0.4.0",
+ "idna",
"percent-encoding",
]
@@ -5301,9 +5264,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
dependencies = [
"getrandom 0.2.10",
"serde",
@@ -5329,15 +5292,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "waker-fn"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
[[package]]
name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
dependencies = [
"same-file",
"winapi-util",
@@ -5391,7 +5354,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
"wasm-bindgen-shared",
]
@@ -5425,7 +5388,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -5446,16 +5409,6 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
[[package]]
name = "weezl"
version = "0.1.7"
@@ -5496,9 +5449,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
dependencies = [
"winapi",
]
@@ -5523,21 +5476,12 @@ dependencies = [
]
[[package]]
-name = "windows"
-version = "0.48.0"
+name = "windows-core"
+version = "0.51.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
dependencies = [
- "windows-targets 0.48.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.1",
+ "windows-targets",
]
[[package]]
@@ -5546,50 +5490,29 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets 0.48.1",
+ "windows-targets",
]
[[package]]
name = "windows-targets"
-version = "0.42.1"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.48.5",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_msvc"
@@ -5599,15 +5522,9 @@ checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_i686_gnu"
@@ -5617,15 +5534,9 @@ checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_msvc"
@@ -5635,15 +5546,9 @@ checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_x86_64_gnu"
@@ -5653,27 +5558,15 @@ checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_msvc"
@@ -5683,34 +5576,19 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winnow"
-version = "0.4.7"
+version = "0.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
dependencies = [
"memchr",
]
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "winreg"
version = "0.50.0"
@@ -5718,17 +5596,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
dependencies = [
"cfg-if",
- "windows-sys 0.48.0",
+ "windows-sys",
]
[[package]]
name = "x25519-dalek"
-version = "2.0.0-pre.1"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
+checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
dependencies = [
- "curve25519-dalek 3.2.0",
+ "curve25519-dalek 4.1.1",
"rand_core 0.6.4",
+ "serde",
"zeroize",
]
@@ -5747,7 +5626,7 @@ dependencies = [
"oid-registry",
"rusticata-macros",
"thiserror",
- "time 0.3.22",
+ "time 0.3.30",
]
[[package]]
@@ -5771,17 +5650,17 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
dependencies = [
- "time 0.3.22",
+ "time 0.3.30",
]
[[package]]
name = "yerpc"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96"
+checksum = "75b5547af776328f66a5476ea3b7c0789e6fed164eb32d1a2122cfb39ffa505d"
dependencies = [
"anyhow",
- "async-channel",
+ "async-channel 1.9.0",
"async-mutex",
"async-trait",
"axum",
@@ -5799,9 +5678,9 @@ dependencies = [
[[package]]
name = "yerpc_derive"
-version = "0.5.0"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94"
+checksum = "f321bb5f728fb066af06c5a994e4375f1f8b054ee6d650766f0bd68dfa4faefe"
dependencies = [
"convert_case 0.5.0",
"darling 0.14.4",
@@ -5810,6 +5689,26 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "zerocopy"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
[[package]]
name = "zeroize"
version = "1.6.0"
@@ -5827,5 +5726,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.23",
+ "syn 2.0.38",
]
diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix
index 7a395a9866d4..092a235d9fd7 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, cargo
, cmake
+, deltachat-repl
, openssl
, perl
, pkg-config
@@ -17,30 +18,32 @@
, libiconv
}:
-stdenv.mkDerivation rec {
+let
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU=";
+ "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
+ "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo=";
+ "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
+ };
+ };
+in stdenv.mkDerivation rec {
pname = "libdeltachat";
- version = "1.121.0";
+ version = "1.128.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = "v${version}";
- hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA=";
+ hash = "sha256-kujPkKKobn4/J0rCdZfnlNZzGM0SUVtOWOhyDawYiqw=";
};
patches = [
./no-static-lib.patch
];
- cargoDeps = rustPlatform.importCargoLock {
- lockFile = ./Cargo.lock;
- outputHashes = {
- "email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY=";
- "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
- "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
- "quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg=";
- };
- };
+ cargoDeps = rustPlatform.importCargoLock cargoLock;
nativeBuildInputs = [
cmake
@@ -67,8 +70,12 @@ stdenv.mkDerivation rec {
cargoCheckHook
];
- passthru.tests = {
- python = python3.pkgs.deltachat;
+ passthru = {
+ inherit cargoLock;
+ tests = {
+ inherit deltachat-repl;
+ python = python3.pkgs.deltachat;
+ };
};
meta = with lib; {
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 26a80e85f490..a5f914b39a95 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgpiod";
- version = "2.0.2";
+ version = "2.1";
src = fetchurl {
url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
- hash = "sha256-NTLh26/9wsWWWnYaB1DyaR7kmq0nPdu9k6z2pyextlw=";
+ hash = "sha256-/W7UssZ0/mzDtIGID2zeHup54pbpWhObhUAequpt4/w=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix
index 65ba691e1205..cb5aa49ec612 100644
--- a/pkgs/development/libraries/nng/default.nix
+++ b/pkgs/development/libraries/nng/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "nanomsg";
repo = "nng";
- rev = "8e1836f57e8bcdb228dd5baadc71dfbf30b544e0";
- sha256 = "sha256-Q08/Oxv9DLCHp7Hf3NqNa0sHq7qwM6TfGT8gNyiwin8=";
+ rev = "a54820ff0e1b74554c7f649e8386ee8c4ecd98f5";
+ sha256 = "sha256-4Vj8nf3c45Y8LJ79YUOrNAAGMmfygdPtAJrs+JuFiUM=";
};
nativeBuildInputs = [ cmake ninja ]
diff --git a/pkgs/development/libraries/numcpp/default.nix b/pkgs/development/libraries/numcpp/default.nix
index 858c1f3c9922..6b0b0304d423 100644
--- a/pkgs/development/libraries/numcpp/default.nix
+++ b/pkgs/development/libraries/numcpp/default.nix
@@ -9,13 +9,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "numcpp";
- version = "2.12.0";
+ version = "2.12.1";
src = fetchFromGitHub {
owner = "dpilger26";
repo = "NumCpp";
rev = "Version_${finalAttrs.version}";
- hash = "sha256-HeT2zZbULXZhmgquQTl3qHL0T50IIUf3oAZaEDIcAys=";
+ hash = "sha256-1LGyDvT+PiGRXn7NorcYUjSPzNuRv/YXhQWIaOa7xdo=";
};
nativeCheckInputs = [gtest python3];
diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix
index 96fe45ddc2e1..dbbd5c86b96d 100644
--- a/pkgs/development/libraries/podofo/0.10.x.nix
+++ b/pkgs/development/libraries/podofo/0.10.x.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "podofo";
- version = "0.10.1";
+ version = "0.10.2";
src = fetchFromGitHub {
owner = "podofo";
repo = "podofo";
rev = finalAttrs.version;
- hash = "sha256-Y5dpx0otX14Jig/O/oq+Sfdcia1a0bhT/6k8nwg+k5o=";
+ hash = "sha256-BHTfidLn738f9kVIgzRTR4vY6fx5JPPtYNKvD7klyGw=";
};
outputs = [ "out" "dev" "lib" ];
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 8a859af37e9d..df60188800ab 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -313,7 +313,9 @@ let
qmake = callPackage ({ qtbase }: makeSetupHook {
name = "qmake-hook";
- propagatedBuildInputs = [ qtbase.dev ];
+ ${if stdenv.buildPlatform == stdenv.hostPlatform
+ then "propagatedBuildInputs"
+ else "depsTargetTargetPropagated"} = [ qtbase.dev ];
substitutions = {
inherit debug;
fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
@@ -338,6 +340,12 @@ let
});
finalScope = baseScope.overrideScope(final: prev: {
- qttranslations = bootstrapScope.qttranslations;
+ # qttranslations causes eval-time infinite recursion when
+ # cross-compiling; disabled for now.
+ qttranslations =
+ if stdenv.buildPlatform == stdenv.hostPlatform
+ then bootstrapScope.qttranslations
+ else null;
+ qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { };
});
in finalScope
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 9f0feaf94e58..67e9bd5440d1 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -29,13 +29,18 @@
, developerBuild ? false
, decryptSslTraffic ? false
, testers
+, buildPackages
}:
let
debugSymbols = debug || developerBuild;
+ qtPlatformCross = plat: with plat;
+ if isLinux
+ then "linux-generic-g++"
+ else throw "Please add a qtPlatformCross entry for ${plat.config}";
in
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: ({
pname = "qtbase";
inherit qtCompatVersion src version;
debug = debugSymbols;
@@ -83,6 +88,13 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ]
++ lib.optionals stdenv.isDarwin [ xcbuild ];
+ } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
+ # `qtbase` expects to find `cc` (with no prefix) in the
+ # `$PATH`, so the following is needed even if
+ # `stdenv.buildPlatform.canExecute stdenv.hostPlatform`
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ } // {
+
propagatedNativeBuildInputs = [ lndir ];
# libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked
@@ -162,6 +174,13 @@ stdenv.mkDerivation (finalAttrs: {
export MAKEFLAGS+=" -j$NIX_BUILD_CORES"
./bin/syncqt.pl -version $version
+ '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ # QT's configure script will refuse to use pkg-config unless these two environment variables are set
+ export PKG_CONFIG_SYSROOT_DIR=/
+ export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib
+ echo "QMAKE_LFLAGS=''${LDFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
+ echo "QMAKE_CFLAGS=''${CFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
+ echo "QMAKE_CXXFLAGS=''${CXXFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf
'';
postConfigure = ''
@@ -186,21 +205,34 @@ stdenv.mkDerivation (finalAttrs: {
done
'';
- env.NIX_CFLAGS_COMPILE = toString ([
- "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
- ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
- ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
- ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
- ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
+ env = {
+ NIX_CFLAGS_COMPILE = toString ([
+ "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ "-Wno-warn=free-nonheap-object"
+ "-Wno-free-nonheap-object"
+ "-w"
+ ] ++ [
+ ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
+ ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"''
+ ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
+ ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
++ lib.optional stdenv.isLinux "-DUSE_X11"
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
# ignore "is only available on macOS 10.12.2 or newer" in obj-c code
"-Wno-error=unguarded-availability"
]
++ lib.optionals withGtk3 [
- ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
- ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
- ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC");
+ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
+ ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
+ ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC");
+ } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
+ NIX_CFLAGS_COMPILE_FOR_BUILD = toString ([
+ "-Wno-warn=free-nonheap-object"
+ "-Wno-free-nonheap-object"
+ "-w"
+ ]);
+ };
prefixKey = "-prefix ";
@@ -209,6 +241,9 @@ stdenv.mkDerivation (finalAttrs: {
# To prevent these failures, we need to override PostgreSQL detection.
PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
+ } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
+ configurePlatforms = [ ];
+ } // {
# TODO Remove obsolete and useless flags once the build will be totally mastered
configureFlags = [
"-plugindir $(out)/$(qtPluginPrefix)"
@@ -235,11 +270,16 @@ stdenv.mkDerivation (finalAttrs: {
"-L" "${icu.out}/lib"
"-I" "${icu.dev}/include"
"-pch"
+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "-device ${qtPlatformCross stdenv.hostPlatform}"
+ "-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}"
]
++ lib.optional debugSymbols "-debug"
++ lib.optionals developerBuild [
"-developer-build"
"-no-warnings-are-errors"
+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ "-no-warnings-are-errors"
] ++ (if (!stdenv.hostPlatform.isx86_64) then [
"-no-sse2"
] else [
@@ -381,4 +421,4 @@ stdenv.mkDerivation (finalAttrs: {
platforms = platforms.unix;
};
-})
+}))
diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
index 892498da43b2..f4249b7f9505 100644
--- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
@@ -1,4 +1,6 @@
-{ qtModule, lib, python3, qtbase, qtsvg }:
+{ lib
+, stdenv
+, qtModule, python3, qtbase, qtsvg }:
qtModule {
pname = "qtdeclarative";
diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
index f099fc6799b5..4775bb0b0383 100644
--- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
@@ -1,4 +1,6 @@
-{ qtModule
+{ lib
+, stdenv
+, qtModule
, qtbase
, libwebp
, jasper
@@ -8,5 +10,11 @@
qtModule {
pname = "qtimageformats";
- propagatedBuildInputs = [ qtbase libwebp jasper libmng libtiff ];
+ propagatedBuildInputs = [
+ qtbase libwebp
+ ] ++ lib.optionals (!jasper.meta.broken) [
+ jasper
+ ] ++ [
+ libmng libtiff
+ ];
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix b/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
index 118a5d4f96f6..e7d6be534409 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix
@@ -1,7 +1,12 @@
-{ qtModule, qtbase, qtdeclarative }:
+{ lib
+, stdenv
+, qtModule
+, qtbase
+, qtdeclarative
+}:
qtModule {
pname = "qtwebchannel";
propagatedBuildInputs = [ qtbase qtdeclarative ];
- outputs = [ "out" "dev" "bin" ];
+ outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "bin" ];
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 777430af0217..58f90763a245 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -1,8 +1,11 @@
{ qtModule
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
-, bison, flex, git, gperf, ninja, pkg-config, python, which
+, bison, flex, git, gperf, ninja, pkg-config, python, which, python3
, nodejs, qtbase, perl
+, buildPackages
+, pkgsBuildTarget
+, pkgsBuildBuild
, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
, fontconfig, freetype, harfbuzz, icu, dbus, libdrm
@@ -27,12 +30,45 @@
, pipewireSupport ? stdenv.isLinux
, pipewire_0_2
, postPatch ? ""
+, nspr
+, lndir
+, dbusSupport ? !stdenv.isDarwin, expat
}:
-qtModule {
+let
+ # qtwebengine expects to find an executable in $PATH which runs on
+ # the build platform yet knows about the host `.pc` files. Most
+ # configury allows setting $PKG_CONFIG to point to an
+ # arbitrarily-named script which serves this purpose; however QT
+ # insists that it is named `pkg-config` with no target prefix. So
+ # we re-wrap the host platform's pkg-config.
+ pkg-config-wrapped-without-prefix = stdenv.mkDerivation {
+ name = "pkg-config-wrapper-without-target-prefix";
+ dontUnpack = true;
+ dontBuild = true;
+ installPhase = ''
+ mkdir -p $out/bin
+ ln -s '${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' $out/bin/pkg-config
+ '';
+ };
+
+ qtPlatformCross = plat: with plat;
+ if isLinux
+ then "linux-generic-g++"
+ else throw "Please add a qtPlatformCross entry for ${plat.config}";
+
+in
+
+qtModule ({
pname = "qtwebengine";
nativeBuildInputs = [
bison flex git gperf ninja pkg-config python which gn nodejs
+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ perl
+ lndir (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase)
+ pkgsBuildBuild.pkg-config
+ (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols)
+ pkg-config-wrapped-without-prefix
] ++ lib.optional stdenv.isDarwin xcbuild;
doCheck = true;
outputs = [ "bin" "dev" "out" ];
@@ -108,16 +144,25 @@ qtModule {
--replace "-Wl,-fatal_warnings" ""
'') + postPatch;
- env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
- # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
- "-Wno-class-memaccess"
- ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
- # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
- # TODO: investigate and fix properly
- "-march=westmere"
- ] ++ lib.optionals stdenv.cc.isClang [
- "-Wno-elaborated-enum-base"
- ]);
+ env = {
+ NIX_CFLAGS_COMPILE =
+ toString (
+ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ "-w "
+ ] ++ lib.optionals stdenv.cc.isGNU [
+ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
+ "-Wno-class-memaccess"
+ ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [
+ # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
+ # TODO: investigate and fix properly
+ "-march=westmere"
+ ] ++ lib.optionals stdenv.cc.isClang [
+ "-Wno-elaborated-enum-base"
+ ]);
+ } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
+ NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch";
+ "NIX_CFLAGS_LINK_${buildPackages.stdenv.cc.suffixSalt}" = "-Wl,--no-warn-search-mismatch";
+ };
preConfigure = ''
export NINJAFLAGS=-j$NIX_BUILD_CORES
@@ -125,10 +170,15 @@ qtModule {
if [ -d "$PWD/tools/qmake" ]; then
QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
fi
+ '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ export QMAKE_CC=$CC
+ export QMAKE_CXX=$CXX
+ export QMAKE_LINK=$CXX
+ export QMAKE_AR=$AR
'';
qmakeFlags = [ "--" "-system-ffmpeg" ]
- ++ lib.optional pipewireSupport "-webengine-webrtc-pipewire"
+ ++ lib.optional (pipewireSupport && stdenv.buildPlatform == stdenv.hostPlatform) "-webengine-webrtc-pipewire"
++ lib.optional enableProprietaryCodecs "-proprietary-codecs";
propagatedBuildInputs = [
@@ -226,7 +276,9 @@ qtModule {
dontUseNinjaBuild = true;
dontUseNinjaInstall = true;
- postInstall = lib.optionalString stdenv.isLinux ''
+ postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+ mkdir -p $out/libexec
+ '' + lib.optionalString stdenv.isLinux ''
cat > $out/libexec/qt.conf <=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py
- '';
-
__darwinAllowLocalNetworking = true;
preCheck = ''
diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 31febd203db8..ab54e9e5adea 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "msal";
- version = "1.24.0";
+ version = "1.24.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-fS7NrUGl9zuyuBPzBhpM9HySRiEQWo7RN1hvy52Pgn4=";
+ hash = "sha256-qglyiEs8b97FPZoL0VwS5b17cawbZtdG9U0Shwnz+Pg=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix
index 2742f9aab8bf..5b22a878c77f 100644
--- a/pkgs/development/python-modules/optimum/default.nix
+++ b/pkgs/development/python-modules/optimum/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "optimum";
- version = "1.13.1";
+ version = "1.13.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "optimum";
rev = "refs/tags/v${version}";
- hash = "sha256-heTyGgHC9tfS0hFv83sdxVApcXa63GQLG9Nwgi30GFo=";
+ hash = "sha256-4bKQcltUr7q8wHfiRXQcK5dw0TrnMr9/bTNXeOyg7oA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix
index 5f1686902798..b09442627d4b 100644
--- a/pkgs/development/python-modules/parsedmarc/default.nix
+++ b/pkgs/development/python-modules/parsedmarc/default.nix
@@ -1,5 +1,6 @@
{ lib
, azure-identity
+, azure-monitor-ingestion
, boto3
, buildPythonPackage
, dateparser
@@ -59,6 +60,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
azure-identity
+ azure-monitor-ingestion
boto3
dateparser
dnspython
@@ -98,6 +100,7 @@ buildPythonPackage rec {
changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}";
description = "Python module and CLI utility for parsing DMARC reports";
homepage = "https://domainaware.github.io/parsedmarc/";
+ mainProgram = "parsedmarc";
maintainers = with maintainers; [ talyz ];
license = licenses.asl20;
};
diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix
index d6a4531312fa..de19d37c54e7 100644
--- a/pkgs/development/python-modules/peft/default.nix
+++ b/pkgs/development/python-modules/peft/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "peft";
- version = "0.5.0";
+ version = "0.6.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-FaD873ksim7ewOI6Wqcv+GuPmH45+yAvbJC1H/DSfI8=";
+ hash = "sha256-XF7hjPuPoTioVIoiFhaMeyFYjHXmMwPVuJYDrCMUZwo=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/proxy_tools/default.nix b/pkgs/development/python-modules/proxy-tools/default.nix
similarity index 78%
rename from pkgs/development/python-modules/proxy_tools/default.nix
rename to pkgs/development/python-modules/proxy-tools/default.nix
index 03f3f92f9da9..beb91a433388 100644
--- a/pkgs/development/python-modules/proxy_tools/default.nix
+++ b/pkgs/development/python-modules/proxy-tools/default.nix
@@ -1,17 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
+, setuptools
}:
buildPythonPackage rec {
- pname = "proxy_tools";
+ pname = "proxy-tools";
version = "0.1.0";
+ pyproject = true;
src = fetchPypi {
- inherit pname version;
+ pname = "proxy_tools";
+ inherit version;
hash = "sha256-zLN1H1KcBH4tilhEDYayBTA88P6BRveE0cvNlPCigBA=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
# no tests in pypi
doCheck = false;
pythonImportsCheck = [ "proxy_tools" ];
diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix
index 2ef7b55d0d39..090883bad3d9 100644
--- a/pkgs/development/python-modules/py-nextbusnext/default.nix
+++ b/pkgs/development/python-modules/py-nextbusnext/default.nix
@@ -3,12 +3,13 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
pname = "py-nextbusnext";
- version = "1.0.1";
- format = "setuptools";
+ version = "1.0.2";
+ pyproject = true;
disabled = pythonOlder "3.8";
@@ -16,9 +17,13 @@ buildPythonPackage rec {
owner = "ViViDboarder";
repo = "py_nextbus";
rev = "refs/tags/v${version}";
- hash = "sha256-iJPbRhXgA1AIkyf3zGZ9tuFAw8h6oyBbh7Ln/y72fyQ=";
+ hash = "sha256-5zD8AKb4/4x4cVA922OlzSOXlg3F6QCcr16agEQkUWM=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
nativeCheckInputs = [
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 12d2ea182af0..c514b9f83584 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -12,6 +12,7 @@
, pyqt5_sip
, pyqt-builder
, libsForQt5
+, enableVerbose ? true
, withConnectivity ? false
, withMultimedia ? false
, withWebKit ? false
@@ -19,6 +20,9 @@
, withLocation ? false
, withSerialPort ? false
, withTools ? false
+, pkgsBuildTarget
+, buildPackages
+, dbusSupport ? !stdenv.isDarwin
}:
buildPythonPackage rec {
@@ -45,6 +49,7 @@ buildPythonPackage rec {
# be more verbose
''
cat >> pyproject.toml < PyQt_PrintDialog
+ # QT_NO_PRINTER => PyQt_Printer
+ # QT_NO_PRINTPREVIEWDIALOG => PyQt_PrintPreviewDialog
+ # QT_NO_PRINTPREVIEWWIDGET => PyQt_PrintPreviewWidget
+ # QT_NO_SSL => PyQt_SSL
+ # QT_SHARED || QT_DLL => shared (otherwise static)
+ # QT_NO_PROCESS => PyQt_Process
+ # QT_NO_FPU || Q_PROCESSOR_ARM || Q_OS_WINCE => PyQt_qreal_double
+ # sizeof (qreal) != sizeof (double) => PyQt_qreal_double
+ # !Q_COMPILER_CONSTEXPR !Q_COMPILER_UNIFORM_INIT => PyQt_CONSTEXPR
+ # QT_NO_ACCESSIBILITY => PyQt_Accessibility
+ # QT_NO_OPENGL => PyQt_OpenGL PyQt_Desktop_OpenGL
+ # defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_ES_3) => PyQt_Desktop_OpenGL
+ # QT_NO_RAWFONT => PyQt_RawFont
+ # QT_NO_SESSIONMANAGER => PyQt_SessionManager
+ #
+ + lib.optionalString (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) ''
+ rm config-tests/cfgtest_QtCore.cpp
+ rm config-tests/cfgtest_QtGui.cpp
+ rm config-tests/cfgtest_QtNetwork.cpp
+ rm config-tests/cfgtest_QtPrintSupport.cpp
'';
enableParallelBuilding = true;
@@ -68,16 +104,27 @@ buildPythonPackage rec {
export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"
'';
+ # tons of warnings from subpackages, no point in playing whack-a-mole
+ env = lib.optionalAttrs (!enableVerbose) {
+ NIX_CFLAGS_COMPILE = "-w";
+ };
+
outputs = [ "out" "dev" ];
dontWrapQtApps = true;
- nativeBuildInputs = with libsForQt5; [
+ nativeBuildInputs = [
pkg-config
- qmake
+ ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
+ libsForQt5.qmake
+ ] ++ [
setuptools
lndir
sip
+ ] ++ (with pkgsBuildTarget.targetPackages.libsForQt5; [
+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ qmake
+ ] ++ [
qtbase
qtsvg
qtdeclarative
@@ -90,11 +137,13 @@ buildPythonPackage rec {
++ lib.optional withLocation qtlocation
++ lib.optional withSerialPort qtserialport
++ lib.optional withTools qttools
- ;
+ );
buildInputs = with libsForQt5; [
dbus
+ ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
qtbase
+ ] ++ [
qtsvg
qtdeclarative
pyqt-builder
diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
index 7ad39633b7e5..71abe839a789 100644
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -1,13 +1,14 @@
{ lib, stdenv, pythonPackages, fetchPypi, pkg-config
-, qmake, qtbase, qtsvg, qtwebengine
+, qmake, qtbase, qtsvg, qtwebengine, qtwebchannel, qtdeclarative
, wrapQtAppsHook
, darwin
+, buildPackages
}:
let
inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 sip pyqt-builder;
inherit (darwin) autoSignDarwinBinariesHook;
-in buildPythonPackage rec {
+in buildPythonPackage (rec {
pname = "PyQtWebEngine";
version = "5.15.4";
format = "pyproject";
@@ -29,12 +30,18 @@ in buildPythonPackage rec {
nativeBuildInputs = [
pkg-config
qmake
+ ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
sip
+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ buildPackages.python3Packages.sip
+ ] ++ [
qtbase
qtsvg
qtwebengine
pyqt-builder
pythonPackages.setuptools
+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ qtdeclarative
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoSignDarwinBinariesHook
];
@@ -44,6 +51,9 @@ in buildPythonPackage rec {
qtbase
qtsvg
qtwebengine
+ ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ qtwebchannel
+ qtdeclarative
];
propagatedBuildInputs = [ pyqt5 ];
@@ -71,6 +81,13 @@ in buildPythonPackage rec {
description = "Python bindings for Qt5";
homepage = "http://www.riverbankcomputing.co.uk";
license = licenses.gpl3;
- platforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms;
+ hydraPlatforms = lib.lists.intersectLists qtwebengine.meta.platforms platforms.mesaPlatforms;
};
-}
+} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
+ # TODO: figure out why the env hooks aren't adding these inclusions automatically
+ env.NIX_CFLAGS_COMPILE =
+ lib.concatStringsSep " " [
+ "-I${lib.getDev qtbase}/include/QtPrintSupport/"
+ "-I${lib.getDev qtwebchannel}/include/QtWebChannel/"
+ ];
+})
diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix
index 418ce7c7928a..4f65f7edcb2f 100644
--- a/pkgs/development/python-modules/python-smarttub/default.nix
+++ b/pkgs/development/python-modules/python-smarttub/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "python-smarttub";
- version = "0.0.34";
+ version = "0.0.35";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mdz";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-PFlVxSxGcbqvA1cQZkKLtrmg+Dere4B1VCUzIU8RaI8=";
+ hash = "sha256-8Z4wZRJJV4TED6foM2Db+Ghl+EHrfGXoXZm3KsNh8OQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index 246f1ae55d2c..9db835f1d547 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -4,7 +4,7 @@
, setuptools-scm
, bottle
, importlib-resources
-, proxy_tools
+, proxy-tools
, pygobject3
, pyqtwebengine
, pytest
@@ -37,7 +37,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
bottle
pyqtwebengine
- proxy_tools
+ proxy-tools
six
] ++ lib.optionals (pythonOlder "3.7") [
importlib-resources
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 02cdcbed68cd..e0f393ff6134 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -8,7 +8,7 @@
, click-plugins
, cligj
, certifi
-, cython
+, cython_3
, fetchFromGitHub
, gdal
, hypothesis
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "rasterio";
- version = "1.3.8";
+ version = "1.3.9";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -37,11 +37,11 @@ buildPythonPackage rec {
owner = "rasterio";
repo = "rasterio";
rev = "refs/tags/${version}";
- hash = "sha256-8kPzUvTZ/jRDXlYMAZkG1xdLAQuzxnvHXBzwWizMOTo=";
+ hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4=";
};
nativeBuildInputs = [
- cython
+ cython_3
gdal
numpy
oldest-supported-numpy
diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index f773c33307ae..5b4e8eb6bd3e 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
- version = "0.7.12";
+ version = "0.7.14";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
- hash = "sha256-molHdZ51irWEE3OHywP5n0bCClK8z67JGiYRwvHAOxs=";
+ hash = "sha256-fF/IwhHCTqi5eSRgfcUARWAqQ7jJ4nRpcWWOMx7IxLY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/segno/default.nix b/pkgs/development/python-modules/segno/default.nix
index 12aa23e95dd1..3e7bb0816448 100644
--- a/pkgs/development/python-modules/segno/default.nix
+++ b/pkgs/development/python-modules/segno/default.nix
@@ -1,6 +1,11 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+
+# build-system
+, setuptools
+
+# tests
, pytestCheckHook
, pypng
, pyzbar
@@ -8,24 +13,32 @@
buildPythonPackage rec {
pname = "segno";
- version = "1.5.2";
+ version = "1.5.3";
+ pyproject = true;
src = fetchFromGitHub {
owner = "heuer";
repo = "segno";
rev = version;
- hash = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo=";
+ hash = "sha256-j7DUCeMoYziu19WfJu/9YiIMa2ysOPYfqW8AMcE5LaU=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
nativeCheckInputs = [
pytestCheckHook
pypng
pyzbar
];
- pythonImportsCheck = [ "segno" ];
+ pythonImportsCheck = [
+ "segno"
+ ];
meta = with lib; {
+ changelog = "https://github.com/heuer/segno/releases/tag/${version}";
description = "QR Code and Micro QR Code encoder";
homepage = "https://github.com/heuer/segno/";
license = licenses.bsd3;
diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix
index d1c85407fdd6..98132c9f17d3 100644
--- a/pkgs/development/python-modules/spectral-cube/default.nix
+++ b/pkgs/development/python-modules/spectral-cube/default.nix
@@ -2,7 +2,6 @@
, stdenv
, aplpy
, astropy
-, astropy-helpers
, buildPythonPackage
, casa-formats-io
, dask
@@ -17,14 +16,14 @@
buildPythonPackage rec {
pname = "spectral-cube";
- version = "0.6.2";
+ version = "0.6.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-0Fr9PvUShi04z8SUsZE7zHuXZWg4rxt6gwSBb6lr2Pc=";
+ hash = "sha256-7wfvsravSkAGkTtuPE01wPW7wEHKVWT8kYQn93Q2B4M=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -47,6 +46,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ # Tests must be run in the build directory.
+ preCheck = ''
+ cd build/lib
+ '';
+
# On x86_darwin, this test fails with "Fatal Python error: Aborted"
# when sandbox = true.
disabledTestPaths = lib.optionals stdenv.isDarwin [
@@ -63,7 +67,5 @@ buildPythonPackage rec {
changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ smaret ];
- # Tests fail to start, according to Hydra
- broken = true;
};
}
diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix
index 281bcdb74528..92cc4ea62784 100644
--- a/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "sqlite-utils";
- version = "3.35.1";
+ version = "3.35.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-4PA+aXawW9t6XFZFSXGg6YD8Ftv9NRK7073KxPDkNw4=";
+ hash = "sha256-WQsUrSd5FMs/x9XiVHZIR/rNqqI8e6/YXsk4dPb0IUM=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index ada6db7af867..fc944620e459 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "timm";
- version = "0.9.9";
+ version = "0.9.10";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "pytorch-image-models";
rev = "refs/tags/v${version}";
- hash = "sha256-mJzKDRc7husSpunlu12gnx9WErI6oEcEyCtrpkKbPBs=";
+ hash = "sha256-PyrJhyJmuF7BZzlQ4f5fiJY5fYFC1JPRLto5ljPVbY4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
index acbc2f28b081..4b8312257592 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -44,11 +44,34 @@ buildPythonPackage rec {
"tweepy"
];
+ # The checks with streaming fail due to (seemingly) not decoding (or unexpectedly sending response in) GZIP
+ # Same issue impacted mastodon-py, see https://github.com/halcy/Mastodon.py/commit/cd86887d88bbc07de462d1e00a8fbc3d956c0151 (who just disabled these)
+ disabledTestPaths = [
+ "tests/test_client.py"
+ ];
+
+ disabledTests = [
+ "test_indicate_direct_message_typing"
+ "testcachedifferentqueryparameters"
+ "testcachedresult"
+ "testcreatedestroyblock"
+ "testcreatedestroyfriendship"
+ "testcreateupdatedestroylist"
+ "testgetfollowerids"
+ "testgetfollowers"
+ "testgetfriendids"
+ "testgetfriends"
+ "testgetuser"
+ "testcursorcursoritems"
+ "testcursorcursorpages"
+ "testcursornext"
+ ];
+
meta = with lib; {
description = "Twitter library for Python";
homepage = "https://github.com/tweepy/tweepy";
changelog = "https://github.com/tweepy/tweepy/releases/tag/v${version}";
license = licenses.mit;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ marius851000 ];
};
}
diff --git a/pkgs/development/python-modules/vega-datasets/default.nix b/pkgs/development/python-modules/vega-datasets/default.nix
new file mode 100644
index 000000000000..e0c9133767fc
--- /dev/null
+++ b/pkgs/development/python-modules/vega-datasets/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, pandas
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "vega-datasets";
+ version = "0.9.0";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "vega_datasets";
+ inherit version;
+ hash = "sha256-nb6YNCCOjsMqtElw3zFd6RAoYeTNoT2OFDqreoDZP8A=";
+ };
+
+ nativeBuildInputs = [
+ setuptools
+ ];
+
+ propagatedBuildInputs = [ pandas ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ pytestFlagsArray = [
+ "--doctest-modules"
+ ];
+
+ pythonImportsCheck = [
+ "vega_datasets"
+ ];
+
+ meta = with lib; let
+ tag = removeSuffix ".0" "v${version}";
+ in {
+ description = "A Python package for offline access to vega datasets";
+ homepage = "https://github.com/altair-viz/vega_datasets";
+ changelog = "https://github.com/altair-viz/vega_datasets/blob/${tag}/CHANGES.md";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix
deleted file mode 100644
index 629f5407437c..000000000000
--- a/pkgs/development/python-modules/vega_datasets/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, pandas, pytest }:
-
-buildPythonPackage rec {
- pname = "vega_datasets";
- version = "0.9.0";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "9dbe9834208e8ec32ab44970df315de9102861e4cda13d8e143aab7a80d93fc0";
- };
-
- propagatedBuildInputs = [ pandas ];
-
- nativeCheckInputs = [ pytest ];
-
- checkPhase = ''
- py.test vega_datasets --doctest-modules -k 'not column_names'
- '';
-
- meta = with lib; {
- description = "A Python package for offline access to vega datasets";
- homepage = "https://github.com/altair-viz/vega_datasets";
- license = licenses.mit;
- };
-}
diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix
index 200f4f68ebef..47e9c7b7a3c7 100644
--- a/pkgs/development/python-modules/vine/default.nix
+++ b/pkgs/development/python-modules/vine/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "vine";
- version = "5.0.0";
+ version = "5.1.0";
format = "setuptools";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-fTsWJKlT2oLvY0YgE7vScdPrdXUUifmAdZjo80C9Y34=";
+ hash = "sha256-i2LpgdNcQQSSEc9ioKEkLYwe6b0Vuxls44rv1nmeYeA=";
};
nativeCheckInputs = [
@@ -30,6 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python promises";
homepage = "https://github.com/celery/vine";
+ changelog = "https://github.com/celery/vine/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/wand/default.nix b/pkgs/development/python-modules/wand/default.nix
index 3f55ec7f47ef..8436ee9b8c05 100644
--- a/pkgs/development/python-modules/wand/default.nix
+++ b/pkgs/development/python-modules/wand/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "wand";
- version = "0.6.11";
+ version = "0.6.13";
src = fetchPypi {
pname = "Wand";
inherit version;
- hash = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU=";
+ hash = "sha256-9QE0hOr3og6yLRghqu/mC1DMMpciNytfhWXUbUqq/Mo=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix
index a322c327b230..c991e5a5922c 100644
--- a/pkgs/development/python-modules/whodap/default.nix
+++ b/pkgs/development/python-modules/whodap/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "whodap";
- version = "0.1.10";
+ version = "0.1.11";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pogzyb";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-5XDTl8NPrYWs7gPTJRDVCiZN3cWQ53/ojhJivBPHUL0=";
+ hash = "sha256-IX4sxuOxH4rXZlpRiWncXvaB2TkfZl1rKioZ3eqDGHs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix
index 3fe03d993564..611536ded15d 100644
--- a/pkgs/development/python-modules/x-wr-timezone/default.nix
+++ b/pkgs/development/python-modules/x-wr-timezone/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "x-wr-timezone";
- version = "0.0.5";
+ version = "0.0.6";
format = "setuptools";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "niccokunzmann";
repo = "x-wr-timezone";
rev = "v${version}";
- hash = "sha256-vUhAq6b5I0gYbXmbElxSSL6Mu9BSLs0uT5gb8zXdmpg=";
+ hash = "sha256-9B1gXabpZsJSHYUHLu6bBGidO3C5m/I0oOc5U/mbX0I=";
};
propagatedBuildInputs = [
@@ -42,6 +42,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "x_wr_timezone" ];
meta = {
+ changelog = "https://github.com/niccokunzmann/x-wr-timezone/blob/${src.rev}/README.rst#changelog";
description = "Convert calendars using X-WR-TIMEZONE to standard ones";
homepage = "https://github.com/niccokunzmann/x-wr-timezone";
license = lib.licenses.lgpl3Plus;
diff --git a/pkgs/development/python-modules/x11-hash/default.nix b/pkgs/development/python-modules/x11-hash/default.nix
new file mode 100644
index 000000000000..403f1ed3e12f
--- /dev/null
+++ b/pkgs/development/python-modules/x11-hash/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ version = "1.4";
+ pname = "x11-hash";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "x11_hash";
+ inherit version;
+ hash = "sha256-QtzqxEzpVGK48/lvOEr8VtPUYexLdXKD3zGv1VOdWpw=";
+ };
+
+ nativeBuildInputs = [
+ setuptools
+ ];
+
+ # pypi's source doesn't include tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "x11_hash"
+ ];
+
+ meta = with lib; {
+ description = "Binding for X11 proof of work hashing";
+ homepage = "https://github.com/mazaclub/x11_hash";
+ license = licenses.mit;
+ maintainers = with maintainers; [ np ];
+ };
+}
diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix
deleted file mode 100644
index e9cfe3174327..000000000000
--- a/pkgs/development/python-modules/x11_hash/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
- version = "1.4";
- pname = "x11_hash";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22";
- };
-
- meta = with lib; {
- description = "Binding for X11 proof of work hashing";
- homepage = "https://github.com/mazaclub/x11_hash";
- license = licenses.mit;
- maintainers = with maintainers; [ np ];
- };
-
-}
diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix
index c730725581ac..cae85c51f4db 100644
--- a/pkgs/development/python-modules/yq/default.nix
+++ b/pkgs/development/python-modules/yq/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
- pytestCheckHook
+ pytestCheckHook
];
pytestFlagsArray = [ "test/test.py" ];
@@ -51,5 +51,6 @@ buildPythonPackage rec {
homepage = "https://github.com/kislyuk/yq";
license = licenses.asl20;
maintainers = with maintainers; [ womfoo SuperSandro2000 ];
+ mainProgram = "yq";
};
}
diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix
index c2ba3b7974dc..f6cd1d9a1f2b 100644
--- a/pkgs/development/tools/language-servers/pylyzer/default.nix
+++ b/pkgs/development/tools/language-servers/pylyzer/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
- version = "0.0.48";
+ version = "0.0.49";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "v${version}";
- hash = "sha256-NQvMOBjRIf7sQBff2iZe8MbnZiZZN0DTE+HBvxsvKpM=";
+ hash = "sha256-1BExqeIL6jaonJVB3aRYDDHRw7xdxHoouH5BlooJDW8=";
};
- cargoHash = "sha256-eDa3UKPgATJQLIkHpG/G50V20TW/5vwjRTfshHb3zTQ=";
+ cargoHash = "sha256-HBRczmEqqH+lMgnHeP/WpqHD05tkovJmR12hXwCrw8k=";
nativeBuildInputs = [
git
diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/development/tools/ls-lint/default.nix
index 9bbf37d57909..7a6ae03aea78 100644
--- a/pkgs/development/tools/ls-lint/default.nix
+++ b/pkgs/development/tools/ls-lint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ls-lint";
- version = "2.1.0";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "loeffel-io";
repo = "ls-lint";
rev = "v${version}";
- sha256 = "sha256-AlIXZ2tf1pFj6LVz8kyCFq0dUEPBm+0ejQH7VXm4H+M=";
+ sha256 = "sha256-twXaiPccc6DZdzKdvB+BzHbRuwgDy05C3jNg7Ur8yrA=";
};
- vendorHash = "sha256-/6Y20AvhUShaE1sNTccB62x8YkVLLjhl6fg5oY4gL4I=";
+ vendorHash = "sha256-uyNOcIjrICr76Q8izXGRMhofDcjQrzbB/ISHTqRY5fI=";
meta = with lib; {
description = "An extremely fast file and directory name linter";
diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index fadbe57a5690..4f483fd5f3b3 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "mold";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "rui314";
repo = "mold";
rev = "v${version}";
- hash = "sha256-SahpgmkeGVXqQebtw36IjFwHcbvi0JeiEWkNV3hk3lM=";
+ hash = "sha256-eX76LRzhAk2n96eMtvbnm4Id99jRCDo3gMlrr5hI3Nw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix
index d1902e88fb90..2f3c6ae76c79 100644
--- a/pkgs/development/tools/rust/cargo-outdated/default.nix
+++ b/pkgs/development/tools/rust/cargo-outdated/default.nix
@@ -6,6 +6,7 @@
, stdenv
, curl
, CoreFoundation
+, CoreServices
, Security
, SystemConfiguration
}:
@@ -26,6 +27,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
curl
CoreFoundation
+ CoreServices
Security
SystemConfiguration
];
diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/development/tools/smlfmt/default.nix
index 1475de94193d..2094cde2ffcb 100644
--- a/pkgs/development/tools/smlfmt/default.nix
+++ b/pkgs/development/tools/smlfmt/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "smlfmt";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "shwestrick";
repo = pname;
rev = "v${version}";
- hash = "sha256-7CTfMiEvuOena5SOE0qKpFPq6ARxmkE6d+loznZNbC0=";
+ hash = "sha256-qwhYOZrck028NliPDnqFZel3IxopQzouhHq6R7DkfPE=";
};
nativeBuildInputs = [ mlton ];
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 249be524add5..4ced81546ca9 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,26 +2,25 @@
buildGoModule rec {
pname = "flyctl";
- version = "0.1.104";
+ version = "0.1.117";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
- hash = "sha256-iTizgA3MtcG6YN7aHaZF4UXT6jBKodsMxXG61UgDNaQ=";
+ hash = "sha256-cB1t7TKAqHuzbvrXkOMJPXtNXTqNB/TBDS3OHYX96ko=";
};
- vendorHash = "sha256-5Nu9XpYjlZHGazWTK7LmfnEGgewKa017PLHtV9HycD0=";
+ vendorHash = "sha256-+mCOSgRmvfAXHwtLup3vYhLY0zTtXIJeOtYD69B4/7o=";
subPackages = [ "." ];
ldflags = [
"-s" "-w"
- "-X github.com/superfly/flyctl/internal/buildinfo.commit=${src.rev}"
"-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z"
- "-X github.com/superfly/flyctl/internal/buildinfo.environment=production"
- "-X github.com/superfly/flyctl/internal/buildinfo.version=${version}"
+ "-X github.com/superfly/flyctl/internal/buildinfo.buildVersion=${version}"
];
+ tags = ["production"];
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/games/doom-ports/gzdoom/default.nix
index b8d273c54357..768a4936d821 100644
--- a/pkgs/games/doom-ports/gzdoom/default.nix
+++ b/pkgs/games/doom-ports/gzdoom/default.nix
@@ -27,14 +27,14 @@
stdenv.mkDerivation rec {
pname = "gzdoom";
- version = "4.11.1";
+ version = "4.11.3";
src = fetchFromGitHub {
owner = "ZDoom";
repo = "gzdoom";
rev = "g${version}";
fetchSubmodules = true;
- hash = "sha256-7PWaqYK7pa6jgl92+a9dqQVVKuE/lvqtm+7p0nfMTNI=";
+ hash = "sha256-pY+5R3W/9pJGiBoDFkxxpuP0I2ZLb+Q/s5UYU20G748=";
};
outputs = [ "out" "doc" ];
diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix
index 19b44b280f85..f406cf187b43 100644
--- a/pkgs/games/heroic/fhsenv.nix
+++ b/pkgs/games/heroic/fhsenv.nix
@@ -96,6 +96,7 @@ buildFHSEnv {
libsoup
libtheora
libtiff
+ libunwind
libusb1
libv4l
libva
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index 78c669614c07..25287c89113b 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -169,6 +169,7 @@ in buildFHSEnv rec {
libcaca
libcanberra
libgcrypt
+ libunwind
libvpx
librsvg
xorg.libXft
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 013a35806267..b85e162efb72 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -122,7 +122,10 @@ stdenv.mkDerivation rec {
doCheck = false;
# don't build/install statically linked bin/gs
- buildFlags = [ "so" ];
+ buildFlags = [ "so" ]
+ # without -headerpad, the following error occurs on Darwin when compiling with X11 support (as of 10.02.0)
+ # error: install_name_tool: changing install names or rpaths can't be redone for: [...]libgs.dylib.10 (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)
+ ++ lib.optional (x11Support && stdenv.isDarwin) "LDFLAGS=-headerpad_max_install_names";
installTargets = [ "soinstall" ];
postInstall = ''
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 156952831346..54a5f6be0920 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -30,6 +30,16 @@ let
url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
hash = "sha256-a2pIWBwUq7D5W9h8GvTXQJIkBte4AQAqn5Ryf93gIdU=";
};
+
+ # Dependencies for the tools need to be included as either native or cross,
+ # depending on which we're building
+ toolsDeps = [
+ ncurses # tools/kwboot
+ libuuid # tools/mkeficapsule
+ gnutls # tools/mkeficapsule
+ openssl # tools/mkimage
+ ];
+
buildUBoot = lib.makeOverridable ({
version ? null
, src ? null
@@ -40,6 +50,7 @@ let
, extraPatches ? []
, extraMakeFlags ? []
, extraMeta ? {}
+ , crossTools ? false
, ... } @ args: stdenv.mkDerivation ({
pname = "uboot-${defconfig}";
@@ -53,7 +64,7 @@ let
postPatch = ''
patchShebangs tools
- patchShebangs arch/arm/mach-rockchip
+ patchShebangs scripts
'';
nativeBuildInputs = [
@@ -70,15 +81,9 @@ let
]))
swig
which # for scripts/dtc-version.sh
- ];
+ ] ++ lib.optionals (!crossTools) toolsDeps;
depsBuildBuild = [ buildPackages.stdenv.cc ];
-
- buildInputs = [
- ncurses # tools/kwboot
- libuuid # tools/mkeficapsule
- gnutls # tools/mkeficapsule
- openssl # tools
- ];
+ buildInputs = lib.optionals crossTools toolsDeps;
hardeningDisable = [ "all" ];
@@ -133,7 +138,9 @@ in {
hardeningDisable = [];
dontStrip = false;
extraMeta.platforms = lib.platforms.linux;
- extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
+
+ crossTools = true;
+ extraMakeFlags = [ "HOST_TOOLS_ALL=y" "NO_SDL=1" "cross_tools" ];
outputs = [ "out" "man" ];
@@ -183,6 +190,7 @@ in {
defconfig = "bananapi_m64_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ SCP = "/dev/null";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
@@ -190,7 +198,7 @@ in {
ubootClearfog = buildUBoot {
defconfig = "clearfog_defconfig";
extraMeta.platforms = ["armv7l-linux"];
- filesToInstall = ["u-boot-spl.kwb"];
+ filesToInstall = ["u-boot-with-spl.kwb"];
};
ubootCubieboard2 = buildUBoot {
@@ -341,6 +349,7 @@ in {
defconfig = "a64-olinuxino-emmc_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ SCP = "/dev/null";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
@@ -354,6 +363,7 @@ in {
defconfig = "orangepi_zero_plus2_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ SCP = "/dev/null";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
@@ -374,6 +384,7 @@ in {
defconfig = "orangepi_3_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinnerH6}/bl31.bin";
+ SCP = "/dev/null";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
@@ -387,6 +398,7 @@ in {
defconfig = "pine64_plus_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ SCP = "/dev/null";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
@@ -394,6 +406,7 @@ in {
defconfig = "pine64-lts_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ SCP = "/dev/null";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
@@ -401,6 +414,7 @@ in {
defconfig = "pinebook_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ SCP = "/dev/null";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
@@ -542,6 +556,7 @@ in {
defconfig = "sopine_baseboard_defconfig";
extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+ SCP = "/dev/null";
filesToInstall = ["u-boot-sunxi-with-spl.bin"];
};
diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix
index a44b87795936..aaf2e7bb60db 100644
--- a/pkgs/misc/vencord/default.nix
+++ b/pkgs/misc/vencord/default.nix
@@ -5,8 +5,8 @@
, buildWebExtension ? false
}:
let
- version = "1.6.2";
- gitHash = "dd61b0c";
+ version = "1.6.3";
+ gitHash = "86e9434";
in
buildNpmPackage rec {
pname = "vencord";
@@ -34,7 +34,7 @@ buildNpmPackage rec {
npmRebuildFlags = [ "|| true" ];
makeCacheWritable = true;
- npmDepsHash = "sha256-RzOv8LekJqX0C/AjC5ONkfkMK36bAGWFxyM9Akn1CIg=";
+ npmDepsHash = "sha256-i6hTMYyseoHnAGBezG5fdniBA9yXylCbAgAcjGH+wfM=";
npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json
index 6934811f65e2..3134090b3ff2 100644
--- a/pkgs/misc/vencord/package-lock.json
+++ b/pkgs/misc/vencord/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "vencord",
- "version": "1.6.2",
+ "version": "1.6.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "vencord",
- "version": "1.6.2",
+ "version": "1.6.3",
"license": "GPL-3.0-or-later",
"dependencies": {
"@sapphi-red/web-noise-suppressor": "0.3.3",
@@ -703,9 +703,9 @@
}
},
"node_modules/@eslint/eslintrc": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
- "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+ "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
"dev": true,
"dependencies": {
"ajv": "^6.12.4",
@@ -726,9 +726,9 @@
}
},
"node_modules/@eslint/js": {
- "version": "8.52.0",
- "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz",
- "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==",
+ "version": "8.53.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz",
+ "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -914,9 +914,9 @@
"dev": true
},
"node_modules/@types/react": {
- "version": "18.2.33",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.33.tgz",
- "integrity": "sha512-v+I7S+hu3PIBoVkKGpSYYpiBT1ijqEzWpzQD62/jm4K74hPpSP7FF9BnKG6+fg2+62weJYkkBWDJlZt5JO/9hg==",
+ "version": "18.2.35",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.35.tgz",
+ "integrity": "sha512-LG3xpFZ++rTndV+/XFyX5vUP7NI9yxyk+MQvBDq+CVs8I9DLSc3Ymwb1Vmw5YDoeNeHN4PDZa3HylMKJYT9PNQ==",
"dev": true,
"dependencies": {
"@types/prop-types": "*",
@@ -2323,15 +2323,15 @@
}
},
"node_modules/eslint": {
- "version": "8.52.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz",
- "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==",
+ "version": "8.53.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz",
+ "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.6.1",
- "@eslint/eslintrc": "^2.1.2",
- "@eslint/js": "8.52.0",
+ "@eslint/eslintrc": "^2.1.3",
+ "@eslint/js": "8.53.0",
"@humanwhocodes/config-array": "^0.11.13",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index 463795936e72..e71062e8ac47 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -12,11 +12,11 @@
}:
let
- arch =
- if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
- else if stdenv.hostPlatform.system == "i686-linux" then "x86"
+ bins =
+ if stdenv.hostPlatform.system == "x86_64-linux" then "x64-ubuntu-1604"
+ else if stdenv.hostPlatform.system == "i686-linux" then "x86-ubuntu-1604"
+ else if stdenv.hostPlatform.system == "aarch64-linux" then "aarch64-linux-gnu"
else throw "Unsupported architecture";
- bins = "${arch}-ubuntu-1604";
libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ];
in
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.displaylink.com/";
license = licenses.unfree;
maintainers = with maintainers; [ abbradar ];
- platforms = [ "x86_64-linux" "i686-linux" ];
+ platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
hydraPlatforms = [];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index ebb6fbe2cc6b..894ff5652bbb 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = with licenses; [ lgpl21Only gpl2Only ];
homepage = "https://www.displaylink.com/";
- broken = kernel.kernelOlder "4.19" || stdenv.isAarch64;
+ broken = kernel.kernelOlder "4.19";
};
}
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 3def168d2fa9..f4914d843272 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -8,6 +8,7 @@
, gobject-introspection
, gettext
, libgudev
+, libdrm
, polkit
, libxmlb
, glib
@@ -18,14 +19,12 @@
, curl
, libjcat
, elfutils
-, libsmbios
, efivar
, valgrind
, meson
, libuuid
, colord
, ninja
-, gcab
, gnutls
, protobufc
, python3
@@ -124,7 +123,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
- version = "1.9.6";
+ version = "1.9.7";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@@ -135,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
- hash = "sha256-9mA6gETnOmmkI+cdF0kP1moPV6DDvASq1JXarupM/tU=";
+ hash = "sha256-NhVCIjkwoTZptctIrkU9HgXzjr+KCUZfEKcjoYgAEdM=";
};
patches = [
@@ -169,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: {
gettext
shared-mime-info
valgrind
- gcab
gnutls
protobufc # for protoc
python
@@ -183,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
gusb
sqlite
libarchive
+ libdrm
curl
elfutils
libgudev
@@ -202,8 +201,6 @@ stdenv.mkDerivation (finalAttrs: {
libcbor
libqmi
xz # for liblzma
- ] ++ lib.optionals haveDell [
- libsmbios
] ++ lib.optionals haveFlashrom [
flashrom
];
diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 43969919fb0f..843942fd15b4 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -3,14 +3,14 @@
let
# These names are how they are designated in https://xanmod.org.
ltsVariant = {
- version = "6.1.60";
- hash = "sha256-KYCeONJxyFPee4pvBLRw/MBTzPU7D2oZCrAVr3t/yPM=";
+ version = "6.1.61";
+ hash = "sha256-15dAzCcFUekBlkBfcHWiZ3gourimLp6GlUKeWAddDqo=";
variant = "lts";
};
mainVariant = {
- version = "6.5.9";
- hash = "sha256-5SFPBsDTmq7tA6pyM7rbIjBPAtPbqhUl6VfA2z5baPA=";
+ version = "6.5.10";
+ hash = "sha256-t99LKAmNApcjFVna3ChNZp4O6ag9t2kQVrg8yRsTANg=";
variant = "main";
};
diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 70d84d6311c4..96477c5f4426 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
changelog = "https://linuxcontainers.org/lxcfs/news/";
license = licenses.asl20;
platforms = platforms.linux;
- maintainers = with maintainers; [ mic92 ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 01054fa7fc6b..98adb27d796f 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -773,6 +773,6 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/systemd/systemd/issues/20600#issuecomment-912338965
broken = stdenv.hostPlatform.isStatic;
priority = 10;
- maintainers = with maintainers; [ flokli kloenk mic92 ];
+ maintainers = with maintainers; [ flokli kloenk ];
};
})
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
index a779892b0434..ce20cf8f2286 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "dnsdist";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchurl {
url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2";
- hash = "sha256-BfNW/M4pxOzgPC2N8Eat/zqqsLA21oAcGjEcbVuzwH8=";
+ hash = "sha256-ZojwmyxS+b+TXwdp9O4o3Qdg5WItreez9Ob6N3bwerg=";
};
patches = [
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 60248f80d7b1..271ed97c857a 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2023.11.0";
+ version = "2023.11.1";
components = {
"3_day_blinds" = ps: with ps; [
];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index d0ca426a0144..ec3c6abb2158 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -87,16 +87,6 @@ let
};
});
- holidays = super.holidays.overridePythonAttrs (oldAttrs: rec {
- version = "0.28";
- src = fetchFromGitHub {
- owner = "dr-prodigy";
- repo = "python-holidays";
- rev = "refs/tags/v.${version}";
- hash = "sha256-JHj7fSE8p3TLViDSegl6gm35u53D9NvN7Oa2TBjN9t4=";
- };
- });
-
intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec {
version = "2.2.2";
src = fetchFromGitHub {
@@ -365,7 +355,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2023.11.0";
+ hassVersion = "2023.11.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -381,7 +371,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
- hash = "sha256-qLs098k/MUvmOl6/tB4SDU55V7KTZ0+T3RUoLH4AQ2Q=";
+ hash = "sha256-4OIvY6blun++7JDY+B0Cjrr4yNgnjTd8G55SWkhS3Cs=";
};
# Secondary source is git for tests
@@ -389,7 +379,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
- hash = "sha256-I5I/OcVE6nGO7LG3s2I1P/VUbPjPkUc7qj43z99tIRM=";
+ hash = "sha256-Z/CV1sGdJsdc4OxUZulC0boHaMP7WpajbY8Y6R9Q//I=";
};
nativeBuildInputs = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 292f38b2e8b6..d4c009fa258a 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
- version = "2023.11.0";
+ version = "2023.11.1";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
- hash = "sha256-/yiTNsr22X8orQ8sni50/FeWWZL9OyVZvTngeaGv5SI=";
+ hash = "sha256-eLmWOMKLzhZ7M/gdUHhlDZ3T+N4h5aHxMwOI8ZUepps=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index c84bc073141c..1b3a206dd6dc 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "riemann";
- version = "0.3.8";
+ version = "0.3.9";
src = fetchurl {
url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
- sha256 = "sha256-MjTUrqdi9K71PhpLzR3lqdOiNM7Ilmh8HWf3BUOr+b0=";
+ sha256 = "sha256-w3Uv+RMHhw1/G0wkygfLbazeinZqrbxVL4NFmy1/RgQ=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix
index 43f9d7a7fe73..422ee821cd50 100644
--- a/pkgs/servers/openvscode-server/default.nix
+++ b/pkgs/servers/openvscode-server/default.nix
@@ -12,7 +12,9 @@
, python3
, esbuild
, nodejs
+, node-gyp
, libsecret
+, libkrb5
, xorg
, ripgrep
, AppKit
@@ -37,12 +39,12 @@ let
esbuild' = esbuild.override {
buildGoModule = args: buildGoModule (args // rec {
- version = "0.16.17";
+ version = "0.17.14";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
- hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ=";
+ hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
@@ -58,13 +60,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "openvscode-server";
- version = "1.79.2";
+ version = "1.84.0";
src = fetchFromGitHub {
owner = "gitpod-io";
repo = "openvscode-server";
rev = "openvscode-server-v${finalAttrs.version}";
- hash = "sha256-u5LuDcKTN4CEpRnFCeEbni6hiDDwTV9LUEmXaQYJvJw=";
+ hash = "sha256-kYKvJrHWKHDIqJsN0j1WFN3OBWwEyNgY5hjNHBg+kKQ=";
};
yarnCache = stdenv.mkDerivation {
@@ -87,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "sha256-P6mzeE3HnS/KoP7kCXJlDkFWkTKiGjJkOUXfGOru/xE=";
+ outputHash = "sha256-oW/JngHpXb8kscikscI7N9csSyZsZQgG75jOdWll6dw=";
};
nativeBuildInputs = [
@@ -102,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
- ++ (with xorg; [ libX11 libxkbfile ])
+ ++ (with xorg; [ libX11 libxkbfile libkrb5 ])
++ lib.optionals stdenv.isDarwin [
AppKit
Cocoa
@@ -140,8 +142,16 @@ stdenv.mkDerivation (finalAttrs: {
# set offline mirror to yarn cache we created in previous steps
yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}"
- # set nodedir, so we can build binaries later
- npm config set nodedir "${nodejs}"
+ # set nodedir to prevent node-gyp from downloading headers
+ # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific
+ mkdir -p $HOME/.node-gyp/${nodejs.version}
+ echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion
+ ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}
+ export npm_config_nodedir=${nodejs}
+
+ # use updated node-gyp. fixes the following error on Darwin:
+ # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil'
+ export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js
runHook postConfigure
'';
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index b1bac49ba919..7e034c17f55e 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -117,11 +117,12 @@ stdenv.mkDerivation rec {
strictDeps = true;
- meta = with lib; {
+ meta = {
homepage = "https://github.com/mikebrady/shairport-sync";
description = "Airtunes server and emulator with multi-room capabilities";
- license = licenses.mit;
- maintainers = with maintainers; [ lnl7 jordanisaacs ];
- platforms = platforms.unix;
+ license = lib.licenses.mit;
+ mainProgram = "shairport-sync";
+ maintainers = with lib.maintainers; [ lnl7 jordanisaacs ];
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
index 83acc0804eee..61836a4573d7 100644
--- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "plpgsql_check";
- version = "2.5.4";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "okbob";
repo = pname;
rev = "v${version}";
- hash = "sha256-fahL+8aq4rUGYgEq6ri5wzVprDqvMmZCNkxwKtcPO68=";
+ hash = "sha256-mC8cDLfTu/gpMjNfXGCAV8EhE+kMq2MofzibIWijX3w=";
};
buildInputs = [ postgresql ];
diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix
index d99c00b2f3db..c2acf1703674 100644
--- a/pkgs/servers/web-apps/pict-rs/default.nix
+++ b/pkgs/servers/web-apps/pict-rs/default.nix
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage rec {
pname = "pict-rs";
- version = "0.4.3";
+ version = "0.4.5";
src = fetchFromGitea {
domain = "git.asonix.dog";
owner = "asonix";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-gUBSPkfIjvIU94tdasaoSl8zKPdfZ2PuT7sD8zU+iCI=";
+ sha256 = "sha256-kCWzje3tGfSn3gSdS4AFsoWFOLV9DhWKmzJltZs1KqY=";
};
- cargoHash = "sha256-ENFFhZ+OUcQPmQoYj5xFmUBJpofe8ovQgcEepujwcFA=";
+ cargoHash = "sha256-PiKkCiMNMbgBN8qJvzHnZBC782uKsS9aGyKEzG0cEec=";
# needed for internal protobuf c wrapper library
PROTOC = "${protobuf}/bin/protoc";
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 91eac4aaa9de..dc9df3e18898 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -2,7 +2,6 @@
, icu
, lua
, nixosTests
-, withLibevent ? true
, withDBI ? true
# use withExtraLibs to add additional dependencies of community modules
, withExtraLibs ? [ ]
@@ -16,7 +15,6 @@ let
luaEnv = lua.withPackages(p: with p; [
luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 luaunbound
]
- ++ lib.optional withLibevent p.luaevent
++ lib.optional withDBI p.luadbi
++ withExtraLuaPackages p
);
diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index 1fe9fe7f664f..fe4c25396845 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation rec {
pname = "oil";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
- hash = "sha256-H7oWI3+660MhMdDTTPX11/YalnItzhxfdBrtwKR8xrM=";
+ hash = "sha256-ll4YmmP9A9EpnIyd4Pv8Ot8lrK/grsWzqgn6am9PIRE=";
};
postPatch = ''
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix
index 124f6eec10ae..71d7d5f75ef0 100644
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@@ -152,6 +152,10 @@ let
# lots of interesting corner cases. Only expected to work for
# x86_64-linux buildPlatform.
pkgs.pkgsMusl.pkgsCross.gnu64.hello
+
+ # Two web browsers -- exercises almost the entire packageset
+ pkgs.pkgsCross.aarch64-multiplatform.qt5.qutebrowser
+ pkgs.pkgsCross.aarch64-multiplatform.firefox
];
in {
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index b9c2a463909b..c3f78e6083a9 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
- version = "0.14.0";
+ version = "0.14.3";
src = fetchFromGitHub {
owner = "dalance";
repo = "procs";
rev = "v${version}";
- hash = "sha256-DoH9XxPRKGd+tex8MdbtkhM+V8C1wDMv/GZcB4aMCPc=";
+ hash = "sha256-uVbYYJgxYATEmNrMuxA7RYDJWip/paWDCf5An1VGVDo=";
};
- cargoHash = "sha256-B+LpUErsvtLYn+Xvq4KNBpLR9WYe38yMWHUNsd9jIs8=";
+ cargoHash = "sha256-eaerc6cUF35XYFTNn0upydkOIC9M1BRweknrixIEvuk=";
nativeBuildInputs = [ installShellFiles ]
++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ];
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 05dbc34c7d9b..602e1ff77071 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "btrfs-progs";
- version = "6.6";
+ version = "6.5.3";
src = fetchurl {
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
- hash = "sha256-lnkple77LqrgUcLOO1YJt+m7LBpcuD/mn5LxEBtUuGk=";
+ hash = "sha256-/OfLP5IOYV5j+vJlpM2fK/OdStyqZiEcmHaX2oWi7t0=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index 5692ac812dee..a43c6bb80f0b 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -1,19 +1,27 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, testers, gh-ost }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "gh-ost";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchFromGitHub {
owner = "github";
repo = "gh-ost";
rev = "v${version}";
- sha256 = "sha256-FTWKbZ/32cr/BUI+jtV0HYlWDFz+R2YQd6ZSzilDj64=";
+ hash = "sha256-dTz4w+OJXe2+ygsYsQ9tanDyaMXvdh8W3d8xpjQMapI=";
};
- goPackagePath = "github.com/github/gh-ost";
+ vendorHash = null;
- ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" "-X main.BuildDescribe=${src.rev}" ];
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.AppVersion=${version}"
+ ];
+
+ passthru.tests.version = testers.testVersion {
+ package = gh-ost;
+ };
meta = with lib; {
description = "Triggerless online schema migration solution for MySQL";
diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix
index 49513daa761b..b298605aa183 100644
--- a/pkgs/tools/misc/opentelemetry-collector/default.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/default.nix
@@ -5,17 +5,17 @@
buildGoModule rec {
pname = "opentelemetry-collector";
- version = "0.87.0";
+ version = "0.88.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
- hash = "sha256-AfjCGxoXKXVfDnPkLqx2W3dGBFY9aiBPgltFMg1xKZI=";
+ hash = "sha256-Tflva3qo9tgdTAR+Ibr8KgpXU419rg5cX9Y1P6yTl0c=";
};
# there is a nested go.mod
sourceRoot = "${src.name}/cmd/otelcorecol";
- vendorHash = "sha256-OTeZL/mBYLKq47pJE26J+vbQkTZlgz0eVC1jwRmqw88=";
+ vendorHash = "sha256-VqZsYI/aA/db7fpZhlxUQzfFESjOBi4Hp9nytm+mFVY=";
# upstream strongly recommends disabling CGO
# additionally dependencies have had issues when GCO was enabled that weren't caught upstream
diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix
index 51daa59b19ef..6fa60d1aa0f7 100644
--- a/pkgs/tools/misc/phrase-cli/default.nix
+++ b/pkgs/tools/misc/phrase-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "phrase-cli";
- version = "2.12.0";
+ version = "2.15.0";
src = fetchFromGitHub {
owner = "phrase";
repo = "phrase-cli";
rev = version;
- sha256 = "sha256-VGuVDlIn0SnE3ZHcYbfQ0lWESf0tEyb6CTk8G8jnRlg=";
+ sha256 = "sha256-/gNDuZ19uC7UjOFaPfNntQQ6H5e7VgxBHPD6eD4nSEM=";
};
- vendorHash = "sha256-YzOPt02zbgT0wglWGEkUiDJhSNQnzazPs5nnNFDI0+g=";
+ vendorHash = "sha256-XBk4x3L6GJz1v6g46ODEOJN2J565O4IA8pOlhUD3bRE=";
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/tools/misc/tailspin/default.nix
index de8cb9574e2e..7d9693e41d69 100644
--- a/pkgs/tools/misc/tailspin/default.nix
+++ b/pkgs/tools/misc/tailspin/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "tailspin";
- version = "1.6.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "tailspin";
rev = "refs/tags/${version}";
- hash = "sha256-yzG8wFTd4DYnmd+fbBdjZ0fr1iEoL4ZqXr59kX/a0Gs=";
+ hash = "sha256-NGPwdTkgzowdchUjuoJ9iVrkmAjXvyijHmUfb5cAUKY=";
};
- cargoHash = "sha256-v6aOPfQyxqaoxKvT7ak91GvL68h88WfNjlnyU1vH/kY=";
+ cargoHash = "sha256-Pi8JiToF56a6zaUpGTAF6Bw8W8elSzLQimfMDua83Nk=";
meta = with lib; {
description = "A log file highlighter";
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/bensadeh/tailspin/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
- mainProgram = "spin";
+ mainProgram = "tspin";
};
}
diff --git a/pkgs/tools/networking/nqptp/default.nix b/pkgs/tools/networking/nqptp/default.nix
index 2db121e2d189..26aec487789d 100644
--- a/pkgs/tools/networking/nqptp/default.nix
+++ b/pkgs/tools/networking/nqptp/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/mikebrady/nqptp";
description = "Daemon and companion application to Shairport Sync that monitors timing data from any PTP clocks";
license = lib.licenses.gpl2Only;
+ mainProgram = "nqptp";
maintainers = with lib.maintainers; [ jordanisaacs adamcstephens ];
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
};
diff --git a/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff b/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff
deleted file mode 100644
index b94ca03bb317..000000000000
--- a/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur source-old/pyproject.toml source-new/pyproject.toml
---- source-old/pyproject.toml 1980-01-02 00:00:00.000000000 -0300
-+++ source-new/pyproject.toml 2023-02-04 10:09:48.087418202 -0300
-@@ -29,11 +29,11 @@
- "Topic :: Security",
- ]
- dependencies = [
-- "pydantic~=1.10.2",
-- "python-dotenv~=0.21.0",
-- "requests~=2.28.1",
-- "rich~=12.6.0",
-- "shodan~=1.28.0",
-+ "pydantic",
-+ "python-dotenv",
-+ "requests",
-+ "rich",
-+ "shodan",
- ]
- dynamic = ["version"]
-
-@@ -63,7 +63,7 @@
- "mypy",
- "pytest",
- "pytest-cov",
-- "types-requests~=2.28.1",
-+ "types-requests",
- ]
- [tool.hatch.envs.default.scripts]
- typecheck = "mypy -p {args:wtfis}"
diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix
index 0ed6ca8a25d8..8d198520d263 100644
--- a/pkgs/tools/security/arti/default.nix
+++ b/pkgs/tools/security/arti/default.nix
@@ -10,7 +10,7 @@
rustPlatform.buildRustPackage rec {
pname = "arti";
- version = "1.1.9";
+ version = "1.1.10";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
owner = "core";
repo = "arti";
rev = "arti-v${version}";
- sha256 = "sha256-nce+WpT9uloO9Ce/h1ziPWJhYMcL4yZvYO1EP8AEfxI=";
+ sha256 = "sha256-/O13n9YPY0RhSnSM9vJzLTXNuXT6iWrPo7S8EnnKIkw=";
};
- cargoHash = "sha256-Qqm39QK+/rCmad3dJLVPGd7ZKP8ldtFI+NnxC6iQUBA=";
+ cargoHash = "sha256-LfqieUMWRL+86p0DyitxdfUGVwPtfhcwiwKYMqOZtdc=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/tools/security/bitwarden/cli.nix
index 3be69ae97fdb..750237a4e2ed 100644
--- a/pkgs/tools/security/bitwarden/cli.nix
+++ b/pkgs/tools/security/bitwarden/cli.nix
@@ -12,16 +12,16 @@ let
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
in buildNpmPackage' rec {
pname = "bitwarden-cli";
- version = "2023.9.1";
+ version = "2023.10.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "cli-v${version}";
- hash = "sha256-1dyrjEhcZDrA89rEvGg16f/MI8oNPPF4lwgGQQF9huE=";
+ hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";
};
- npmDepsHash = "sha256-7GgjrH5s09zwGhWPOYHLTIMSKYndq+cAG06jZ0IySOQ=";
+ npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";
nativeBuildInputs = [
python3
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index 84ce6b59d787..e48f5945ca60 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -29,24 +29,24 @@ let
electron = electron_25;
in buildNpmPackage' rec {
pname = "bitwarden";
- version = "2023.9.3";
+ version = "2023.10.0";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
- hash = "sha256-NiMJmtCx+yD24BCyMgHLpRApNwoIJRps5qmmlVdB0G0=";
+ hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";
};
makeCacheWritable = true;
npmWorkspace = "apps/desktop";
- npmDepsHash = "sha256-HQPxmATA9bUc4NTfvYsL6fGuicU9baySCmNHahs8EF4=";
+ npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
sourceRoot = "${src.name}/${cargoRoot}";
- hash = "sha256-mFxvK9cmSBRVnUwEbzADUa5W5TCL51wcUHxuR5JZwLE=";
+ hash = "sha256-I7wENo4cCxcllEyT/tgAavHNwYPrQkPXxg/oTsl/ClA=";
};
cargoRoot = "apps/desktop/desktop_native";
diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix
index 7f83fe7873e6..c97aa865af06 100644
--- a/pkgs/tools/security/cfripper/default.nix
+++ b/pkgs/tools/security/cfripper/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
- version = "1.13.2";
+ version = "1.14.0";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-wcOtj56l2bUYE+WdbDwtB3aWlP2zEAFaaqw4THcHxbY=";
+ hash = "sha256-f8abfrYoEwmlQBl0eRFfigw2SrfPCL3+88bwc8miKEk=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix
index fb0d921ec2f6..df7695276c2a 100644
--- a/pkgs/tools/security/hcxtools/default.nix
+++ b/pkgs/tools/security/hcxtools/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hcxtools";
- version = "6.3.1";
+ version = "6.3.2";
src = fetchFromGitHub {
owner = "ZerBea";
repo = pname;
rev = version;
- sha256 = "sha256-EDTxzstQwQy7MSkdi1nQis8qEm8ZPblkeOkM8B48IRE=";
+ sha256 = "sha256-ZEkuWGt2PGkFW1RXCyrUiew92N4ov35mMObHk1xD6uM=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bda52e084fe..1849c4f85cc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2833,8 +2833,6 @@ with pkgs;
yapesdl = callPackage ../applications/emulators/yapesdl { };
- zesarux = callPackage ../applications/emulators/zesarux { };
-
zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };
@@ -3715,8 +3713,6 @@ with pkgs;
dcap = callPackage ../tools/networking/dcap { };
- dark-mode-notify = callPackage ../os-specific/darwin/dark-mode-notify { };
-
deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { };
delayarchitect = callPackage ../applications/audio/delayarchitect { };
@@ -17075,7 +17071,7 @@ with pkgs;
cargo-lock = callPackage ../development/tools/rust/cargo-lock { };
cargo-machete = callPackage ../development/tools/rust/cargo-machete { };
cargo-outdated = callPackage ../development/tools/rust/cargo-outdated {
- inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
};
cargo-pgx_0_6_1 = callPackage ../development/tools/rust/cargo-pgx/0_6_1.nix {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -36347,9 +36343,10 @@ with pkgs;
vscodium-fhsWithPackages = vscodium.fhsWithPackages;
openvscode-server = callPackage ../servers/openvscode-server {
- nodejs = nodejs_16;
+ nodejs = nodejs_18;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
inherit (darwin) cctools;
+ inherit (nodePackages) node-gyp;
};
code-server = callPackage ../servers/code-server {
@@ -37458,8 +37455,6 @@ with pkgs;
mar1d = callPackage ../games/mar1d { } ;
- meritous = callPackage ../games/meritous { };
-
oh-my-git = callPackage ../games/oh-my-git { };
opendune = callPackage ../games/opendune { };
@@ -41730,8 +41725,6 @@ with pkgs;
undaemonize = callPackage ../tools/system/undaemonize { };
- wtfis = callPackage ../tools/networking/wtfis { };
-
houdini = callPackage ../applications/misc/houdini { };
openfst = callPackage ../development/libraries/openfst { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b631ee4cf9f8..2d96df47c7d1 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -267,6 +267,7 @@ mapAliases ({
prometheus_client = prometheus-client; # added 2021-06-10
prompt_toolkit = prompt-toolkit; # added 2021-07-22
protonup = protonup-ng; # Added 2022-11-06
+ proxy_tools = proxy-tools; # added 2023-11-05
pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
pushbullet = pushbullet-py; # Added 2022-10-15
Pweave = pweave; # added 2023-02-19
@@ -422,6 +423,7 @@ mapAliases ({
uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13
validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07
+ vega_datasets = vega-datasets; # added 2023-11-04
ViennaRNA = viennarna; # added 2023-08-23
virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07
Wand = wand; # added 2022-11-13
@@ -434,6 +436,7 @@ mapAliases ({
wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxPython_4_2 instead"; # added 2023-03-19
wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxPython_4_2 instead"; # added 2023-03-19
WSME = wsme; # added 2023-02-19
+ x11_hash = x11-hash; # added 2023-11-05
xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
XlsxWriter = xlsxwriter; # added 2023-02-19
Yapsy = yapsy; # added 2023-02-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5639ff919b94..f0bd8881f3ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1203,6 +1203,8 @@ self: super: with self; {
azure-mgmt-web = callPackage ../development/python-modules/azure-mgmt-web { };
+ azure-monitor-ingestion = callPackage ../development/python-modules/azure-monitor-ingestion { };
+
azure-multiapi-storage = callPackage ../development/python-modules/azure-multiapi-storage { };
azure-nspkg = callPackage ../development/python-modules/azure-nspkg { };
@@ -6860,6 +6862,8 @@ self: super: with self; {
mitmproxy = callPackage ../development/python-modules/mitmproxy { };
+ mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { };
+
mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { };
mitogen = callPackage ../development/python-modules/mitogen { };
@@ -9115,7 +9119,7 @@ self: super: with self; {
propka = callPackage ../development/python-modules/propka { };
- proxy_tools = callPackage ../development/python-modules/proxy_tools { };
+ proxy-tools = callPackage ../development/python-modules/proxy-tools { };
proxy-db = callPackage ../development/python-modules/proxy-db { };
@@ -12904,9 +12908,7 @@ self: super: with self; {
skidl = callPackage ../development/python-modules/skidl { };
- skl2onnx = callPackage ../development/python-modules/skl2onnx {
- protobuf = protobuf3;
- };
+ skl2onnx = callPackage ../development/python-modules/skl2onnx { };
sklearn-deap = callPackage ../development/python-modules/sklearn-deap { };
@@ -15373,7 +15375,7 @@ self: super: with self; {
vega = callPackage ../development/python-modules/vega { };
- vega_datasets = callPackage ../development/python-modules/vega_datasets { };
+ vega-datasets = callPackage ../development/python-modules/vega-datasets { };
venstarcolortouch = callPackage ../development/python-modules/venstarcolortouch { };
@@ -15737,7 +15739,7 @@ self: super: with self; {
x-wr-timezone = callPackage ../development/python-modules/x-wr-timezone { };
- x11_hash = callPackage ../development/python-modules/x11_hash { };
+ x11-hash = callPackage ../development/python-modules/x11-hash { };
x256 = callPackage ../development/python-modules/x256 { };