nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 20:00:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-09-28 06:22:50 +00:00
committed by GitHub
parent 16eca43345 134009e975
commit 1f950b129d
32 changed files with 226 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@@ -14107,6 +14107,12 @@
github = "jooooscha";
githubId = 57965027;
};
joseg313 = {
name = "Jose Garcia";
email = "501jag3@gmail.com";
github = "joseg313";
githubId = 215610619;
};
josephschmitt = {
name = "Joseph Schmitt";
email = "dev@joe.sh";

6
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@@ -1436,13 +1436,13 @@
"vendorHash": null
},
"vancluever_acme": {
"hash": "sha256-9ODFjrawdF0XtmCjfelwSP+10RsYQMjTB2BBqracnos=",
"hash": "sha256-Fyq2N6nTEzQiaDd8vIAwLffZ2cirSMI/iYBYJ8xcbes=",
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
"owner": "vancluever",
"repo": "terraform-provider-acme",
"rev": "v3.1.2",
"rev": "v3.2.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-ZeO1E/9F9rco4p++pjzjiVWPCYQXdPeHWdtghZP6irY="
"vendorHash": "sha256-R8WSwsnBY82QUthwYZjJE2HmpI4mPX3CUEtYZrV+aDU="
},
"venafi_venafi": {
"hash": "sha256-tCjeApdanKPNEy7snb6QJoCvwjpNa2fdDryoD+7wn8Y=",

2
pkgs/by-name/ae/aerion-creds/package.nix
View File

@@ -6,7 +6,7 @@
let
# nixpkgs-update: no auto update
version = "0.3.4";
version = "0.3.5";
archMap = {
"x86_64-linux" = "x86_64";

8
pkgs/by-name/ae/aerion/package.nix
View File

@@ -15,13 +15,13 @@
}:
let
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "hkdb";
repo = "aerion";
rev = "v${version}";
hash = "sha256-uiAgd1Lk4MzPS3xRhOsn5zk4NwrPqmf+SRHVVNk5WxI=";
hash = "sha256-LeYOgP1aLWBB2lRkaBOMT3LfqXk0uuQxNnkKfooqWC8=";
};
frontend = buildNpmPackage {
@@ -30,7 +30,7 @@ let
sourceRoot = "${src.name}/frontend";
npmDepsHash = "sha256-Ni0/fr3fIym8E79IwsYUC0BkyZDcsM5WYQi6tx8SCWE=";
npmDepsHash = "sha256-a4N34fzmFMZoafX1rXUyeSAm12uV7njfhRkq3KT8h+I=";
buildPhase = ''
npm run build
@@ -49,7 +49,7 @@ buildGoModule {
__structuredAttrs = true;
vendorHash = "sha256-4zAFF4hlCrVWgvmmyoyZzBtgFd1pVRoFl8Wg0FbmM+g=";
vendorHash = "sha256-2NxgmklHScpcF4aOLPPzuVZZ2Qhmx/7SrCGnJtJ/x54=";
nativeBuildInputs = [
pkg-config

6
pkgs/by-name/au/autopsy/package.nix
View File

@@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "autopsy";
version = "4.22.1";
version = "4.23.1";
src = fetchzip {
url = "https://github.com/sleuthkit/autopsy/releases/download/autopsy-${finalAttrs.version}/autopsy-${finalAttrs.version}_v2.zip";
hash = "sha256-IHpUzwSXoghjixsPwpj3lMwHIby3+zx7BjzGRlAVcVs=";
url = "https://github.com/sleuthkit/autopsy/releases/download/autopsy-${finalAttrs.version}/autopsy-${finalAttrs.version}.zip";
hash = "sha256-4MADKow3FX0n4IzblWxcfNLfDKSkLDtIil24/QioF7U=";
};
nativeBuildInputs = [

6
pkgs/by-name/do/dotenvx/package.nix
View File

@@ -7,16 +7,16 @@
buildNpmPackage (finalAttrs: {
pname = "dotenvx";
version = "2.28.0";
version = "2.31.1";
src = fetchFromGitHub {
owner = "dotenvx";
repo = "dotenvx";
tag = "v${finalAttrs.version}";
hash = "sha256-fp5sse5KN4uitPjEqdkGpajpZbvRsUAIhCo/R59OBRI=";
hash = "sha256-So9UOsH+LDkvntW2Kv85zo/5StWGXQAuMDR1fBptwnA=";
};
npmDepsHash = "sha256-Cv75DDlilwa9PtgA7ZbdPfa0LfKGclfr5BsHT4+oqT0=";
npmDepsHash = "sha256-mzqlMkryWipKSkVJF5ROuaW3z9wiHqvlFxZ/Z35CPTU=";
dontNpmBuild = true;

6
pkgs/by-name/dt/dts-lsp/package.nix
View File

@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "dts-lsp";
version = "0.1.5";
version = "0.1.7";
src = fetchFromGitHub {
owner = "igor-prusov";
repo = "dts-lsp";
tag = finalAttrs.version;
hash = "sha256-8wMY0o8ceVl5UTsSpXf44gbX1ipSuR50cQTRng+MuNk=";
hash = "sha256-d2yiJ8vP3DuwnHGe4dq3B72XouW07We3zy4SSrKUoBo=";
};
cargoHash = "sha256-hZZcu3LaG4kkXJSF0uxHrdPB3YWB3hMv+jrMLMDp2aI=";
cargoHash = "sha256-533Eubyltz4aDpUNRB4s2wZQ1kAr7SrnMWntxnoNjHk=";
passthru.updateScript = nix-update-script { };

4
pkgs/by-name/fe/feh/package.nix
View File

@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "feh";
version = "3.13";
version = "3.13.1";
src = fetchFromGitHub {
owner = "derf";
repo = "feh";
rev = finalAttrs.version;
hash = "sha256-J/BK/jno8RUPqq+Ty2vaMGZb7I+RK7lh8tyQaKB8q7k=";
hash = "sha256-P3oak9wxsAsts8Is8rtl/WiVDiEu8pyVIR+i+bUH/8c=";
};
outputs = [

6
pkgs/by-name/fo/folia-major/package.nix
View File

@@ -23,7 +23,7 @@ in
buildNpmPackage (finalAttrs: {
pname = "folia-major";
version = "0.7.7";
version = "0.7.9";
strictDeps = true;
__structuredAttrs = true;
@@ -32,10 +32,10 @@ buildNpmPackage (finalAttrs: {
owner = "chthollyphile";
repo = "folia-major";
tag = "v${finalAttrs.version}";
hash = "sha256-ay1MUKhJLeVheoeJ8lXirsEbM/0Uz4OTwdYYk723twA=";
hash = "sha256-CVHEuUPonOMlSyP6fdiqFyPOpET1RPbuLkf7SKWaytU=";
};
npmDepsHash = "sha256-CG0t8PTmXsl5H8LERspigr6QzxyUPqrYwlYqMCMCN40=";
npmDepsHash = "sha256-cofR+a7hOZdWLtK1DimnKfNQ6qh7P6pH1RrVQAauOTw=";
nativeBuildInputs = [
makeWrapper

2
pkgs/by-name/gr/grpc/package.nix
View File

@@ -119,6 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Workaround for https://github.com/llvm/llvm-project/issues/48757
"-Wno-elaborated-enum-base"
# It exceeds our log size limit! (abseil-cpp deprecations probably)
"-Wno-deprecated-declarations"
]
);

6
pkgs/by-name/ma/matrix-continuwuity/package.nix
View File

@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-continuwuity";
version = "26.9.0";
version = "26.9.1";
src = fetchFromGitea {
domain = "forgejo.ellis.link";
owner = "continuwuation";
repo = "continuwuity";
tag = "v${finalAttrs.version}";
hash = "sha256-w/sFqEbvzNTbvR8eTeVT0qo/t0p/vlQUna1bPOqJs7E=";
hash = "sha256-z9iOdSjTvv+kDJaoAyKTzrY0ge2KM90H4tM8ir52RMQ=";
};
cargoHash = "sha256-ubIQNgn/FM++WkmnfDOVUpxfBCElIYJxvNMipwXbmIc=";
cargoHash = "sha256-dbTrgE0+OzHhD3rjQciZfRIBivvZa0YZyKpTP8XOzZI=";
nativeBuildInputs = [
pkg-config

6
pkgs/by-name/ne/neocmakelsp/package.nix
View File

@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "neocmakelsp";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "neocmakelsp";
repo = "neocmakelsp";
rev = "v${finalAttrs.version}";
hash = "sha256-61sTd3FIjoNKzOFp/Z6UUDa9NOWJPVal4Wf9UZ66gqU=";
hash = "sha256-AgwrIdEh2w92hr9SFnpOnsR48yTyInkD/6uaWeGc0mQ=";
};
cargoHash = "sha256-HYAVuWIFVp4Br3lDqb2r3xion2Rz6ChrgVIj3Z8wymE=";
cargoHash = "sha256-sZiGeo2OhnyvwwSd86WGVo3UAZKLQt2g9zBecBQLzrQ=";
nativeBuildInputs = [
installShellFiles

6
pkgs/by-name/pr/process-compose/package.nix
View File

@@ -10,13 +10,13 @@ let
in
buildGoModule (finalAttrs: {
pname = "process-compose";
version = "1.120.0";
version = "1.122.0";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = "process-compose";
tag = "v${finalAttrs.version}";
hash = "sha256-J1Sk6TfTVFgw+FU48CxYBxT5NVbR/pACpsnq2TRuf38=";
hash = "sha256-K1j4hJE23Wxf7P/ipMkMl/3uOtdE8Xj7LfyjvwC2rMI=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
@@ -46,7 +46,7 @@ buildGoModule (finalAttrs: {
installShellFiles
];
vendorHash = "sha256-50N4IsSnUh3qmqqw+WACx2j0fMhLZKZdYK+7HAszxAY=";
vendorHash = "sha256-Wl3vMR122wn5ivQVbdS79nATQBlEHu44h0OZLGeEasU=";
doCheck = false;

54
pkgs/by-name/ru/rustormy/package.nix Normal file
View File

@@ -0,0 +1,54 @@
{
lib,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rustormy";
version = "0.5.2";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "tairesh";
repo = "rustormy";
tag = "v${finalAttrs.version}";
hash = "sha256-LC6hHxCG9TnXcRIxg2jAt6+r8Rm6Iu/TiX/neW5d4fk=";
};
cargoHash = "sha256-cvL+OAiGidQEltM/cgjzjeEFbM7IZvhIG5Q3Nxybb1w=";
checkFlags = [
"--skip=tests::test_different_units"
"--skip=tests::test_empty_city"
"--skip=tests::test_no_location_provided"
"--skip=tests::test_nonexistent_city"
"--skip=tests::test_valid_city_lookup"
"--skip=tests::test_valid_coordinates"
"--skip=weather::enrich::tests::does_not_overwrite_false_is_day_when_set"
"--skip=weather::enrich::tests::does_not_overwrite_true_is_day_when_set"
"--skip=weather::enrich::tests::does_not_overwrite_uv_when_set"
"--skip=weather::enrich::tests::fills_is_day_when_none"
"--skip=weather::enrich::tests::openuv_failure_does_not_break_enrich"
"--skip=weather::enrich::tests::skips_uv_when_openuv_key_empty"
];
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
meta = {
description = "Minimal neofetch-like weather CLI";
homepage = "https://github.com/tairesh/rustormy";
license = lib.licenses.mit;
mainProgram = "rustormy";
maintainers = with lib.maintainers; [
joseg313
ethancedwards8
];
};
})

2
pkgs/by-name/sd/sd-mux-ctrl/package.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
version = "2020-02-17";
src = fetchgit {
url = "https://git.tizen.org/cgit/tools/testlab/sd-mux";
url = "git://git.tizen.org/tools/testlab/sd-mux";
rev = "9dd189d973da64e033a0c5c2adb3d94b23153d94";
hash = "sha256-b0uoxVPfSrqNt0wJoQho9jlpQQUjofgFm93P+UNFtDs=";
};

19
pkgs/by-name/sl/sleuthkit/package.nix
View File

@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
autoreconfHook,
ant,
jdk,
@@ -16,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sleuthkit";
version = "4.14.0"; # Note: when updating don't forget to also update the rdeps outputHash
version = "4.15.0"; # Note: when updating don't forget to also update the rdeps outputHash
src = fetchFromGitHub {
owner = "sleuthkit";
repo = "sleuthkit";
rev = "sleuthkit-${finalAttrs.version}";
hash = "sha256-WvGVEDuhpmcyPOaihDruBbQbcj7s+Zkt2/D5CIsu0u8=";
hash = "sha256-11KK7O7V8bMp0YMt9ZPwAJ00n0VeXMooYTbu+By6b2Q=";
};
# Fetch libraries using a fixed output derivation
@@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-HfO8yWlL16NuXQ+NWIHwii69Vfb1vvSmNC3+6p0ALdg=";
outputHash = "sha256-ktMP2gkAole0QDhWiX0VG4qYuGbQffLmGrV69Lt8RqA=";
};
postUnpack = ''
@@ -76,18 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
chmod -R 755 $IVY_HOME
'';
patches = [
# Fix build with gcc 15
(fetchpatch {
url = "https://github.com/sleuthkit/sleuthkit/commit/8d710c36a947a2666bbef689155831d76fff56b9.patch";
hash = "sha256-/mCal0EVTM2dM5ok3OmAXQ1HiaCUi0lmhavIuwxVEMA=";
})
(fetchpatch {
url = "https://github.com/sleuthkit/sleuthkit/commit/f78bd37db6be72f8f4d444d124be4e26488dce4b.patch";
hash = "sha256-ZEeN0jp5cRi6dOpWlcGYm0nLLu5b56ivdR+WrhnhCz0=";
})
];
postPatch = ''
substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset
'';

2
pkgs/by-name/th/thrift/package.nix
View File

@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
"StressTestNonBlocking"
];
doCheck = !static;
doCheck = !static && !stdenv.hostPlatform.isDarwin; # FIXME darwin?
enableParallelChecking = false;

6
pkgs/by-name/to/torrserver/package.nix
View File

@@ -7,15 +7,15 @@
}:
buildGo126Module rec {
pname = "torrserver";
version = "144.4";
version = "145";
src = fetchFromGitHub {
owner = "YouROK";
repo = "TorrServer";
tag = "MatriX.${version}";
sha256 = "sha256-R4aZE5eSslBS3kWSwo0W6rIdubmrJ2CCeElz1jYAt34=";
sha256 = "sha256-6ZqauoQ368gvuBfNYGsmnzA2bbbUOX7XoIVRlf6u3yI=";
};
vendorHash = "sha256-/xlC2+aj07dNMz187z3bje+uHoIm7QuCPNwBUDQKBhI=";
vendorHash = "sha256-CbyYyHh9IkjHVkqUzTbL1v0i6t6dox+xcrnsQCOxnUQ=";
modRoot = "server";
subPackages = [ "cmd" ];

4
pkgs/by-name/wi/wiki-go/package.nix
View File

@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "wiki-go";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "leomoon-studios";
repo = "wiki-go";
tag = "v${version}";
hash = "sha256-QjeDlUznPKW6Uqlqzlkua3RB9PDTL36VHwUKDaNNj5s=";
hash = "sha256-owX1O7/Lm4MNoEjBZ7J3qEtXmRjI7AkIn786pDGoObk=";
};
vendorHash = null;

6
pkgs/by-name/wr/wrangler/package.nix
View File

@@ -20,13 +20,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wrangler";
version = "4.132.0";
version = "4.141.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "workers-sdk";
rev = "wrangler@${finalAttrs.version}";
hash = "sha256-+io1K6H/i7Ylo3oQAIxDTirmaTrGs0+DltV78q3weJo=";
hash = "sha256-xyCU1oIfQ9XdKCsjp+ZmG7mOeuulAzI+P6N7V3TqIuU=";
};
pnpmDeps = fetchPnpmDeps {
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-8pHAr9+Exk7N8h7vgyyAgkRwM6wGuQzEc6eX0NskuC8=";
hash = "sha256-Dpv+Zy7+asv+5de+u8/DO6e8oOxFqZAVSc+M0YuNkoU=";
};
# pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
postPatch = ''

2
pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
View File

@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://github.com/emersion/xdg-desktop-portal-wlr";
description = "xdg-desktop-portal backend for wlroots";
maintainers = [ ];
maintainers = [ lib.maintainers.quantenzitrone ];
platforms = lib.platforms.linux;
license = lib.licenses.mit;
};

15
pkgs/by-name/zu/zug/package.nix
View File

@@ -18,6 +18,21 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-0HrvCpbVnxEvwvG4btXu0hRzdcHsGwM/HUWES/fmxrs=";
};
# this test assumes properties of a random sampling function, which no longer
# holds after gcc 16's implementation of
# "P0952R2: A new specification for std::generate_canonical"
# https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2023/p0952r2.html
# https://github.com/arximboldi/zug/issues/54
#
# zug plumbs in its test suite in very non-standard ways, making it annoying
# to disable tests through standard ctest machinery. this appears to be the
# easiest way.
postPatch = ''
substituteInPlace test/transducer/random_sample.cpp --replace-fail \
'TEST_CASE("random_sample, simple")' \
'TEST_CASE("random_sample, simple", "[.]")'
'';
nativeBuildInputs = [ cmake ];
buildInputs = [

79
pkgs/development/compilers/gcc/patches/13/gcc-13-darwin-aarch64-support-config-gcc.patch Normal file
View File

@@ -0,0 +1,79 @@
diff --git a/gcc/config.gcc b/gcc/config.gcc
index e084f0831e..d58a070337 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1125,6 +1125,26 @@
;;
esac
+# Figure out if we need to enable heap trampolines
+# and variadic functions handling.
+case ${target} in
+aarch64*-*-darwin2*)
+ # This applies to arm64 Darwin variadic funtions.
+ tm_defines="$tm_defines STACK_USE_CUMULATIVE_ARGS_INIT=1"
+ # Executable stack is forbidden.
+ tm_defines="$tm_defines HEAP_TRAMPOLINES_INIT=1"
+ ;;
+*-*-darwin2*)
+ tm_defines="$tm_defines STACK_USE_CUMULATIVE_ARGS_INIT=0"
+ # Currently, we do this for macOS 11 and above.
+ tm_defines="$tm_defines HEAP_TRAMPOLINES_INIT=1"
+ ;;
+*)
+ tm_defines="$tm_defines STACK_USE_CUMULATIVE_ARGS_INIT=0"
+ tm_defines="$tm_defines HEAP_TRAMPOLINES_INIT=0"
+ ;;
+esac
+
case ${target} in
aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
tm_file="${tm_file} elfos.h newlib-stdint.h"
@@ -1164,6 +1184,14 @@
done
TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
;;
+aarch64-*-darwin* )
+ tm_file="${tm_file} aarch64/aarch64-errata.h"
+ tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-darwin"
+ tm_defines="${tm_defines} TARGET_DEFAULT_ASYNC_UNWIND_TABLES=1"
+ tm_defines="${tm_defines} DISABLE_AARCH64_AS_CRC_BUGFIX=1"
+ # Choose a default CPU version that will work for all current releases.
+ with_cpu=${with_cpu:-apple-m1}
+ ;;
aarch64*-*-freebsd*)
tm_file="${tm_file} elfos.h ${fbsd_tm_file}"
tm_file="${tm_file} aarch64/aarch64-elf.h aarch64/aarch64-errata.h aarch64/aarch64-freebsd.h"
@@ -4133,8 +4161,8 @@
fi
for which in cpu arch tune; do
eval "val=\$with_$which"
- base_val=`echo $val | sed -e 's/\+.*//'`
- ext_val=`echo $val | sed -e 's/[a-z0-9.-]\+//'`
+ base_val=`echo $val | sed -E -e 's/\+.*//'`
+ ext_val=`echo $val | sed -E -e 's/[a-z0-9.-]+//'`
if [ $which = arch ]; then
def=aarch64-arches.def
@@ -4166,9 +4194,9 @@
while [ x"$ext_val" != x ]
do
- ext_val=`echo $ext_val | sed -e 's/\+//'`
- ext=`echo $ext_val | sed -e 's/\+.*//'`
- base_ext=`echo $ext | sed -e 's/^no//'`
+ ext_val=`echo $ext_val | sed -E -e 's/\+//'`
+ ext=`echo $ext_val | sed -E -e 's/\+.*//'`
+ base_ext=`echo $ext | sed -E -e 's/^no//'`
opt_line=`echo -e "$options_parsed" | \
grep "^\"$base_ext\""`
@@ -4179,7 +4207,7 @@
echo "Unknown extension used in --with-$which=$val" 1>&2
exit 1
fi
- ext_val=`echo $ext_val | sed -e 's/[a-z0-9-]\+//'`
+ ext_val=`echo $ext_val | sed -E -e 's/[a-z0-9-]\+//'`
done
true

74
pkgs/development/compilers/gcc/patches/13/libsanitizer-fix-with-glibc-2.42.patch
View File

@@ -1,74 +0,0 @@
From 1789c57dc97ea2f9819ef89e28bf17208b6208e7 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 2 May 2025 17:41:43 +0200
Subject: [PATCH] libsanitizer: Fix build with glibc 2.42
The termio structure will be removed from glibc 2.42. It has
been deprecated since the late 80s/early 90s.
Cherry-picked from LLVM commit 59978b21ad9c65276ee8e14f26759691b8a65763
("[sanitizer_common] Remove interceptors for deprecated struct termio
(#137403)").
Co-Authored-By: Tom Stellard <tstellar@redhat.com>
libsanitizer/
* sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry
picked from LLVM commit 59978b21ad9c65276ee8e14f26759691b8a65763.
* sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise.
* sanitizer_common/sanitizer_platform_limits_posix.h: Likewise.
---
.../sanitizer_common_interceptors_ioctl.inc | 8 --------
.../sanitizer_common/sanitizer_platform_limits_posix.cpp | 3 ---
.../sanitizer_common/sanitizer_platform_limits_posix.h | 1 -
3 files changed, 12 deletions(-)
diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
index 49ec4097c900b..dda11daa77f49 100644
--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
@@ -338,17 +338,9 @@ static void ioctl_table_fill() {
_(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int));
_(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int));
_(TCFLSH, NONE, 0);
-#if SANITIZER_GLIBC
- _(TCGETA, WRITE, struct_termio_sz);
-#endif
_(TCGETS, WRITE, struct_termios_sz);
_(TCSBRK, NONE, 0);
_(TCSBRKP, NONE, 0);
-#if SANITIZER_GLIBC
- _(TCSETA, READ, struct_termio_sz);
- _(TCSETAF, READ, struct_termio_sz);
- _(TCSETAW, READ, struct_termio_sz);
-#endif
_(TCSETS, READ, struct_termios_sz);
_(TCSETSF, READ, struct_termios_sz);
_(TCSETSW, READ, struct_termios_sz);
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
index c87d5ef42c924..7bbc6f2edac2e 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
@@ -485,9 +485,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
unsigned struct_input_id_sz = sizeof(struct input_id);
unsigned struct_mtpos_sz = sizeof(struct mtpos);
unsigned struct_rtentry_sz = sizeof(struct rtentry);
-#if SANITIZER_GLIBC || SANITIZER_ANDROID
- unsigned struct_termio_sz = sizeof(struct termio);
-#endif
unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
unsigned struct_vt_stat_sz = sizeof(struct vt_stat);
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
index c07f7cd0b0d08..a80df656826ee 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -1029,7 +1029,6 @@ extern unsigned struct_hd_geometry_sz;
extern unsigned struct_input_absinfo_sz;
extern unsigned struct_input_id_sz;
extern unsigned struct_mtpos_sz;
-extern unsigned struct_termio_sz;
extern unsigned struct_vt_consize_sz;
extern unsigned struct_vt_sizes_sz;
extern unsigned struct_vt_stat_sz;

21
pkgs/development/compilers/gcc/patches/default.nix
View File

@@ -80,7 +80,6 @@ optionals noSysDirs (
"13" = [
./13/no-sys-dirs-riscv.patch
./13/mangle-NIX_STORE-in-__FILE__.patch
./13/libsanitizer-fix-with-glibc-2.42.patch
];
}
."${majorVersion}" or [ ]
@@ -108,18 +107,6 @@ optionals noSysDirs (
## 2. Patches relevant on specific platforms ####################################
## Linux
# Linux 7.1 removed `linux/scc.h`.
# For GCC 14 and higher, there have already been releases with the fix.
++ optional (is13 && targetPlatform.isLinux) (fetchpatch {
name = "libsanitizer-fix-with-linux-7.1-headers.patch";
url = "https://github.com/llvm/llvm-project/commit/3dc4fd6dd41100f051a63642f449b16324389c96.patch";
relative = "compiler-rt/lib";
extraPrefix = "libsanitizer/";
hash = "sha256-UYekGGOkYdBNJEp48QFPFadf3wPFJZL2t3D+iwUeGJA=";
})
## AArch64
# Fix an ICE when a function type carries a C++11 attribute without a namespace.
@@ -176,8 +163,14 @@ optionals noSysDirs (
(fetchpatch {
name = "gcc-13-darwin-aarch64-support.patch";
url = "https://raw.githubusercontent.com/Homebrew/homebrew-core/d23df58f83aeb2c3f43bdcc277a9fac0bbe3e896/Patches/gcc/gcc-13.4.0.diff";
hash = "sha256-xqkBDFYZ6fdowtqR3kV7bR8a4Cu11RDokSzGn1k3a1w=";
excludes = [ "gcc/config.gcc" ];
hash = "sha256-doecTdFl6wkyvrk+44g1TMcZgVhbMF2W/5+ZOsEmwEY=";
})
# The only file which conflicts with the 13.5.0 source tree in the patch
# above is gcc/config.gcc. In order to avoid vendoring the whole 15k line
# patch into Nixpkgs, we omit just gcc/config.gcc and vendor the rebased
# version of the patch for only that file.
./13/gcc-13-darwin-aarch64-support-config-gcc.patch
];
}
.${majorVersion} or [ ]

4
pkgs/development/compilers/gcc/versions.nix
View File

@@ -3,7 +3,7 @@ let
"16" = "16.2.0";
"15" = "15.3.0";
"14" = "14.4.0";
"13" = "13.4.0";
"13" = "13.5.0";
};
fromMajorMinor = majorMinorVersion: majorMinorToVersionMap."${majorMinorVersion}";
@@ -17,7 +17,7 @@ let
"16.2.0" = "sha256-5nOOKVl/czJwcxqpBgDzf/3ARQed/CfsfoGSzIEIXD4=";
"15.3.0" = "sha256-+lnBvu+JlfJ8TXHB3yJ1hxiTFdPm+v8btDBuYbDFMOs=";
"14.4.0" = "sha256-dStvVnvqyDFZx3p2gLExa914Rzi/+anQcBEsCdqQ9tk=";
"13.4.0" = "sha256-nEzm27BAVo/cVFWIrAPFy8lajb8MeqSQFwhDr7WcqPU=";
"13.5.0" = "sha256-7D3wAV7QFBH5H5qc1bTaMHDrEiKwL630EzwwwJA5mFU=";
}
."${version}";

4
pkgs/development/python-modules/ha-garmin/default.nix
View File

@@ -12,14 +12,14 @@
buildPythonPackage (finalAttrs: {
pname = "ha-garmin";
version = "0.1.47";
version = "0.1.48";
pyproject = true;
src = fetchFromGitHub {
owner = "cyberjunky";
repo = "ha-garmin";
tag = "v${finalAttrs.version}";
hash = "sha256-ojMsc6NW2XsWi6++htEdLn8sPPq7xyBkJNaIDPDH0Nw=";
hash = "sha256-gdcPXD/xJBaxqZg70aL3O4/ZbQB69jdsRuAtF0wvnuM=";
};
build-system = [ setuptools ];

2
pkgs/development/python-modules/odl-renderer/default.nix
View File

@@ -87,7 +87,7 @@ buildPythonPackage (finalAttrs: {
__structuredAttrs = true;
meta = {
description = "";
description = "Pure image rendering from drawing instructions for e-paper displays";
homepage = "https://github.com/OpenDisplay/odl-renderer";
changelog = "https://github.com/OpenDisplay/odl-renderer/blob/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.asl20;

4
pkgs/development/python-modules/scikit-base/default.nix
View File

@@ -8,14 +8,14 @@
buildPythonPackage (finalAttrs: {
pname = "scikit-base";
version = "1.1.1";
version = "1.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "sktime";
repo = "skbase";
tag = "v${finalAttrs.version}";
hash = "sha256-taDnQFqLZbLbP3lEREqINUj026Y8Hi/hQkV9qslqKe4=";
hash = "sha256-yIINucZKKWUWchU8YSRiSIx08YJCZBpt/xXINfQUoiw=";
};
build-system = [ setuptools ];

8
pkgs/development/rocm-modules/migraphx/default.nix
View File

@@ -39,6 +39,12 @@
}:
let
# this standard version needs to match the version that migraphx pins, or
# compilation fails if the pinned version is not the same as the compiler's
# default.
# https://github.com/ROCm/AMDMIGraphX/blob/07ef4ba4f9ef95d241b7be165e60ad148f3344ee/CMakeLists.txt#L143-L148
abseil-cpp' = abseil-cpp.override { cxxStandard = "17"; };
latex = lib.optionalAttrs buildDocs (
texliveSmall.withPackages (
ps: with ps; [
@@ -143,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postPatch = ''
export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp}/include -I${hipblas-common}/include -I${lib.getInclude protobuf}/include"
export CXXFLAGS+=" -w -isystem${rocmlir}/include/rocmlir -I${half}/include -I${lib.getInclude abseil-cpp'}/include -I${hipblas-common}/include -I${lib.getInclude protobuf}/include"
patchShebangs tools
# `error: '__clang_hip_runtime_wrapper.h' file not found [clang-diagnostic-error]`

4
pkgs/kde/misc/ktextaddons/default.nix
View File

@@ -8,11 +8,11 @@
}:
mkKdeDerivation rec {
pname = "ktextaddons";
version = "2.1.2";
version = "2.2.0";
src = fetchurl {
url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
hash = "sha256-87REiQTxZW1tfNWlV9Iv4cUGJOsy7TafNHJr7/nOBYk=";
hash = "sha256-JrePq4LOdvoZ2NKkd1djHSHcrdtoFEQrbdKFPmXNWoE=";
};
extraBuildInputs = [

2
pkgs/kde/misc/phonon/default.nix
View File

@@ -33,6 +33,8 @@ mkKdeDerivation rec {
cmakeFlags = [
"-DPHONON_BUILD_QT5=0"
"-DPHONON_BUILD_QT6=1"
# Do not expose upstream's unstable experimental API.
(lib.cmakeBool "PHONON_BUILD_EXPERIMENTAL" false)
];
meta.license = with lib.licenses; [