Unverified Commit 500435a9 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 25d004f7 49fb1cfb

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ rec { 
  thunderbird = thunderbird-latest;



  thunderbird-latest = common {

    version = "147.0.1";

    sha512 = "bae9adbcb1d45a7644e4d699215a3da85b612b9d99516bdf12f84482f1a6f89153ec4d5ab6dd8bcf69dc512cb50080db4630a5bb52525f22213c7af92b4b77d7";

    version = "147.0.2";

    sha512 = "4fe6d0389e8bc6078b3d4db79d1f8547666950de4a5a72e49ba24d5b60cb531908b88efa9f3dd32e154ee917a8b80786389ce9b1186b6c45fb0717d4e180e537";



    updateScript = callPackage ./update.nix {

      attrPath = "thunderbirdPackages.thunderbird-latest";

pkgs/by-name/co/color-lsp/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -6,16 +6,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "color-lsp";

  version = "0.2.2";

  version = "0.3.0";



  src = fetchFromGitHub {

    owner = "huacnlee";

    repo = "color-lsp";

    rev = "v${version}";

    hash = "sha256-U0pTzW2PCgMxVsa1QX9MC249PXXL2KvRSN1Em2WvIeI=";

    hash = "sha256-p58rAVznBzhBv7gVvaEjMpCrk9kFuEjUvY6U4uMXUE8=";

  };



  cargoHash = "sha256-etK+9fcKS+y+0C36vJrMkQ0yyVSpCW/DLKg4nTw3LrE=";

  cargoHash = "sha256-o/me2LIv6qvxOuHUnyv8+GcfoJlmdFymJkJMuOlC1Nw=";



  # Only build the color-lsp binary, not the zed extension

  cargoBuildFlags = [

pkgs/by-name/de/deno/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -30,17 +30,17 @@ let 
in

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "deno";

  version = "2.6.10";

  version = "2.6.9";



  src = fetchFromGitHub {

    owner = "denoland";

    repo = "deno";

    tag = "v${finalAttrs.version}";

    fetchSubmodules = true; # required for tests

    hash = "sha256-youaF9YERkGUwN0sg6IzV8OAyahSDbFt0psn/p4iOVY=";

    hash = "sha256-FSm3X+1cTQURF9V/cCYvjJmPx9udcE/s5J6oRhcDWWU=";

  };



  cargoHash = "sha256-goaqxj8Y5Gqo4et4AkyZ3Uv74Q3M3V0VExUA/AMYNMI=";

  cargoHash = "sha256-DgotLiq4xzVH8dhOUA4Fxg0NW0DRnHVCJlxQYVQDaeE=";



  patches = [

    ./patches/0002-tests-replace-hardcoded-paths.patch

pkgs/by-name/li/libstrophe/package.nix

+6 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch2,

  autoreconfHook,

  libtool,

  openssl,
@@ -24,8 +25,11 @@ stdenv.mkDerivation (finalAttrs: { 


  patches = [

    # Newer GCC rejects implicitly weak-typed pointer casting.

    # Upstream PR: https://github.com/strophe/libstrophe/pull/267

    ./pointer-cast.patch

    (fetchpatch2 {

      name = "pointer-cast.patch";

      url = "https://github.com/strophe/libstrophe/commit/dfb3e868248d86fc0f5553dffbb6f7c367c3c383.patch?full_index=1";

      hash = "sha256-ALr2I53hGHW3OycKDdoXkNgANSYw1kUSYGqmAHkMq5E=";

    })

  ];



  nativeBuildInputs = [

pkgs/by-name/li/libstrophe/pointer-cast.patch

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
diff --git a/src/handler.c b/src/handler.c

index 1c9bf9f..168df75 100644

--- a/src/handler.c

+++ b/src/handler.c

@@ -320,7 +320,7 @@ static void _timed_handler_delete(xmpp_ctx_t *ctx,

  */

 void xmpp_timed_handler_delete(xmpp_conn_t *conn, xmpp_timed_handler handler)

 {

-    _timed_handler_delete(conn->ctx, &conn->timed_handlers, handler);

+    _timed_handler_delete(conn->ctx, &conn->timed_handlers, (xmpp_void_handler)handler);

 }

 

 static void _id_handler_add(xmpp_conn_t *conn,

@@ -349,7 +349,7 @@ static void _id_handler_add(xmpp_conn_t *conn,

         return;

 

     item->user_handler = user_handler;

-    item->handler = handler;

+    item->handler = (xmpp_void_handler)handler;

     item->userdata = userdata;

     item->enabled = 0;

     item->next = NULL;

@@ -451,7 +451,7 @@ static void _handler_add(xmpp_conn_t *conn,

 

     memset(item, 0, sizeof(*item));

     item->user_handler = user_handler;

-    item->handler = handler;

+    item->handler = (xmpp_void_handler)handler;

     item->userdata = userdata;

 

     if (_dup_string(conn->ctx, ns, &item->u.ns))

@@ -530,7 +530,7 @@ void xmpp_timed_handler_add(xmpp_conn_t *conn,

                             unsigned long period,

                             void *userdata)

 {

-    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,

+    _timed_handler_add(conn->ctx, &conn->timed_handlers, (xmpp_void_handler)handler, period,

                        userdata, 1);

 }

 

@@ -548,7 +548,7 @@ void handler_add_timed(xmpp_conn_t *conn,

                        unsigned long period,

                        void *userdata)

 {

-    _timed_handler_add(conn->ctx, &conn->timed_handlers, handler, period,

+    _timed_handler_add(conn->ctx, &conn->timed_handlers, (xmpp_void_handler)handler, period,

                        userdata, 0);

 }

 

@@ -747,7 +747,7 @@ void xmpp_global_timed_handler_add(xmpp_ctx_t *ctx,

                                    unsigned long period,

                                    void *userdata)

 {

-    _timed_handler_add(ctx, &ctx->timed_handlers, handler, period, userdata, 1);

+    _timed_handler_add(ctx, &ctx->timed_handlers, (xmpp_void_handler)handler, period, userdata, 1);

 }

 

 /** Delete a global timed handler.

@@ -760,5 +760,5 @@ void xmpp_global_timed_handler_add(xmpp_ctx_t *ctx,

 void xmpp_global_timed_handler_delete(xmpp_ctx_t *ctx,

                                       xmpp_global_timed_handler handler)

 {

-    _timed_handler_delete(ctx, &ctx->timed_handlers, handler);

+    _timed_handler_delete(ctx, &ctx->timed_handlers, (xmpp_void_handler)handler);

 }