From 4a27e946c943e58a6dd9ede40a8c29acf2d7da8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jan 2022 13:48:23 +0000 Subject: [PATCH 01/13] libgsf: 1.14.47 -> 1.14.48 --- pkgs/development/libraries/libgsf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 1ccc5d778967..1850da7e6468 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.47"; + version = "1.14.48"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"; + sha256 = "/4bX8dRt0Ovvt72DCnSkHbZDYrmHv4hT//arTBEyuDc="; }; nativeBuildInputs = [ pkg-config intltool libintl ]; From 9742335d83c2784980d8adb5630689efd87e6c5b Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Wed, 29 Dec 2021 19:48:16 +0100 Subject: [PATCH 02/13] udisks: move util-linux to buildInputs This fixes cross compilation. --- pkgs/os-specific/linux/udisks/2-default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index e5a5ff971a35..fd321d90cb2a 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config libtool gettext which gobject-introspection - gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl util-linux + gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat libgudev libblockdev acl systemd glib libatasmart polkit + expat libgudev libblockdev acl systemd glib libatasmart polkit util-linux ]; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; From a103b9b1cdceece5dcda7cdee8cf44962fd120a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Jan 2022 08:55:49 +0000 Subject: [PATCH 03/13] prowlarr: 0.1.9.1313 -> 0.1.10.1375 --- pkgs/servers/prowlarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index be77d8072b6e..d320deff4e63 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-L34dvileSSJxdhNwXC5iBChUM4r6hwncTHIBjWH20XE="; - arm64-linux_hash = "sha256-cT0UcN9otaGbMXoxlxJosYFtWzA8lRvekdleUSaxN0E="; - x64-osx_hash = "sha256-7a34R7PsgEzY4u7NKNR0LaVxonhhDNqjwQxEXaJbAww="; + x64-linux_hash = "sha256-pkuq7waABHEo6gx6d3qJs4IXFu0EcrdpsQdKoMkjN3s="; + arm64-linux_hash = "sha256-+BLyb6mygCFQfe7u/MbGbJROF7XT0wdRPi08izI6u8c="; + x64-osx_hash = "sha256-f5EHxxXdXzj8x6BmTZCHQ9p8Sl8T0Rxe/K9FwTzbR4Q="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.1.9.1313"; + version = "0.1.10.1375"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; From 0a3e3ca1f8f381ec108dfa7182b44e2fdd069fca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Jan 2022 11:30:31 +0000 Subject: [PATCH 04/13] python310Packages.jsmin: 2.2.2 -> 3.0.1 --- pkgs/development/python-modules/jsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix index f11fccb086bc..3160af6f88f4 100644 --- a/pkgs/development/python-modules/jsmin/default.nix +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jsmin"; - version = "2.2.2"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0fsmqbjvpxvff0984x7c0y8xmf49ax9mncz48b9xjx8wrnr9kpxn"; + sha256 = "c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5cc2bfc"; }; meta = with lib; { From 88ef0666443aea0f9088a18056f923240fd1424f Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 22 Jan 2022 02:59:51 +0900 Subject: [PATCH 05/13] noto-fonts-cjk: fix rendering issues The variable font build of Noto CJK was displaying tofus on some GTK apps. This fixes the issue by using non-variable OTCs instead. https://github.com/NixOS/nixpkgs/pull/145767#issuecomment-1016437188 --- pkgs/data/fonts/noto-fonts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 11f911aeb470..a0d3b34c85cd 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -73,7 +73,7 @@ let }; installPhase = '' - install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc + install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc ''; meta = with lib; { From 64560de406ec701e26f286163a8d775ed2d0f8b6 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 21 Jan 2022 18:45:31 +0100 Subject: [PATCH 06/13] nixos/networkd: fix networking.networkd.static test Commit ca58bd0a50f38de43b401df716806c0f83479a8e broke the test networking.networkd.static. This happened because the test sets `networking.defaultGateway`. This is implemented by adding the gateway to the list of `routes` using `mkDefault`. The `routes` are then overridden by an empty list in the newly added code. Replace `mkDefault` with `id` so the two lists are merged and everything (hopefully) works as expected. See https://github.com/NixOS/nixpkgs/pull/144590 for a more context. --- nixos/modules/tasks/network-interfaces-systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 645ff161cddd..8a5e1b5af114 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -92,7 +92,7 @@ in }; }; }); - networks."40-${i.name}" = mkMerge [ (genericNetwork mkDefault) { + networks."40-${i.name}" = mkMerge [ (genericNetwork id) { name = mkDefault i.name; DHCP = mkForce (dhcpStr (if i.useDHCP != null then i.useDHCP else false)); From 7e6916dc3e6bc9b8aac67e997fd21882a634cf11 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 21 Jan 2022 13:10:31 -0500 Subject: [PATCH 07/13] keycard-cli: mark as broken on darwin --- pkgs/tools/security/keycard-cli/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix index 93384df9b42e..7e28bb7c0bfc 100644 --- a/pkgs/tools/security/keycard-cli/default.nix +++ b/pkgs/tools/security/keycard-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, pkg-config, pcsclite }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, pcsclite }: buildGoPackage rec { pname = "keycard-cli"; @@ -26,5 +26,6 @@ buildGoPackage rec { homepage = "https://keycard.status.im"; license = licenses.mpl20; maintainers = [ maintainers.zimbatm ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/keycard-cli.x86_64-darwin }; } From 9f073cf8d6ca16ed66ca0e3e12f17f6e1b3a8156 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 20 Jan 2022 06:01:45 -0500 Subject: [PATCH 08/13] python3Packages.ibis-framework: 1.3.0 -> 2.1.1 --- .../python-modules/ibis-framework/default.nix | 131 ++++++++++++++---- 1 file changed, 106 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 1627159e6fbd..fa3ba5e99413 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -1,10 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy27, pythonAtLeast +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, atpublic +, cached-property +, clickhouse-driver +, click +, dask , graphviz +, importlib-metadata , multipledispatch , numpy , pandas +, parsy , pyarrow , pytest +, pytest-mock +, pytest-xdist , pytz , regex , requests @@ -12,54 +24,123 @@ , tables , toolz }: +let + # ignore tests for which dependencies are not available + backends = [ + "csv" + "dask" + "hdf5" + "pandas" + "parquet" + "sqlite" + ]; + + backendsString = lib.concatStringsSep " " backends; + + ibisTestingData = fetchFromGitHub { + owner = "ibis-project"; + repo = "testing-data"; + rev = "master"; + sha256 = "sha256-xuSE6wHP3aF8lnEE2SuFbTRBu49ecRmc1F3HPcszptI="; + }; +in buildPythonPackage rec { pname = "ibis-framework"; - version = "1.3.0"; - disabled = isPy27 || pythonAtLeast "3.8"; + version = "2.1.1"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "1my94a11jzg1hv6ln8wxklbqrg6z5l2l77vr89aq0829yyxacmv7"; + src = fetchFromGitHub { + repo = "ibis"; + owner = "ibis-project"; + rev = "2.1.1"; + sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; }; - patches = [ - # fix tests for pandas 1.1 - (fetchpatch { - url = "https://github.com/ibis-project/ibis/commit/53ef3cefc4ae90d61f3612310cb36da2bcd11305.diff"; - sha256 = "1i5yjmqridjqpggiinsjaz5spcxca5bd48vy7a0mj4mm1b5flw2m"; - }) - ]; - propagatedBuildInputs = [ + atpublic + cached-property + clickhouse-driver + dask + graphviz multipledispatch numpy pandas + parsy + pyarrow pytz regex - toolz - sqlalchemy requests - graphviz + sqlalchemy tables - pyarrow - ]; + toolz + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ + click pytest + pytest-mock + pytest-xdist ]; - # ignore tests which require test dataset, or frameworks not available - checkPhase = '' - pytest ibis \ - --ignore=ibis/tests/all \ - --ignore=ibis/{sql,spark} + # these tests are broken upstream: https://github.com/ibis-project/ibis/issues/3291 + disabledTests = [ + "test_summary_numeric" + "test_summary_non_numeric" + "test_batting_most_hits" + "test_join_with_window_function" + "test_where_long" + "test_quantile_groupby" + "test_summary_numeric" + "test_summary_numeric_group_by" + "test_summary_non_numeric" + "test_searched_case_column" + "test_simple_case_column" + "test_summary_non_numeric_group_by" + ]; + + preCheck = '' + set -euo pipefail + + export IBIS_TEST_DATA_DIRECTORY + IBIS_TEST_DATA_DIRECTORY="$(mktemp -d)" + + # copy the test data to a writable directory + cp -r ${ibisTestingData}/* "$IBIS_TEST_DATA_DIRECTORY" + + find "$IBIS_TEST_DATA_DIRECTORY" -type d -exec chmod u+rwx {} + + find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} + + + # load data + for backend in ${backendsString}; do + python ci/datamgr.py "$backend" & + done + + wait + + export PYTEST_BACKENDS="${backendsString}" ''; + checkPhase = '' + set -euo pipefail + + runHook preCheck + + pytest --numprocesses auto \ + ibis/tests \ + ibis/backends/tests \ + ibis/backends/{${lib.concatStringsSep "," backends}}/tests \ + -k '${lib.concatMapStringsSep " and " (test: "not ${test}") disabledTests}' + + runHook postCheck + ''; + + pythonImportsCheck = [ "ibis" ] ++ (map (backend: "ibis.backends.${backend}") backends); + meta = with lib; { description = "Productivity-centric Python Big Data Framework"; homepage = "https://github.com/ibis-project/ibis"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc cpcloud ]; }; } From 01665b3dd555f8e16dba7705f32f098d1bb58ce0 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 20 Jan 2022 06:07:21 -0500 Subject: [PATCH 09/13] python3Packages.ibis-framework: use a specific rev for testing-data --- pkgs/development/python-modules/ibis-framework/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index fa3ba5e99413..838071b4d032 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -40,7 +40,7 @@ let ibisTestingData = fetchFromGitHub { owner = "ibis-project"; repo = "testing-data"; - rev = "master"; + rev = "743201a35c6b968cf55b054f9d28949ea15d1f0a"; sha256 = "sha256-xuSE6wHP3aF8lnEE2SuFbTRBu49ecRmc1F3HPcszptI="; }; in From 5c7f80c45425ad3b7b3b9737bdad476ed16d5173 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 20 Jan 2022 06:07:49 -0500 Subject: [PATCH 10/13] python3Packages.ibis-framework: share the version variable --- pkgs/development/python-modules/ibis-framework/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 838071b4d032..707b30da1797 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "ibis"; owner = "ibis-project"; - rev = "2.1.1"; + rev = version; sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; }; From 7965b464ed1bafde3be96c771f78295c3a0ee68e Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 21 Jan 2022 16:22:59 -0500 Subject: [PATCH 11/13] python3Packages.ibis-framework: use pytestCheckHook --- .../python-modules/ibis-framework/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 707b30da1797..17f4553297ff 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pytestCheckHook , atpublic , cached-property , clickhouse-driver @@ -77,6 +78,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ + pytestCheckHook click pytest pytest-mock @@ -99,6 +101,13 @@ buildPythonPackage rec { "test_summary_non_numeric_group_by" ]; + pytestFlagsArray = [ + "--numprocesses $NIX_BUILD_CORES" + "ibis/tests" + "ibis/backends/tests" + "ibis/backends/{${lib.concatStringsSep "," backends}}/tests" + ]; + preCheck = '' set -euo pipefail @@ -121,20 +130,6 @@ buildPythonPackage rec { export PYTEST_BACKENDS="${backendsString}" ''; - checkPhase = '' - set -euo pipefail - - runHook preCheck - - pytest --numprocesses auto \ - ibis/tests \ - ibis/backends/tests \ - ibis/backends/{${lib.concatStringsSep "," backends}}/tests \ - -k '${lib.concatMapStringsSep " and " (test: "not ${test}") disabledTests}' - - runHook postCheck - ''; - pythonImportsCheck = [ "ibis" ] ++ (map (backend: "ibis.backends.${backend}") backends); meta = with lib; { From a574ff9929f906208cd42827c7d3a0256bd18705 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 22 Jan 2022 00:16:04 +0100 Subject: [PATCH 12/13] webkitgtk: 2.34.3 -> 2.34.4 https://webkitgtk.org/security/WSA-2022-0001.html --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index d8b7bbc6d65b..e9026d46bc69 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -64,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.34.3"; + version = "2.34.4"; outputs = [ "out" "dev" ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-DS83qjLiGjbk3Vpc565c4nQ1wp1oA7liuMkMsMxJxS0="; + sha256 = "sha256-l19QGRmbp2mRkYNc914BoYuU47zQEH2nOJ1N3LGrpAY="; }; patches = lib.optionals stdenv.isLinux [ From b93e9e495ea262479e8493baa4002019e44e7abb Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 21 Jan 2022 21:38:58 -0600 Subject: [PATCH 13/13] firecracker: 0.24.5 -> 0.25.2 Signed-off-by: Austin Seipp --- .../virtualization/firecracker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 78720034ea1a..a3ef59e8e92e 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "0.24.5"; + version = "0.25.2"; suffix = { x86_64-linux = "x86_64"; @@ -22,15 +22,15 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-drcm2kz2csuJqr8Oqs0r1BrxgPHOyuwC2S+99MhbMjA="; - aarch64-linux = "sha256-x8RoBmgY3HRUOLw8YzEwQfQuT83zGfBHHWu88b4i05o="; + x86_64-linux = "sha256-ZzlPq+Q9XfWQJr+7nKS0e6bfKwYNfpMHSiBIKeOr/s4="; + aarch64-linux = "sha256-75UC+HeVUfUk1HRvTJsOHbHHkgr6me1OtxDF7lahf68="; }; dontConfigure = true; buildPhase = '' - mv release-v${version}/firecracker-v${version}-${suffix} firecracker - mv release-v${version}/jailer-v${version}-${suffix} jailer + mv release-v${version}-${suffix}/firecracker-v${version}-${suffix} firecracker + mv release-v${version}-${suffix}/jailer-v${version}-${suffix} jailer chmod +x firecracker jailer '';