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-01-02 12:07:56 +00:00
committed by GitHub
parent 745ef6dc9f 3b2907c16b
commit 819fd234eb
65 changed files with 671 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/module-list.nix
+1
View File
@@ -403,6 +403,7 @@
./security/please.nix
./security/polkit.nix
./security/rtkit.nix
./security/run0.nix
./security/soteria.nix
./security/sudo-rs.nix
./security/sudo.nix
nixos/modules/security/run0.nix
+52
View File
@@ -0,0 +1,52 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.security.run0;
sudoAlias = pkgs.writeScriptBin "sudo" ''
if [[ "$1" == -* ]]; then
echo "This script is a sudo-alias to systemd's run0 and does not support any sudo parameters."
exit 1
fi
exec run0 "$@"
'';
in
{
options.security.run0 = {
wheelNeedsPassword = lib.mkOption {
type = lib.types.bool;
default = true;
description = ''
Whether users of the `wheel` group must
provide a password to run commands as super user via {command}`run0`.
'';
};
enableSudoAlias = lib.mkEnableOption "make {command}`sudo` an alias to {command}`run0`.";
};
config = {
assertions = [
{
assertion =
cfg.enableSudoAlias -> (!config.security.sudo.enable && !config.security.sudo-rs.enable);
message = "`security.run0.enableSudoAlias` cannot be enabled if `security.sudo` or `security.sudo-rs` are enabled.";
}
];
security.polkit.extraConfig = lib.mkIf (!cfg.wheelNeedsPassword) ''
polkit.addRule(function(action, subject) {
if (action.id == "org.freedesktop.systemd1.manage-units" && subject.isInGroup("wheel")) {
return polkit.Result.YES;
}
});
'';
environment.systemPackages = lib.optional cfg.enableSudoAlias sudoAlias;
};
}
nixos/modules/services/computing/slurm/slurm.nix
+34 -1
View File
@@ -3,6 +3,7 @@
lib,
options,
pkgs,
utils,
...
}:
let
@@ -83,6 +84,28 @@ in
slurm to work properly (see `services.munge.password`).
'';
};
flags = lib.mkOption {
type = lib.types.attrsOf (
lib.types.oneOf [
lib.types.str
lib.types.bool
lib.types.float
lib.types.int
]
);
default = { };
example = {
"i" = true;
"systemd" = true;
"L" = "/var/log/file with space.log";
"n" = 10;
};
description = ''
Flags passed to `slurmctld` daemon, see {manpage}`slurmctld(8)`.
Special characters are properly escaped.
'';
};
};
dbdserver = {
@@ -484,7 +507,17 @@ in
serviceConfig = {
Type = "forking";
ExecStart = "${wrappedSlurm}/bin/slurmctld";
ExecStart =
let
isLong = optionName: builtins.stringLength optionName > 1;
flagFormat = optionName: {
option = if isLong optionName then "--${optionName}" else "-${optionName}";
sep = null;
explicitBool = false;
};
cli = [ "${wrappedSlurm}/bin/slurmctld" ] ++ lib.cli.toCommandLine flagFormat cfg.server.flags;
in
utils.escapeSystemdExecArgs cli;
PIDFile = "/run/slurmctld.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
pkgs/applications/editors/vscode/extensions/sourcegraph.amp/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
publisher = "sourcegraph";
name = "amp";
version = "0.0.1766678962";
hash = "sha256-XjRgrdoefafCkKYazPtjhLUdyOqoMByaCCtgbfqKHSg=";
version = "0.0.1767211791";
hash = "sha256-r8CjaSOXgnFkzcnyospFI3IwVpvc18KmYzwBpuv1Ab0=";
};
meta = {
pkgs/applications/graphics/sane/frontends.nix
+10 -1
View File
@@ -3,6 +3,7 @@
stdenv,
fetchurl,
fetchpatch,
autoconf,
sane-backends,
libX11,
gtk2,
@@ -67,10 +68,18 @@ stdenv.mkDerivation rec {
gtk2
]
++ lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
autoconf
];
enableParallelBuilding = true;
# https://bugzilla.redhat.com/show_bug.cgi?id=2341321
preConfigure = ''
autoconf
'';
meta = {
description = "Scanner Access Now Easy";
homepage = "http://www.sane-project.org/";
pkgs/by-name/am/amp-cli/package-lock.json
Generated
+4 -4
View File
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
"@sourcegraph/amp": "^0.0.1766634431-g578c41"
"@sourcegraph/amp": "^0.0.1767172180-g2c9ff0"
}
},
"node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
}
},
"node_modules/@sourcegraph/amp": {
"version": "0.0.1766634431-g578c41",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1766634431-g578c41.tgz",
"integrity": "sha512-k5qEQdnWGeLTjrov69uGCGRXZG7IxJbkqr5RUhB/8AkiD+XcKz3CwzyZqFBoaZXZ2Q6KxZ6Ws2k9p611K89b7w==",
"version": "0.0.1767172180-g2c9ff0",
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1767172180-g2c9ff0.tgz",
"integrity": "sha512-CPLZmfgEh3WiG9LmYEACUHW3UuR3srvW/Bz/L5ORabUUk5cCVfPv8XuU027cPAoDLDN0pVczOLJDudZVOzICEQ==",
"license": "Amp Commercial License",
"dependencies": {
"@napi-rs/keyring": "1.1.9"
pkgs/by-name/am/amp-cli/package.nix
+3 -3
View File
@@ -9,11 +9,11 @@
buildNpmPackage (finalAttrs: {
pname = "amp-cli";
version = "0.0.1766634431-g578c41";
version = "0.0.1767172180-g2c9ff0";
src = fetchzip {
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
hash = "sha256-Bp9fvN7KgkTSr23iVY1FLWqac+gjC/WO+YjMf9pv0B8=";
hash = "sha256-9GjpmqjGXVY4sWUaLdCvcZandoHTE5KPDfkisNuguSw=";
};
postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
chmod +x bin/amp-wrapper.js
'';
npmDepsHash = "sha256-mmNPrBTnTQ96rrVFAELl2o9YCApWmkJEHHnmPHozkt0=";
npmDepsHash = "sha256-6eDkFSNKDU2eC5FOStVXqt0rLqN6k7r1+s+lDTEf5xw=";
propagatedBuildInputs = [
ripgrep
pkgs/by-name/an/anvil-editor/package.nix
+3 -3
View File
@@ -16,13 +16,13 @@
buildGoModule (finalAttrs: {
pname = "anvil-editor";
version = "0.6.3";
version = "0.7";
# has to update vendorHash of extra package manually
# nixpkgs-update: no auto update
src = fetchzip {
url = "https://anvil-editor.net/releases/anvil-src-v${finalAttrs.version}.tar.gz";
hash = "sha256-GPzd1oKkf160ya0sxUd72wego0BvwCerZ5SiY2q0EDE=";
hash = "sha256-9lJg8IMt6+GJm5a7j7ZyhbwvAmlBKvtdOv9FD9MQdrA=";
};
modRoot = "anvil/editor";
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
anvilExtras = buildGoModule {
pname = "anvil-editor-extras";
inherit (finalAttrs) version src meta;
vendorHash = "sha256-q/PunSBe+gWTWyf8rjfikK56rP2PeZqpuiFG9HIVMTk=";
vendorHash = "sha256-Hnq1aq1DGM7IJwjU38yEk6yXmQQLyisMeaktNZNysy8=";
modRoot = "anvil/extras";
# Include dependency on anvil api
postPatch = ''
pkgs/by-name/ca/cage/package.nix
+11
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
meson,
ninja,
pkg-config,
@@ -31,6 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-P9MhIl2YIE2hwT5Yr0Cpes5S12evb0aj9oOPLeehkw0=";
};
patches = [
# backport of https://github.com/cage-kiosk/cage/pull/461
# to fix https://github.com/cage-kiosk/cage/issues/456
# remove on next release
(fetchpatch {
url = "https://github.com/cage-kiosk/cage/commit/832e88b0c964a324bb09c7af02ed0650b73dfb9b.patch";
hash = "sha256-8dyJL46xXGkw3pF9uskX8H72s0hUO1BhU2UMaoEwz4U=";
})
];
depsBuildBuild = [
pkg-config
];
pkgs/by-name/ch/chow-kick/package.nix
+17
View File
@@ -55,6 +55,23 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
# Fix width/height naming in chowdsp_GraphicsHelpers.h
substituteInPlace modules/chowdsp_utils/modules/common/chowdsp_core/DataStructures/chowdsp_GraphicsHelpers.h --replace-fail \
'position.y += r.h;' \
'position.y += r.height;'
substituteInPlace modules/chowdsp_utils/modules/common/chowdsp_core/DataStructures/chowdsp_GraphicsHelpers.h --replace-fail \
'height -= r.h;' \
'height -= r.height;'
substituteInPlace modules/chowdsp_utils/modules/common/chowdsp_core/DataStructures/chowdsp_GraphicsHelpers.h --replace-fail \
'position.x += r.w;' \
'position.x += r.width;'
substituteInPlace modules/chowdsp_utils/modules/common/chowdsp_core/DataStructures/chowdsp_GraphicsHelpers.h --replace-fail \
'width -= r.w;' \
'width -= r.width;'
substituteInPlace modules/chowdsp_wdf/CMakeLists.txt --replace-fail \
'cmake_minimum_required(VERSION 3.1)' \
'cmake_minimum_required(VERSION 4.0)'
pkgs/by-name/cp/cpulimit/package.nix
+2
View File
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "1dz045yhcsw1rdamzpz4bk8mw888in7fyqk1q1b3m1yk4pd1ahkh";
};
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
patches = [
./remove-sys-sysctl.h.patch
./get-missing-basename.patch
pkgs/by-name/df/dfu-programmer/package.nix
+2
View File
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-libusb_1_0" ];
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
meta = {
license = lib.licenses.gpl2;
description = "Device Firmware Update based USB programmer for Atmel chips with a USB bootloader";
pkgs/by-name/dn/dnsrecon/package.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "dnsrecon";
version = "1.5.2";
version = "1.5.3";
pyproject = true;
src = fetchFromGitHub {
owner = "darkoperator";
repo = "dnsrecon";
tag = version;
hash = "sha256-FFe421hB1V8EQd3Uyl/3PvWwgn3YcRtz6k+umpiwfW4=";
hash = "sha256-MkeHQZXWCqZ9/Z8WEVZIkDeLB/bnSxi8NBpgrcxAo+s=";
};
pythonRelaxDeps = true;
pkgs/by-name/dr/draupnir/package.nix
+4 -4
View File
@@ -2,7 +2,7 @@
lib,
fetchFromGitHub,
makeBinaryWrapper,
nodejs,
nodejs_22,
matrix-sdk-crypto-nodejs,
python3,
sqlite,
@@ -17,7 +17,7 @@
nix-update-script,
}:
let
nodeSources = srcOnly nodejs;
nodeSources = srcOnly nodejs_22;
in
stdenv.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
python3
yarnConfigHook
yarnBuildHook
nodejs
nodejs_22
]
++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool;
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
mv ./lib ./version.txt ./node_modules ./package.json $out/lib/node_modules/draupnir
# Create wrapper executable
makeWrapper ${lib.getExe nodejs} $out/bin/draupnir \
makeWrapper ${lib.getExe nodejs_22} $out/bin/draupnir \
--add-flags "--enable-source-maps" \
--add-flags "$out/lib/node_modules/draupnir/lib/index.js"
pkgs/by-name/e-/e-search/package.nix
+3 -3
View File
@@ -54,13 +54,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "e-search";
version = "15.2.1";
version = "15.2.3";
src = fetchFromGitHub {
owner = "xushengfeng";
repo = "eSearch";
tag = finalAttrs.version;
hash = "sha256-K4GFLUeq/IbJC3FZBgvKnZq7JrXkqe6eVGsUxxlpWF0=";
hash = "sha256-wzSspt1qJpBgw4MyiK+vhRjoybNcaaa9nWBPV0bctiM=";
};
pnpmDeps = fetchPnpmDeps {
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ gitMinimal ];
pnpm = pnpm';
fetcherVersion = 2;
hash = "sha256-wPwsFY7wvbE1LW5PMwMZKejELtqmdsYO2RVrEuOzdcg=";
hash = "sha256-q0+6vkDZdcDXwsTxby2RuQUYTgEnxGx1CeXROSrG9lU=";
};
nativeBuildInputs = [
pkgs/by-name/fl/fleet/package.nix
+3 -3
View File
@@ -7,15 +7,15 @@
buildGoModule (finalAttrs: {
pname = "fleet";
version = "4.77.0";
version = "4.78.0";
src = fetchFromGitHub {
owner = "fleetdm";
repo = "fleet";
tag = "fleet-v${finalAttrs.version}";
hash = "sha256-3GrEjXNHts4qEjv8GhQSwAtcC6/I94SWbr6D4aPXW5c=";
hash = "sha256-iUgOBF3vPfr3VCfUc+pASith7R6TA29AuWKCJfbHbQw=";
};
vendorHash = "sha256-DXCfuEGMmcbVcV2LBa6oPMPDtkbkomdgbV4LlMV9qe8=";
vendorHash = "sha256-EwPbZLcqJV5J7ieoQwAJLIn4wwMlwZoTtWaXgvY3pR0=";
subPackages = [
"cmd/fleet"
pkgs/by-name/fo/foundry/package.nix
+1 -2
View File
@@ -7,7 +7,6 @@
nix-update-script,
pkg-config,
rustPlatform,
solc,
versionCheckHook,
}:
@@ -29,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
buildInputs = [ solc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libusb1 ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libusb1 ];
# Tests are run upstream, and many perform I/O
# incompatible with the nix build sandbox.
pkgs/by-name/ge/gemini-cli-bin/package.nix
+2 -2
View File
@@ -8,11 +8,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "gemini-cli-bin";
version = "0.22.4";
version = "0.22.5";
src = fetchurl {
url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
hash = "sha256-7Dy2/dkNCC/TaUEixP6iMegOh9SoeTHUn7K0VGi4Rwg=";
hash = "sha256-g6b45+EWBiZ6Ij0nXp0L5jBW8wv1y0KK5CgiThk8Y7U=";
};
dontUnpack = true;
pkgs/by-name/gt/gtkwave/package.nix
+2 -2
View File
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "gtkwave";
version = "3.3.125";
version = "3.3.126";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
sha256 = "sha256-Musd9N/Vbg3eF+igjeYPIBOK8BeoqK1kUi9pYnVixDc=";
sha256 = "sha256-llAZ10gpdGtdHTgqnPHiciRskRAdDhMfDaUSyUulgWo=";
};
nativeBuildInputs = [
pkgs/by-name/jo/john/package.nix
+3
View File
@@ -40,6 +40,9 @@ stdenv.mkDerivation {
})
];
# Fix build with gcc 15
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
postPatch = ''
sed -ri -e '
s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!
pkgs/by-name/li/libloot/package.nix
+7 -1
View File
@@ -119,7 +119,13 @@ stdenv.mkDerivation (finalAttrs: {
owner = "loot";
repo = "yaml-cpp";
tag = "0.8.0+merge-key-support.2";
hash = "sha256-whYorebrLiDeO75LC2SMUX/8OD528BR0+DEgnJxxpoQ=";
# fixes error: 'uint16_t' was not declared in this scope
postFetch = ''
sed -e '1i #include <cstdint>' -i "$out/src/emitterutils.cpp"
'';
hash = "sha256-5xbqOI4L3XCqx+4k6IcZUwOdHAfbBy7nZgRKGkRJabQ=";
};
buildRustFFIPackage =
pkgs/by-name/li/libstrophe/package.nix
+7
View File
@@ -22,10 +22,17 @@ stdenv.mkDerivation rec {
hash = "sha256-53O8hHyw9y0Bzs+BpGouAxuSGJxh6NSNNWZqi7RHAsY=";
};
patches = [
# Newer GCC rejects implicitly weak-typed pointer casting.
# Upstream PR: https://github.com/strophe/libstrophe/pull/267
./pointer-cast.patch
];
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
openssl
expat
pkgs/by-name/li/libstrophe/pointer-cast.patch
+65
View File
@@ -0,0 +1,65 @@
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/li/linux-wifi-hotspot/package.nix
+8
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
which,
pkg-config,
glib,
@@ -50,6 +51,13 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [ "out" ];
patches = [
(fetchpatch {
url = "https://github.com/lakinduakash/linux-wifi-hotspot/commit/a3fce4b3ee9371eeb7b300fa7e9f291d93986db3.patch";
hash = "sha256-tvWoYvQELYVq1Cr6NG+9kafYFHZloNMuOvaPeIbYlSI=";
})
];
postPatch = ''
substituteInPlace ./src/scripts/Makefile \
--replace "etc" "$out/etc"
pkgs/by-name/lr/lrs/fix-signal-handler-type.patch
+43
View File
@@ -0,0 +1,43 @@
diff '--color=auto' -u -r a/lrslib.c b/lrslib.c
--- a/lrslib.c
+++ b/lrslib.c
@@ -84,10 +84,10 @@
/* signals handling */
/*******************************/
#ifndef SIGNALS
-static void checkpoint ();
-static void die_gracefully ();
+static void checkpoint (int);
+static void die_gracefully (int);
static void setup_signals (void);
-static void timecheck ();
+static void timecheck (int);
#endif
/*******************************/
@@ -6368,7 +6368,7 @@
}
static void
-timecheck ()
+timecheck (int)
{
lrs_dump_state ();
errcheck ("signal", signal (SIGALRM, timecheck));
@@ -6376,14 +6376,14 @@
}
static void
-checkpoint ()
+checkpoint (int)
{
lrs_dump_state ();
errcheck ("signal", signal (SIGUSR1, checkpoint));
}
static void
-die_gracefully ()
+die_gracefully (int)
{
lrs_dump_state ();
pkgs/by-name/lr/lrs/package.nix
+5
View File
@@ -14,6 +14,11 @@ stdenv.mkDerivation {
sha256 = "sha256-xJpOvYVhg0c9HVpieF/N/hBX1dZx1LlvOhJQ6xr+ToM=";
};
patches = [
# fix passing argument 2 of 'signal' from incompatible pointer type error
./fix-signal-handler-type.patch
];
buildInputs = [ gmp ];
makeFlags = [
pkgs/by-name/ma/mani/package.nix
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "mani";
version = "0.31.1";
version = "0.31.2";
src = fetchFromGitHub {
owner = "alajmo";
repo = "mani";
tag = "v${finalAttrs.version}";
sha256 = "sha256-GB9BlicNiExDUi9s4PdvsqFHqwvekme/Usqp6I/k5kc=";
sha256 = "sha256-vQpwU+zU4xplN2Rp1v/uXIWgIYRb47s/HWREyHH226k=";
};
vendorHash = "sha256-PnQocOtnIBl0+5mDG7irEqGjAnzJ9Wk/fA4NW/nU+zw=";
vendorHash = "sha256-Ob3yD7UblWMRc7EyvEStrLStTT3wV/XssUPTos/olyI=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/ma/matrix-tuwunel/package.nix
+3 -3
View File
@@ -88,16 +88,16 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-tuwunel";
version = "1.4.8";
version = "1.4.9.1";
src = fetchFromGitHub {
owner = "matrix-construct";
repo = "tuwunel";
tag = "v${finalAttrs.version}";
hash = "sha256-NKq5bEn40nHIewmaVPQ2aFJEZ4jkmnXDAZ/lL3rD8iQ=";
hash = "sha256-Hm0k6N8nSj3nRsppqledtXOKlnWBwG1SjpB4IE5R4vk=";
};
cargoHash = "sha256-7BC8I3urT9/fArVm9Ji5U0jzAqovUE914jgZz8ejiUk=";
cargoHash = "sha256-uXZyAXajWstZ8+fm9BC5ru2BVAXx+vYoe1GXivCOY/8=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/mm/mmixware/package.nix
+7 -3
View File
@@ -23,9 +23,13 @@ stdenv.mkDerivation {
substituteInPlace Makefile --replace 'rm abstime.h' ""
'';
# Workaround build failure on -fno-common toolchains:
# ld: mmix-config.o:(.bss+0x600): multiple definition of `buffer'; /build/ccDuGrwH.o:(.bss+0x20): first defined here
env.NIX_CFLAGS_COMPILE = "-fcommon";
env.NIX_CFLAGS_COMPILE = toString [
# Workaround build failure on -fno-common toolchains:
# ld: mmix-config.o:(.bss+0x600): multiple definition of `buffer'; /build/ccDuGrwH.o:(.bss+0x20): first defined here
"-fcommon"
# Workaround to build with GCC 15
"-std=gnu17"
];
nativeBuildInputs = [ tetex ];
enableParallelBuilding = true;
pkgs/by-name/mo/mongosh/package.nix
+2 -1
View File
@@ -2,9 +2,10 @@
lib,
buildNpmPackage,
fetchFromGitHub,
nodejs_22,
}:
buildNpmPackage (finalAttrs: {
buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: {
pname = "mongosh";
version = "2.5.10";
pkgs/by-name/nc/ncps/package.nix
+2 -2
View File
@@ -100,13 +100,13 @@ let
finalAttrs = {
pname = "ncps";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "kalbasit";
repo = "ncps";
tag = "v${finalAttrs.version}";
hash = "sha256-dPCzfy29wjRL5eXaueM8qLtKMmsNcwTqtSDBNOJ4NMc=";
hash = "sha256-uGghoADkD2eJYZwt8QSiVzw68dRDLI+OxMa1VAQhBKQ=";
};
ldflags = [
pkgs/by-name/ne/nethack/function-parameters.patch
+86
View File
@@ -0,0 +1,86 @@
diff --git a/include/system.h b/include/system.h
index a2cb51f..9f40fdd 100644
--- a/include/system.h
+++ b/include/system.h
@@ -60,17 +60,17 @@ typedef long off_t;
#endif
#ifndef SIG_RET_TYPE
#if defined(NHSTDC) || defined(POSIX_TYPES) || defined(OS2) || defined(__DECC)
-#define SIG_RET_TYPE void (*)()
+#define SIG_RET_TYPE void (*)(int)
#endif
#endif
#ifndef SIG_RET_TYPE
#if defined(ULTRIX) || defined(SUNOS4) || defined(SVR3) || defined(SVR4)
/* SVR3 is defined automatically by some systems */
-#define SIG_RET_TYPE void (*)()
+#define SIG_RET_TYPE void (*)(int)
#endif
#endif
#ifndef SIG_RET_TYPE /* BSD, SIII, SVR2 and earlier, Sun3.5 and earlier */
-#define SIG_RET_TYPE int (*)()
+#define SIG_RET_TYPE int (*)(int)
#endif
#if !defined(__cplusplus) && !defined(__GO32__)
@@ -96,7 +96,7 @@ E long NDECL(lrand48);
E void FDECL(srand48, (long));
#else
E long lrand48();
-E void srand48();
+E void srand48(long);
#endif /* MACOSX */
#endif /* BSD || ULTRIX || RANDOM */
@@ -352,10 +352,10 @@ E char *FDECL(memset, (char *, int, int));
#endif /* MICRO */
#if defined(BSD) && defined(ultrix) /* i.e., old versions of Ultrix */
-E void sleep();
+E void sleep(unsigned);
#endif
#if defined(ULTRIX) || defined(SYSV)
-E unsigned sleep();
+E unsigned sleep(unsigned);
#endif
#if defined(HPUX)
E unsigned int FDECL(sleep, (unsigned int));
@@ -519,7 +519,7 @@ E char *FDECL(tgoto, (const char *, int, int));
#else
#if !(defined(HPUX) && defined(_POSIX_SOURCE))
E int FDECL(tgetent, (char *, const char *));
-E void FDECL(tputs, (const char *, int, int (*)()));
+E void FDECL(tputs, (const char *, int, int (*)(int)));
#endif
E int FDECL(tgetnum, (const char *));
E int FDECL(tgetflag, (const char *));
diff --git a/include/winX.h b/include/winX.h
index a1a5605..1d6b84b 100644
--- a/include/winX.h
+++ b/include/winX.h
@@ -279,7 +279,7 @@ typedef struct {
} AppResources;
E AppResources appResources;
-E void (*input_func)();
+E void (*input_func)(Widget, XEvent *, String *, Cardinal *);
extern struct window_procs X11_procs;
diff --git a/include/xwindow.h b/include/xwindow.h
index 8b9cfa0..8307c25 100644
--- a/include/xwindow.h
+++ b/include/xwindow.h
@@ -76,8 +76,10 @@
#define XtNexposeCallback "exposeCallback"
#define XtNresizeCallback "resizeCallback"
-extern XFontStruct *WindowFontStruct(/* Widget */);
-extern Font WindowFont(/* Widget */);
+struct Widget;
+
+extern XFontStruct *WindowFontStruct(Widget);
+extern Font WindowFont(Widget);
#define XtCWindowResource "WindowResource"
#define XtCRows "Rows"
pkgs/by-name/ne/nethack/package.nix
+5
View File
@@ -67,6 +67,11 @@ stdenvUsed.mkDerivation (finalAttrs: {
hash = "sha256-mM9n323r+WaKYXRaqEwJvKs2Ll0z9blE7FFV1E0qrLI=";
};
patches = [
# Newer GCC rejects function declarations without explicit parameters.
./function-parameters.patch
];
buildInputs = [
ncurses
]
pkgs/by-name/ne/nezha/package.nix
+3 -3
View File
@@ -48,13 +48,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "nezha";
version = "1.14.10";
version = "1.14.12";
src = fetchFromGitHub {
owner = "nezhahq";
repo = "nezha";
tag = "v${finalAttrs.version}";
hash = "sha256-tgjLkNSNEQCJP1/Pcgfldl5DGQnzca6KMrqEjl45ex4=";
hash = "sha256-gNXbg5JaHHogJaRGmAjOXskrbkSRu1fnIqQMu8U3lzk=";
};
proxyVendor = true;
@@ -94,7 +94,7 @@ buildGoModule (finalAttrs: {
GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false
'';
vendorHash = "sha256-Q+ur9hIG0xVJHdi79K5e4sV8xuR45qp195ptEDbHAvc=";
vendorHash = "sha256-9vJzQqXkoENRapcHp/afSCcdOrt8bxrIyJT/cBeas+A=";
ldflags = [
"-s"
pkgs/by-name/ri/ride/package.nix
+2 -3
View File
@@ -3,7 +3,6 @@
stdenv,
buildNpmPackage,
fetchFromGitHub,
fetchpatch,
replaceVars,
jq,
moreutils,
@@ -25,7 +24,7 @@ buildNpmPackage rec {
hash = "sha256-11wlKK0z3/KRKMKNrDvZLvK7vV0UzrMTaG0ei9n6VEk=";
};
npmDepsHash = "sha256-1+RjSr5FSaQFqkL/yzlAQhm56NVG2kjzZC/DsEi3HJE=";
npmDepsHash = "sha256-o8pwjx5P/1eFV3HTWlHGV1/ad9YUSOI0zUWvqkqIf3I=";
patches = [
# Fix info in the "about" page, enable asar, add option to build for the detected system
@@ -33,7 +32,7 @@ buildNpmPackage rec {
inherit version;
})
# would not build with nodejs_22 and above without this
# would not build with nodejs_24 and above without this
./update-nan.patch
];
pkgs/by-name/ri/ride/update-nan.patch
+9 -9
View File
@@ -1,31 +1,31 @@
diff --git a/package-lock.json b/package-lock.json
index a0bd285..5a5ec59 100644
index cc8b8bd..13b4bed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8034,9 +8034,10 @@
@@ -8190,9 +8190,10 @@
"dev": true
},
"node_modules/nan": {
- "version": "2.17.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+ "version": "2.22.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+ "version": "2.24.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.24.0.tgz",
+ "integrity": "sha512-Vpf9qnVW1RaDkoNKFUvfxqAbtI8ncb8OJlqZ9wwpXzWPEsvsB1nvdUi6oYrHIkQ1Y/tMDnr1h4nczS0VB9Xykg==",
+ "license": "MIT",
"optional": true
},
"node_modules/nanomatch": {
@@ -18258,9 +18259,9 @@
@@ -18572,9 +18573,9 @@
"dev": true
},
"nan": {
- "version": "2.17.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+ "version": "2.22.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+ "version": "2.24.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.24.0.tgz",
+ "integrity": "sha512-Vpf9qnVW1RaDkoNKFUvfxqAbtI8ncb8OJlqZ9wwpXzWPEsvsB1nvdUi6oYrHIkQ1Y/tMDnr1h4nczS0VB9Xykg==",
"optional": true
},
"nanomatch": {
pkgs/by-name/sh/shntool/bool-type.patch
+48
View File
@@ -0,0 +1,48 @@
diff --git a/include/format.h b/include/format.h
index 567993e..ab293f8 100644
--- a/include/format.h
+++ b/include/format.h
@@ -35,7 +35,7 @@ void tagcpy(unsigned char *,unsigned char *);
int tagcmp(unsigned char *,unsigned char *);
/* function to check if a file name is about to be clobbered, and if so, asks whether this is OK */
-int clobber_check(char *);
+bool clobber_check(char *);
/* find an output format module with the given name */
format_module *find_format(char *);
diff --git a/include/mode.h b/include/mode.h
index a9c8cd0..fc13d4f 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -78,7 +78,7 @@ void create_output_filename(char *,char *,char *);
FILE *open_output_stream(char *,proc_info *);
/* function to determine if two filenames point to the same file */
-int files_are_identical(char *,char *);
+bool files_are_identical(char *,char *);
/* function to remove a file if it exists */
void remove_file(char *);
diff --git a/include/module-types.h b/include/module-types.h
index c49c661..2d7b0a3 100644
--- a/include/module-types.h
+++ b/include/module-types.h
@@ -23,6 +23,8 @@
#ifndef __MODULE_TYPES_H__
#define __MODULE_TYPES_H__
+#include <stdbool.h>
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -44,8 +46,6 @@
#define PATHSEPCHAR '/'
#endif
-/* boolean type */
-typedef int bool;
/* wtypes */
typedef unsigned long wlong;
pkgs/by-name/sh/shntool/function-pointer-type.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/src/core_mode.c b/src/core_mode.c
index d67e317..21d3b9e 100644
--- a/src/core_mode.c
+++ b/src/core_mode.c
@@ -564,17 +564,17 @@ static int compare_ascii(const wave_info **w1,const wave_info **w2)
static void ascii_sort_files(wave_info **filenames, int numfiles)
{
- int (*cmpfunc) ();
+ int (*cmpfunc) (const void *, const void *);
- cmpfunc = compare_ascii;
+ cmpfunc = (int (*)(const void *, const void *))compare_ascii;
qsort(filenames,numfiles,sizeof(wave_info *),cmpfunc);
}
static void version_sort_files(wave_info **filenames,int numfiles)
{
- int (*cmpfunc) ();
+ int (*cmpfunc) (const void *, const void *);
- cmpfunc = compare_version;
+ cmpfunc = (int (*)(const void *, const void *))compare_version;
qsort(filenames,numfiles,sizeof(wave_info *),cmpfunc);
}
pkgs/by-name/sh/shntool/package.nix
+15 -5
View File
@@ -5,7 +5,7 @@
flac,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
version = "3.0.10+git20130108.4ca41f4-1";
pname = "shntool";
@@ -13,16 +13,26 @@ stdenv.mkDerivation rec {
domain = "salsa.debian.org";
owner = "debian";
repo = "shntool";
rev = "debian/${version}";
rev = "debian/${finalAttrs.version}";
sha256 = "sha256-Qn4LwVx34EhypiZDIxuveNhePigkuiICn1nBukoQf5Y=";
};
buildInputs = [ flac ];
patches = [
# Fix conflicts between reserved keywords `bool` (starting from C23) and custom `typedef`s.
./bool-type.patch
# Fix implicit weak-typed pointer casting.
./function-pointer-type.patch
];
prePatch = ''
patches=$(grep -v '#' ./debian/patches/series | while read patch; do echo "./debian/patches/$patch"; done | tr '\n' ' ')
additional_patches=$(grep -v '#' ./debian/patches/series | while read patch; do echo "./debian/patches/$patch"; done | tr '\n' ' ')
patches="$patches $additional_patches"
'';
buildInputs = [
flac
];
meta = {
description = "Multi-purpose WAVE data processing and reporting utility";
homepage = "https://packages.qa.debian.org/s/shntool.html";
@@ -30,4 +40,4 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ jcumming ];
};
}
})
pkgs/by-name/sm/smpmgr/package.nix
+2 -2
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "smpmgr";
version = "0.16.0";
version = "0.17.0";
pyproject = true;
src = fetchFromGitHub {
owner = "intercreate";
repo = "smpmgr";
tag = version;
hash = "sha256-woQ8NxHZ9lYKvEFjGbvBu7/949bzAV6hs9t/3+N7bJc=";
hash = "sha256-EWvTt0bfkHA+E9nkoI8u17j6zevbDofGUxHpFXoUGyo=";
};
build-system = with python3Packages; [
pkgs/by-name/su/surrealdb/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "surrealdb";
version = "2.3.10";
version = "2.4.0";
src = fetchFromGitHub {
owner = "surrealdb";
repo = "surrealdb";
tag = "v${finalAttrs.version}";
hash = "sha256-0j1AzdSbeIyyHtK7zFL1JWDat8cry0z+VD5toCX0RmY=";
hash = "sha256-I9TVV+gSn/VCId0Ar3Yn9NWLw6GPOJvwPi8RIedIQ0U=";
};
cargoHash = "sha256-ep04Nt3pIQVnFPuauzuk0YMQGMJOqlT0rWFOEmBVkPY=";
cargoHash = "sha256-aZb2+6Xnn7gq4Lwo411yBfOFlo3YabkdewYNJ2TGbzo=";
# error: linker `aarch64-linux-gnu-gcc` not found
postPatch = ''
pkgs/by-name/te/television/package.nix
+18 -8
View File
@@ -43,16 +43,26 @@ let
postInstall = ''
installManPage target/${stdenv.hostPlatform.rust.cargoShortTarget}/assets/tv.1
# These are actually shell integrations with keybindings
install -Dm644 television/utils/shell/completion.* -t $out/share/television/
''
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd tv \
--bash <($out/bin/tv init bash) \
--fish <($out/bin/tv init fish) \
--zsh <($out/bin/tv init zsh) \
--nushell <($out/bin/tv init nu)
mkdir -p $out/share/television
for shell in bash zsh fish; do
"$out/bin/tv" init $shell > completion.$shell
# split shell completion and shell integration
awk -v C=completion_pure.$shell -v D=$out/share/television/completion.$shell '
NR==FNR { key=$0; nextfile }
{
if (!found && index($0, key)) found=1
print > (found ? D : C)
}
' television/utils/shell/completion.$shell completion.$shell
installShellCompletion --cmd tv completion_pure.$shell
done
# nushell doesn't contain regular completion for now
"$out/bin/tv" init nu > $out/share/television/completion.nu
'';
passthru = {
pkgs/by-name/tr/trilium-desktop/package.nix
+1 -1
View File
@@ -42,7 +42,7 @@ let
meta = {
description = "Hierarchical note taking application with focus on building large personal knowledge bases";
homepage = "https://github.com/TriliumNext/Notes";
homepage = "https://triliumnotes.org/";
license = lib.licenses.agpl3Plus;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [
pkgs/by-name/ty/typescript-go/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@ let
in
buildGoModule {
pname = "typescript-go";
version = "0-unstable-2025-12-19";
version = "0-unstable-2025-12-28";
src = fetchFromGitHub {
owner = "microsoft";
repo = "typescript-go";
rev = "d9178cc1fef3cedc3c1a48a652e63dd83310ea20";
hash = "sha256-W6EIyS/EpqkN45vK30qrS7dc2zMUsjkrDGzMJ4eHADE=";
rev = "1611cc951fa772cfca09c38fe2d981f6da5d20b8";
hash = "sha256-lFyHFg6u0G6E5fEOYt/N55LrLOHDCiZ6OA+NAZABkGE=";
fetchSubmodules = false;
};
pkgs/by-name/um/umami/package.nix
+2 -12
View File
@@ -95,18 +95,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
version
src
;
# prevent downloading dependencies for windows
# which bloat derivation size and fail to build on hydra
# https://github.com/NixOS/nixpkgs/pull/467820#issuecomment-3624054271
pnpmInstallFlags = [
"--force=false"
"--os=linux"
"--os=darwin"
"--cpu=x64"
"--cpu=arm64"
];
fetcherVersion = 2;
hash = "sha256-bqeJ0wzCtnuR6V67Qe1N9UcaHPLziuBhsn7eN8JVJbQ=";
fetcherVersion = 3;
hash = "sha256-GFN94oySPCZA5K13XR8f/tByuHS571ohlYTFqaVw/Ns=";
};
env.CYPRESS_INSTALL_BINARY = "0";
pkgs/by-name/un/units/package.nix
+4 -1
View File
@@ -21,6 +21,9 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-HlAsTt+s8gspKEcWxy5d21GklaI2XXsD55YElMSgyQI=";
};
# Until upstream updates their code to work with GCC 15.
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
outputs = [
"out"
"info"
@@ -71,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = with lib.licenses; [ gpl3Plus ];
mainProgram = "units";
maintainers = [ ];
maintainers = with lib.maintainers; [ galen ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/va/vacuum-go/package.nix
+3 -3
View File
@@ -7,17 +7,17 @@
buildGoModule (finalAttrs: {
pname = "vacuum-go";
version = "0.21.7";
version = "0.23.0";
src = fetchFromGitHub {
owner = "daveshanley";
repo = "vacuum";
# using refs/tags because simple version gives: 'the given path has multiple possibilities' error
tag = "v${finalAttrs.version}";
hash = "sha256-eTwoK/AysxoTId6IM76b/euyYEE/9cwXcbDcm4wLjM0=";
hash = "sha256-WVseXIGUwvoBCVWqM5+OQTkReS8/K1Bq2pDs+n9r7Nk=";
};
vendorHash = "sha256-aTQEt1vBdzwOE99CHmCkodvGReR30Jq7iWkMtwK3620=";
vendorHash = "sha256-9Gu1FarlMZthq9PYCU3DsCCR+Uxii05ePfcPZIQJhtQ=";
env.CGO_ENABLED = 0;
ldflags = [
pkgs/by-name/ve/vector/package.nix
+5
View File
@@ -61,6 +61,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
zlib
];
# Fix build with gcc 15
# https://github.com/vectordotdev/vector/issues/22888
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
# Without this, we get SIGSEGV failure
RUST_MIN_STACK = 33554432;
@@ -130,6 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
changelog = "https://github.com/vectordotdev/vector/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [
adamcstephens
thoughtpolice
happysalada
];
pkgs/by-name/wi/windmill/package.nix
+4 -4
View File
@@ -47,13 +47,13 @@
let
pname = "windmill";
version = "1.601.0";
version = "1.601.1";
src = fetchFromGitHub {
owner = "windmill-labs";
repo = "windmill";
rev = "v${version}";
hash = "sha256-yaIQFK3ECP8DccfwaaMwAEisnzM5JijznDsY6mRBNHA=";
hash = "sha256-3Djrk8gHW3NjNzSy4A38LmTfl18LKDKgFeNMBPKlhfM=";
};
in
rustPlatform.buildRustPackage (finalAttrs: {
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
RUSTY_V8_ARCHIVE = librusty_v8;
};
cargoHash = "sha256-b+qSk2DgVJkWeSB+qXosVtMOM+kUobmYB5Av68/tr68=";
cargoHash = "sha256-ivfseD1zWcy4P8Anbo/e1r2rRma/6mj25blkrXpwNHE=";
buildFeatures = [
"agent_worker_server"
@@ -195,7 +195,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
sourceRoot = "${src.name}/frontend";
npmDepsHash = "sha256-4Sy7C9zzVjw4HIHFFWKfhMUtn97XWyNBDaWAV4WicK4=";
npmDepsHash = "sha256-eVN7q8hRH7NYjZiE5dLRMUKlyrtnAPGPdYV6/S4Sc+4=";
# without these you get a
# FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory
pkgs/by-name/wi/windmill/ui_builder.nix
+2 -2
View File
@@ -2,7 +2,7 @@
{ fetchzip }:
fetchzip {
url = "https://pub-06154ed168a24e73a86ab84db6bf15d8.r2.dev/ui_builder-9e76079.tar.gz";
sha256 = "1lxbfqfx8dhrf585gfh7x7098nbmyarja94cjp43sygvp4c6yw4g";
url = "https://pub-06154ed168a24e73a86ab84db6bf15d8.r2.dev/ui_builder-7a79f03.tar.gz";
sha256 = "1r5dkymjlqngwvpiv11pr0sdhkw0wp4jg0rhrwzczl3jjnc2azwq";
stripRoot = false;
}
pkgs/by-name/xl/xl2tpd/package.nix
+2
View File
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -std=gnu17";
meta = {
homepage = src.meta.homepage;
description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)";
pkgs/by-name/xs/xsane/package.nix
+9 -1
View File
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
{ name, hash }:
fetchpatch {
inherit name hash;
url = "https://src.fedoraproject.org/rpms/xsane/raw/846ace0a29063335c708b01e9696eda062d7459c/f/${name}";
url = "https://src.fedoraproject.org/rpms/xsane/raw/67c7f6591398ab46f71ba4f0eb33cb0539e56a4b/f/${name}";
};
in
map fetchFedoraPatch [
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
name = "0001-Follow-new-convention-for-registering-gimp-plugin.patch";
hash = "sha256-yOY7URyc8HEHHynvdcZAV1Pri31N/rJ0ddPavOF5zLw=";
}
{
name = "0001-replace-gtk_timeout-with-g_timeout.patch";
hash = "sha256-OMeukfbpagK05HI2R/2Gxrvk2nfrDK8ZmLmw0a6o10k=";
}
{
name = "xsane-0.995-close-fds.patch";
hash = "sha256-qE7larHpBEikz6OaOQmmi9jl6iQxy/QM7iDg9QrVV1o=";
@@ -107,6 +111,10 @@ stdenv.mkDerivation rec {
name = "xsane-configure-c99.patch";
hash = "sha256-ukaNGgzCGiQwbOzSguAqBIKOUzXofSC3lct812U/8gY=";
}
{
name = "xsane-gcc15-c23.patch";
hash = "sha256-a1ZkVufpbwqL/bCFE2w44PoR42chl8aoRqeOP6L74Uw=";
}
];
preConfigure = ''
pkgs/by-name/zi/zigbee2mqtt/package.nix
+3 -3
View File
@@ -14,20 +14,20 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zigbee2mqtt";
version = "2.7.1";
version = "2.7.2";
src = fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
tag = finalAttrs.version;
hash = "sha256-aKLgp8/BkxBu2lQwFeG4VhjzN9/X8sYuhILXjUreZBQ=";
hash = "sha256-eIuIWjLsjpvgIgnQC3opsSYc34GD5vLvPvO7DhKyVFA=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 1;
hash = "sha256-XHDSjjYt/wbCdafLQ73dxDD+1ClbFtI7NejS9h5SNmE=";
hash = "sha256-HOYGJzcLyrvhhYnIIwhLiSiYyDdEob3+LNdlfmbspeQ=";
};
nativeBuildInputs = [
pkgs/development/compilers/binaryen/default.nix
+12
View File
@@ -4,6 +4,7 @@
cmake,
python3,
fetchFromGitHub,
fetchpatch2,
emscripten,
gtest,
lit,
@@ -29,6 +30,17 @@ stdenv.mkDerivation rec {
hash = "sha256-QG8ZhvjcTbhIfYkVfrjxd97v9KaG/A8jO69rPg99/ME=";
};
patches = [
# TODO: remove at next release
# fix build on aarch64/riscv64 with gcc15 but bug exists on all platforms.
(fetchpatch2 {
name = "fix-uninitialized-small-vector.patch";
# https://github.com/WebAssembly/binaryen/pull/8094
url = "https://github.com/WebAssembly/binaryen/commit/3ff3762bf7c83edcdfccad522de640f2b0928ae2.patch?full_index=1";
hash = "sha256-lhrXQJAaQ/4ofnpyVqhD08IuDxPRc7UPyZ8DoCfM9NE=";
})
];
nativeBuildInputs = [
cmake
python3
pkgs/development/python-modules/bloodyad/default.nix
+2 -2
View File
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "bloodyad";
version = "2.5.1";
version = "2.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "CravateRouge";
repo = "bloodyAD";
tag = "v${version}";
hash = "sha256-qz7jhFBkJdIDnnGOz4SvDI/YcSXdP7B1FPKxaGRJRWE=";
hash = "sha256-RWh73ZlzvTn1nGjQm9Keacvgm0AP0MGCYo/fM45nsmk=";
};
pythonRelaxDeps = [ "cryptography" ];
pkgs/development/python-modules/paddlepaddle/default.nix
+14 -6
View File
@@ -13,7 +13,7 @@
zlib,
setuptools,
cudaSupport ? config.cudaSupport or false,
cudaPackages_12_9,
cudaPackages,
addDriverRunpath,
# runtime dependencies
httpx,
@@ -23,6 +23,7 @@
decorator,
astor,
opt-einsum,
rdma-core,
safetensors,
typing-extensions,
}:
@@ -33,15 +34,20 @@ let
version = sources.version;
format = "wheel";
pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}";
cpuOrGpu = if cudaSupport then "gpu" else "cpu";
hash =
sources."${stdenv.hostPlatform.system}"."${cpuOrGpu}"."${pyShortVersion}"
or (throw "${pname} has no sources.nix entry for '${stdenv.hostPlatform.system}.${cpuOrGpu}.${pyShortVersion}' attribute");
if cudaSupport then
sources."${stdenv.hostPlatform.system}"."gpu"."cu${
lib.replaceStrings [ "." ] [ "" ] cudaPackages.cudatoolkit.version
}"."${pyShortVersion}"
else
sources."${stdenv.hostPlatform.system}"."cpu"."${pyShortVersion}";
platform = sources."${stdenv.hostPlatform.system}".platform;
src =
if cudaSupport then
(fetchurl {
url = "https://paddle-whl.bj.bcebos.com/stable/cu129/paddlepaddle-gpu/paddlepaddle_gpu-${version}-${pyShortVersion}-${pyShortVersion}-linux_x86_64.whl";
url = "https://paddle-whl.bj.bcebos.com/stable/cu${
lib.replaceStrings [ "." ] [ "" ] cudaPackages.cudatoolkit.version
}/paddlepaddle-gpu/paddlepaddle_gpu-${version}-${pyShortVersion}-${pyShortVersion}-linux_x86_64.whl";
inherit hash;
})
else
@@ -73,6 +79,8 @@ buildPythonPackage {
]
++ lib.optionals cudaSupport [ autoPatchelfHook ];
buildInputs = lib.optionals cudaSupport [ rdma-core ];
dependencies = [
setuptools
httpx
@@ -101,7 +109,7 @@ buildPythonPackage {
(lib.getLib stdenv.cc.cc)
]
++ lib.optionals cudaSupport (
with cudaPackages_12_9;
with cudaPackages;
[
cudatoolkit.lib
cudatoolkit.out
pkgs/development/python-modules/paddlepaddle/sources.nix
+12 -2
View File
@@ -7,8 +7,18 @@
cp313 = "sha256-xPSFWWpobqcqsN3/yeQRePRWMUqZ1FOPXRgaAVapJ/o=";
};
gpu = {
cp312 = "sha256-t2beVNEfz+JcesM5+i9BVNKKXIsI3zvz1VrTSd/79+c=";
cp313 = "sha256-0thm6aAGpqSLfJdI0MZKuJPn2e4CsNU5S19ohzkukSs=";
cu126 = {
cp312 = "sha256-gY5/W2BR9+wVcPKdi5gZiHNH/t/rCv2g76rJ0E1wRt4=";
cp313 = "sha256-CRNQl+8pRVbfJX172H2KNgsAeSiX+AYHoilMcw1pPXw=";
};
cu129 = {
cp312 = "sha256-t2beVNEfz+JcesM5+i9BVNKKXIsI3zvz1VrTSd/79+c=";
cp313 = "sha256-0thm6aAGpqSLfJdI0MZKuJPn2e4CsNU5S19ohzkukSs=";
};
cu130 = {
cp312 = "sha256-70uOCNrFH9QB9G/0e5aAufBHPthJOjoJt39uprt68sE=";
cp313 = "sha256-+aNoFQgqsrN9Jtqf0uChifIAacmbDdf8JkqjOqMsFpU=";
};
};
};
aarch64-linux = {
pkgs/development/python-modules/paddlepaddle/update.sh
+5 -3
View File
@@ -15,7 +15,9 @@ for system in $systems; do
done
done
for pythonPackages in "python313Packages" "python312Packages"; do
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . pkgsCuda.$pythonPackages.paddlepaddle.src.url --system x86_64-linux)))
update-source-version pkgsCuda.$pythonPackages.paddlepaddle $latestVersion $hash --file=pkgs/development/python-modules/paddlepaddle/sources.nix --system=x86_64-linux --ignore-same-version --ignore-same-hash
for cuda in "12_6" "12_9" "13_0"; do
for pythonPackages in "python313Packages" "python312Packages"; do
hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . pkgsCuda.cudaPackages_${cuda}.pkgs.$pythonPackages.paddlepaddle.src.url --system x86_64-linux)))
update-source-version pkgsCuda.cudaPackages_${cuda}.pkgs.$pythonPackages.paddlepaddle $latestVersion $hash --file=pkgs/development/python-modules/paddlepaddle/sources.nix --system=x86_64-linux --ignore-same-version --ignore-same-hash
done
done
pkgs/development/python-modules/trezor/default.nix
+3
View File
@@ -46,6 +46,9 @@ buildPythonPackage rec {
]
++ lib.optionals stdenv.hostPlatform.isLinux [ trezor-udev-rules ];
# fix "click<8.2,>=7 not satisfied by version 8.3.1"
pythonRelaxDeps = [ "click" ];
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [
pkgs/development/python-modules/unstructured/default.nix
+2 -2
View File
@@ -116,7 +116,7 @@
grpcio,
}:
let
version = "0.18.22";
version = "0.18.24";
in
buildPythonPackage rec {
pname = "unstructured";
@@ -127,7 +127,7 @@ buildPythonPackage rec {
owner = "Unstructured-IO";
repo = "unstructured";
tag = version;
hash = "sha256-m5sBFra/7qjJ/mBq+r7HA+ZURGpiaK1FzR9crL16jtQ=";
hash = "sha256-rB+PGRpJGQLJv6L4gzNLADIQhAApwfxWfHBYg2+dhoI=";
};
build-system = [ setuptools ];
pkgs/development/tools/parsing/flex/default.nix
+8 -1
View File
@@ -30,7 +30,14 @@ stdenv.mkDerivation rec {
url = "https://raw.githubusercontent.com/lede-project/source/0fb14a2b1ab2f82ce63f4437b062229d73d90516/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch";
sha256 = "0mpp41zdg17gx30kcpj83jl8hssks3adbks0qzbhcz882b9c083r";
})
];
]
++ (lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
(fetchurl {
name = "gcc-15.patch";
url = "https://github.com/westes/flex/commit/bf254c75b1e0d2641ebbd7fc85fb183f36a62ea7.patch";
hash = "sha256-Bnv23M2K1Qf7pEaEz0ueSNzTCdjMTDiMm+H7JaxUISs=";
})
]);
postPatch = ''
patchShebangs tests
pkgs/games/xonotic/default.nix
+2
View File
@@ -91,6 +91,8 @@ let
hash = "sha256-i5KseBz/SuicEhoj6s197AWiqr7azMI6GdGglYtAEqg=";
};
patches = [ ./fix-build-with-c23.patch ];
nativeBuildInputs = [ unzip ];
buildInputs = [
libjpeg
pkgs/games/xonotic/fix-build-with-c23.patch
+43
View File
@@ -0,0 +1,43 @@
---
dpsoftrast.c | 4 ----
qtypes.h | 7 +------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/dpsoftrast.c b/dpsoftrast.c
index fff29b8..1eda341 100644
--- a/dpsoftrast.c
+++ b/dpsoftrast.c
@@ -10,10 +10,6 @@
#pragma warning(disable : 4324)
#endif
-#ifndef __cplusplus
-typedef qboolean bool;
-#endif
-
#define ALIGN_SIZE 16
#define ATOMIC_SIZE 4
diff --git a/qtypes.h b/qtypes.h
index 6c09614..e6e277b 100644
--- a/qtypes.h
+++ b/qtypes.h
@@ -2,14 +2,9 @@
#ifndef QTYPES_H
#define QTYPES_H
-#undef true
-#undef false
+#include <stdbool.h>
-#ifndef __cplusplus
-typedef enum qboolean_e {false, true} qboolean;
-#else
typedef bool qboolean;
-#endif
#ifndef NULL
#define NULL ((void *)0)
--
2.50.1
pkgs/servers/home-assistant/custom-components/mypyllant/package.nix
-1
View File
@@ -1,7 +1,6 @@
{
buildHomeAssistantComponent,
fetchFromGitHub,
fetchpatch2,
lib,
# dependencies
pkgs/tools/package-management/nix/common-meson.nix
-11
View File
@@ -174,17 +174,6 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs --build tests
''
# The ability to chmod the root filesystem only exist in filesystem namespacing capable Nix interpreters.
# At the time of writing, only Linux can do it.
+ lib.optionalString stdenv.hostPlatform.isLinux ''
# The build system produces $HOME during the install check phase
# and will fail when ran without build user separation.
# This will surface as a FIFO synchronization deadlock.
# To avoid this, the $HOME directory is barred from being mkdir()
# by the build system here.
# https://github.com/NixOS/nix/issues/11295
chmod 555 /
'';
preConfigure =