gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-02-18 14:32:36 +00:00
committed by GitHub
parent c9d03f2302 500435a9e7
commit 08d7e5136a
13 changed files with 400 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+2 -2
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
-65
View File
@@ -1,65 +0,0 @@
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);
}
pkgs/by-name/ni/nixtamal/package.nix
+2 -2
View File
@@ -17,7 +17,7 @@
ocamlPackages.buildDunePackage (finalAttrs: {
pname = "nixtamal";
version = "1.1.0";
version = "1.1.1";
release_year = 2026;
minimalOCamlVersion = "5.3";
@@ -26,7 +26,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
url = "https://darcs.toastal.in.th/nixtamal/stable/";
mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ];
rev = finalAttrs.version;
hash = "sha256-Q8EZ8kOyujMxoRU+G0SpTUhT9xi/5MtWnZmQffZzV7s=";
hash = "sha256-VYK6ZqEutlVA8ASegLfqnJhLSU5jc2dIL3YOrXrGT0I=";
};
nativeBuildInputs = [
pkgs/by-name/pr/protoc-gen-es/package.nix
+3 -3
View File
@@ -7,20 +7,20 @@
buildNpmPackage rec {
pname = "protoc-gen-es";
version = "2.10.2";
version = "2.11.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = "protobuf-es";
tag = "v${version}";
hash = "sha256-6YzxDf8NbBWn3sWqdeQLIUiKQa0DIvBWfigV7hKv+p0=";
hash = "sha256-fH/gp7+MU7W8FESJTr4do6FIqXpxS4v6fAxa4xc+vKw=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-nS2PFNwZUrHk6onEV2I9O7ZoN/c9bRIQ+D3oXnFd7dU=";
npmDepsHash = "sha256-UW17BQoPv5sfQT52n6PBQrwArInDvQptneF3bgKEXTY=";
npmWorkspace = "packages/protoc-gen-es";
pkgs/development/beam-modules/elvis-erlang/default.nix
+2 -2
View File
@@ -11,12 +11,12 @@
rebar3Relx rec {
releaseType = "escript";
pname = "elvis-erlang";
version = "4.2.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "inaka";
repo = "elvis";
hash = "sha256-O6T3/oe7npeLaaCRZLn4CtZ1WTjg98aPP9mrQoWCXgg=";
hash = "sha256-/a7wcST0CYVebX7XVZLaDXNJX6fsFCCoidhSqcs+mNI=";
tag = version;
};
pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix
+3 -3
View File
@@ -44,11 +44,11 @@ let
};
elvis_core = builder {
name = "elvis_core";
version = "4.2.0";
version = "4.2.1";
src = fetchHex {
pkg = "elvis_core";
version = "4.2.0";
sha256 = "sha256-q0Z8fT/zgn+LLN23XIOKsA7qXbkOHMTH5KbXVjpXRb0=";
version = "4.2.1";
sha256 = "sha256-D3dLiR5kqMuZSf9PVUhclgjBFEFIEDqDOhAUk7l8J7I=";
};
beamDeps = [
katana_code
pkgs/development/libraries/webkitgtk/default.nix
+2
View File
@@ -29,6 +29,7 @@
libjxl,
at-spi2-core,
cairo,
expat,
libxml2,
libsoup_3,
libsecret,
@@ -142,6 +143,7 @@ clangStdenv.mkDerivation (finalAttrs: {
at-spi2-core
cairo # required even when using skia
enchant
expat
flite
libavif
libepoxy
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+12 -3
View File
@@ -41,6 +41,9 @@ in
lib.mapAttrs' (
language: attrs:
let
source = lib.optionalAttrs (attrs ? url) (parseUrl attrs.url);
in
lib.nameValuePair "tree-sitter-${language}" (
{
# Default to the source attr name as the language
@@ -56,7 +59,7 @@ lib.mapAttrs' (
if (isUnstable attrs.version) then
[
"--version"
"branch"
"branch${lib.optionalString (source ? ref) "=${source.ref}"}"
]
else
[
@@ -71,7 +74,6 @@ lib.mapAttrs' (
// lib.optionalAttrs (attrs ? url && attrs ? hash) {
src =
let
source = parseUrl attrs.url;
fetch = lib.getAttr source.type {
github = fetchFromGitHub;
gitlab = fetchFromGitLab;
@@ -79,19 +81,26 @@ lib.mapAttrs' (
codeberg = fetchFromCodeberg;
# NOTE: include other types here as required
};
rev =
if isUnstable attrs.version then
attrs.rev
or (throw "tree-sitter grammar '${language}': unstable version requires a pinned 'rev' attribute")
else
source.ref or "v${attrs.version}";
in
fetch {
inherit (source)
owner
repo
;
rev = source.ref or "v${attrs.version}";
inherit rev;
inherit (attrs) hash;
};
}
// removeAttrs attrs [
"url"
"hash"
"rev"
]
)
) grammar-sources
pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix
+361 -180
View File
File diff suppressed because it is too large Load Diff
pkgs/os-specific/linux/hid-fanatecff/default.nix
+1
View File
@@ -52,5 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ rake5k ];
platforms = lib.platforms.linux;
mainProgram = "hid-fanatecff";
broken = lib.versionOlder kernel.version "6.1";
};
})