[staging-next] Pile of assorted fixes found while rebuilding my flake (#422890)

K900 d5e6750b 1d26f2a4

Changed files
+169 -20
pkgs
by-name
development
python-modules
django-lasuite
geventhttpclient
polars
scikit-learn
tools
build-managers
rebar3
kde
frameworks
kimageformats
tools
misc
system-config-printer
security
+4 -5
pkgs/by-name/jq/jq/disable-end-of-epoch-conversion-test.patch
···
diff --git a/tests/optional.test b/tests/optional.test
-
index 2623731..85bc9e9 100644
+
index 77354cc..6cc7c12 100644
--- a/tests/optional.test
+++ b/tests/optional.test
-
@@ -12,11 +12,6 @@ last(range(365 * 67)|("1970-03-01T01:02:03Z"|strptime("%Y-%m-%dT%H:%M:%SZ")|mkti
-
null
-
[2037,1,11,1,2,3,3,41]
+
@@ -1,10 +1,5 @@
+
# See tests/jq.test and the jq manual for more information.
-
-# Regression test for #3276
+
-# Regression test for #3276 (fails on mingw/WIN32)
-fromdate
-"2038-01-19T03:14:08Z"
-2147483648
-6
pkgs/by-name/li/libqalculate/package.nix
···
--replace-fail '"gnuplot - ' '"${gnuplotBinary} - '
'';
-
preBuild = ''
-
pushd docs/reference
-
doxygen Doxyfile
-
popd
-
'';
-
meta = {
description = "Advanced calculator library";
homepage = "http://qalculate.github.io";
+3
pkgs/by-name/ni/nix-ld/package.nix
···
hash = "sha256-ULoitJD5bMu0pFvh35cY5EEYywxj4e2fYOpqZwKB1lk=";
};
+
# Submitted upstream: https://github.com/nix-community/nix-ld/pull/169
+
patches = [ ./rust-1.88.patch ];
+
useFetchCargoVendor = true;
cargoHash = "sha256-cDbszVjZcomag0HZvXM+17SjDiGS07iPj78zgsXstHc=";
+33
pkgs/by-name/ni/nix-ld/rust-1.88.patch
···
+
diff --git a/src/arch.rs b/src/arch.rs
+
index a998697..45ec2cb 100644
+
--- a/src/arch.rs
+
+++ b/src/arch.rs
+
@@ -140,7 +140,7 @@ cfg_match! {
+
target_arch = "x86_64" => {
+
pub const ENTRY_TRAMPOLINE: Option<unsafe extern "C" fn() -> !> = Some(entry_trampoline);
+
+
- #[naked]
+
+ #[unsafe(naked)]
+
unsafe extern "C" fn entry_trampoline() -> ! {
+
core::arch::naked_asm!(
+
"lea r10, [rip + {context}]",
+
@@ -159,7 +159,7 @@ cfg_match! {
+
target_arch = "aarch64" => {
+
pub const ENTRY_TRAMPOLINE: Option<unsafe extern "C" fn() -> !> = Some(entry_trampoline);
+
+
- #[naked]
+
+ #[unsafe(naked)]
+
unsafe extern "C" fn entry_trampoline() -> ! {
+
core::arch::naked_asm!(
+
"adrp x8, {context}",
+
diff --git a/src/sys.rs b/src/sys.rs
+
index 109d809..bf085d9 100644
+
--- a/src/sys.rs
+
+++ b/src/sys.rs
+
@@ -181,6 +181,5 @@ pub fn new_slice_leak(size: usize) -> Option<&'static mut [u8]> {
+
+
#[cfg(not(test))]
+
#[lang = "eh_personality"]
+
-#[no_mangle]
+
pub extern fn rust_eh_personality() {
+
}
+3 -1
pkgs/by-name/we/webrtc-audio-processing/package.nix
···
abseil-cpp
];
-
mesonFlags = lib.lists.optional (!stdenv.hostPlatform.isAarch64) "-Dneon=disabled";
+
mesonFlags =
+
lib.lists.optional (!stdenv.hostPlatform.isAarch64) "-Dneon=disabled"
+
++ lib.lists.optional (stdenv.hostPlatform.isi686) "-Dinline-sse=false";
passthru.tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
+31
pkgs/by-name/xb/xbindkeys/gettext-0.25.patch
···
+
diff --git a/Makefile.am b/Makefile.am
+
index 3257a0a..e39e8bc 100644
+
--- a/Makefile.am
+
+++ b/Makefile.am
+
@@ -35,3 +35,5 @@ endif
+
+
+
man_MANS = xbindkeys.1 $(man_MANS_TK)
+
+
+
+SUBDIRS =
+
\ No newline at end of file
+
diff --git a/configure.ac b/configure.ac
+
index f039ca8..eb0c886 100644
+
--- a/configure.ac
+
+++ b/configure.ac
+
@@ -3,10 +3,15 @@ AC_INIT(xbindkeys, 1.8.7, hocwp@free.fr)
+
AC_PREREQ(2.54)
+
AC_COPYRIGHT(Copyright (C) Philippe Brochard <hocwp@free.fr>)
+
+
+AC_CONFIG_MACRO_DIRS([m4])
+
+
+
# Automake
+
AM_INIT_AUTOMAKE()
+
AM_MAINTAINER_MODE
+
+
+AM_GNU_GETTEXT_VERSION([0.25])
+
+AM_GNU_GETTEXT([external])
+
+
+
AC_CONFIG_SRCDIR([xbindkeys.c])
+
AM_CONFIG_HEADER(config.h)
+
+3
pkgs/by-name/xb/xbindkeys/package.nix
···
sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2";
};
+
# FIXME: remove when gettext is fixed
+
patches = [ ./gettext-0.25.patch ];
+
nativeBuildInputs = [
autoreconfHook
pkg-config
+18
pkgs/by-name/ya/yad/gettext-0.25.patch
···
+
diff --git a/configure.ac b/configure.ac
+
index 20a4e42..921ba18 100644
+
--- a/configure.ac
+
+++ b/configure.ac
+
@@ -8,9 +8,13 @@ AC_PREREQ([2.59])
+
+
AC_CONFIG_HEADERS([config.h])
+
AC_CONFIG_SRCDIR([src])
+
+AC_CONFIG_MACRO_DIRS([m4])
+
+
AM_MAINTAINER_MODE
+
+
+AM_GNU_GETTEXT_VERSION([0.25])
+
+AM_GNU_GETTEXT([external])
+
+
+
IT_PROG_INTLTOOL([0.40.0])
+
+
AC_PROG_CC
+3
pkgs/by-name/ya/yad/package.nix
···
sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M=";
};
+
# FIXME: remove when gettext is fixed
+
patches = [ ./gettext-0.25.patch ];
+
configureFlags = [
"--enable-icon-browser"
"--with-gtk=gtk3"
+2 -2
pkgs/development/python-modules/django-lasuite/default.nix
···
buildPythonPackage rec {
pname = "django-lasuite";
-
version = "0.0.9";
+
version = "0.0.10";
pyproject = true;
src = fetchFromGitHub {
owner = "suitenumerique";
repo = "django-lasuite";
tag = "v${version}";
-
hash = "sha256-vUtWBR9uRc99jTe0Gg7k4EZZAkqHct5+GCOHp1mTIkA=";
+
hash = "sha256-2rSPGioyG/2VeyBPfsNU4TL2jvlLjRQpxQSl1AHLL10=";
};
build-system = [ hatchling ];
+2 -2
pkgs/development/python-modules/geventhttpclient/default.nix
···
buildPythonPackage rec {
pname = "geventhttpclient";
-
version = "2.3.3";
+
version = "2.3.4";
pyproject = true;
disabled = pythonOlder "3.9";
···
tag = version;
# TODO: unvendor llhttp
fetchSubmodules = true;
-
hash = "sha256-0ltTmF09EKs+55Mitfe5vxPjmCtnhla6q6SAvhyIQPk=";
+
hash = "sha256-X85co03fMG7OSpkL02n3ektRNzu7oHChtwZzkspsSTk=";
};
build-system = [ setuptools ];
+15
pkgs/development/python-modules/polars/avx512.patch
···
+
diff --git a/crates/polars-compute/src/lib.rs b/crates/polars-compute/src/lib.rs
+
index ebe1ef753..6e1eee897 100644
+
--- a/crates/polars-compute/src/lib.rs
+
+++ b/crates/polars-compute/src/lib.rs
+
@@ -5,6 +5,10 @@
+
all(feature = "simd", target_arch = "x86_64"),
+
feature(stdarch_x86_avx512)
+
)]
+
+#![cfg_attr(
+
+ all(feature = "simd", target_arch = "x86_64"),
+
+ feature(avx512_target_feature)
+
+)]
+
+
use arrow::types::NativeType;
+
+4
pkgs/development/python-modules/polars/default.nix
···
hash = "sha256-OZ7guV/uxa3jGesAh+ubrFjQSNVp5ImfXfPAQxagTj0=";
};
+
patches = [
+
./avx512.patch
+
];
+
# Do not type-check assertions because some of them use unstable features (`is_none_or`)
postPatch = ''
while IFS= read -r -d "" path ; do
+6
pkgs/development/python-modules/scikit-learn/default.nix
···
[
# Skip test_feature_importance_regression - does web fetch
"test_feature_importance_regression"
+
+
# Fail due to new deprecation warnings in scipy
+
# FIXME: reenable when fixed upstream
+
"test_logistic_regression_path_convergence_fail"
+
"test_linalg_warning_with_newton_solver"
+
"test_newton_cholesky_fallback_to_lbfgs"
]
++ lib.optionals stdenv.hostPlatform.isAarch64 [
# doesn't seem to produce correct results?
+3
pkgs/development/tools/build-managers/rebar3/default.nix
···
# our patches cause the tests to fail
doCheck = false;
+
+
# patchShebangs corrupts the magic escript shebang+zip files
+
dontPatchShebangs = true;
})
);
in
+2 -1
pkgs/kde/frameworks/kimageformats/default.nix
···
extraBuildInputs = [
libheif
libjxl
-
libavif
+
# FIXME: cmake files are broken, disabled for now
+
# libavif
libraw
openexr
];
+3
pkgs/tools/misc/system-config-printer/default.nix
···
# switch to pep517 build tools
./pep517.patch
+
+
# FIXME: remove when gettext is fixed
+
./gettext-0.25.patch
];
buildInputs = [
+12
pkgs/tools/misc/system-config-printer/gettext-0.25.patch
···
+
diff --git a/Makefile.am b/Makefile.am
+
index 9993ca0d..678fa629 100644
+
--- a/Makefile.am
+
+++ b/Makefile.am
+
@@ -1,5 +1,7 @@
+
SUBDIRS=. po
+
+
+ACLOCAL_AMFLAGS = -I m4
+
+
+
EXPORT_MODULES= \
+
cupshelpers/__init__.py \
+
cupshelpers/cupshelpers.py \
+4 -1
pkgs/tools/security/pinentry/default.nix
···
dontWrapQtApps = true;
patches =
-
[ ./autoconf-ar.patch ]
+
[
+
./autoconf-ar.patch
+
./gettext-0.25.patch
+
]
++ lib.optionals (lib.elem "gtk2" buildFlavors) [
(fetchpatch {
url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch";
+18 -2
pkgs/tools/security/pinentry/gettext-0.25.patch
···
diff --git a/configure.ac b/configure.ac
-
index 1b3ded6..0b78e69 100644
+
index 2a9f5d2..a3d9b79 100644
--- a/configure.ac
+++ b/configure.ac
-
@@ -358,6 +358,8 @@ if test "$pinentry_tty" = "yes"; then
+
@@ -45,6 +45,7 @@ m4_esyscmd([echo ]mym4_version[>VERSION])
+
+
AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
+
+
+AC_CONFIG_MACRO_DIRS([m4])
+
AC_CONFIG_AUX_DIR([build-aux])
+
AC_CONFIG_HEADERS([config.h])
+
AC_CONFIG_SRCDIR(pinentry/pinentry.h)
+
@@ -329,13 +330,15 @@ if test "$pinentry_tty" = "yes"; then
[The TTY version of Pinentry is to be build])
fi
+AM_GNU_GETTEXT_VERSION([0.21])
+AM_GNU_GETTEXT([external])
+
+AM_ICONV
dnl
dnl Additional checks pinentry Curses.
+
dnl
+
if test "$pinentry_curses" = "yes" \
+
-o "$fallback_curses" = "yes" ; then
+
- AM_ICONV
+
if test "$am_cv_func_iconv" != "yes"; then
+
AC_MSG_ERROR([[
+
***