Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-02-04 06:01:04 +00:00
committed by GitHub
6 changed files with 13 additions and 14 deletions
@@ -26,21 +26,17 @@ assert (blas.isILP64 == lapack.isILP64 &&
stdenv.mkDerivation (finalAttrs: {
pname = "igraph";
version = "0.10.8";
version = "0.10.9";
src = fetchFromGitHub {
owner = "igraph";
repo = finalAttrs.pname;
rev = finalAttrs.version;
hash = "sha256-suma1iS9NdJwU/4EQl6qoFyD4bErLSkY+0yxgh3dHkw=";
hash = "sha256-Iaez6Rrd684vsraCkEH5a16rXfc53MyPXcYf3sOcaOY=";
};
postPatch = ''
echo "${finalAttrs.version}" > IGRAPH_VERSION
''
# https://github.com/igraph/igraph/issues/2340
+ lib.optionalString stdenv.isDarwin ''
sed -i "/safelocale/d" tests/CMakeLists.txt
'';
outputs = [ "out" "dev" "doc" ];
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "grpcio-channelz";
version = "1.60.0";
version = "1.60.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-TRTHMDUm50cmFJ0BX1zwd34xCVsuyejqp7hHc33LYKA=";
hash = "sha256-eAYWHTlyThrJ9vTumXPDeEcyk5OC8tfI12K073heF6A=";
};
nativeBuildInputs = [
@@ -16,14 +16,14 @@
let self = buildPythonPackage rec {
pname = "jupyter-server-terminals";
version = "0.5.1";
version = "0.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "jupyter-server";
repo = "jupyter_server_terminals";
rev = "refs/tags/v${version}";
hash = "sha256-d++WnroL9nq/G8K5nMl98pXYNpXgdWRfCNoIbVoiD7U=";
hash = "sha256-e4PtrK2DCJAK+LYmGguwU5hmxdqP5Dws1dPoPOv/WrM=";
};
nativeBuildInputs = [
@@ -93,11 +93,11 @@ buildPythonPackage rec {
"test_cull_idle"
"test_server_extension_list"
"test_subscribe_websocket"
# test is presumable broken in sandbox
"test_authorized_requests"
] ++ lib.optionals stdenv.isDarwin [
# attempts to use trashcan, build env doesn't allow this
"test_delete"
# test is presumable broken in sandbox
"test_authorized_requests"
# Insufficient access privileges for operation
"test_regression_is_hidden"
] ++ lib.optionals stdenv.isLinux [
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "jupyterlab";
version = "4.0.11";
version = "4.0.12";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-0a7CRxJWa8JaNiKXiCQneOSYykCIAo4vmqFWuLf9yPw=";
hash = "sha256-ll2S76gqU47XDMs5aNmqu6eIhA2oguE9ewYXgM3tw7c=";
};
nativeBuildInputs = [
@@ -55,6 +55,9 @@ buildPythonPackage rec {
"tests/test_flax_comparison.py"
"tests/test_paddle_comparison.py"
"tests/test_tf_comparison.py"
] ++ lib.optionals stdenv.isDarwin [
# don't require mlx (not in Nixpkgs) to run tests
"tests/test_mlx_comparison.py"
];
pythonImportsCheck = [