From b3823a35e5579e5d1a051f6011bc86ea0e754b50 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 11 Dec 2021 15:24:09 +0100 Subject: [PATCH 001/685] qtwayland: declare proper `app_id` for wrapped executables Since NixOS 21.11 it seems as if QT uses Wayland if possible[1]. However, my `pinentry-qt` flavor stopped floating because it's now running in Wayland-mode rather than in XWayland mode where this seems to be fine. I wanted to add a rule to my `sway(1)`-config for that, but realized that `pinentry` is missing an `app_id` to match: $ swaymsg -t get_tree | jq '.nodes[2].nodes[1].nodes[1].nodes[1].app_id' "" This is because `QWaylandWindow::initWindow()` uses the application's `baseName` to determine the app window. Unfortunately the `baseName` drops all chars of the filename after the first dot[2]. This means that every wrapped Nix package (i.e. `pkgs.foo` with `$out/bin/.foo-wrapped`) will have an empty-string as baseName because the first character of the filename is a dot. Since we're using the `wrapQtAppsHook` quite excessively, a lot of programs are affected by this. In order to work around this, I implemented a small patch for `qtwayland` that strips away the `nixpkgs`-specific `.(name)-wrapped` of a filename if needed and then sets the `app_id` to the expected `baseName`. This is useful to make e.g. `sway`-configs with `for_window`[3]-expressions from other distros compatible. With this change, the `app_id` is set as I'd expect it: $ swaymsg -t get_tree | jq '.nodes[2].nodes[1].nodes[1].nodes[1].app_id' "pinentry-qt" Even though we'll need the patch to get e.g. `foo` from `.foo-wrapped`, I decided to file a bug-report against upstream[4]. [1] https://nixos.org/manual/nixos/stable/release-notes.html#sec-release-21.11 [2] https://doc.qt.io/qt-5/qfileinfo.html#baseName [3] https://man.archlinux.org/man/sway.5.en [4] https://bugreports.qt.io/browse/QTBUG-99137 --- .../qt-5/modules/qtwayland-app_id.patch | 36 +++++++++++++++++++ .../libraries/qt-5/modules/qtwayland.nix | 6 ++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch b/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch new file mode 100644 index 00000000000..24d081aa602 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtwayland-app_id.patch @@ -0,0 +1,36 @@ +Ensure that the correct `app_id` for Wayland is set. The upstream implementation +uses `QFileInfo::baseName()`[1] which strips everything away after the first dot. +This means that `.foo-wrapped` has an empty `app_id` because `baseName` returns +an empty string in this case. + +The patch basically checks whether the program has the form `.foo-wrapped` (i.e. got +wrapped by `makeWrapper`) and if that's the case, `foo` will be the correct `app_id`. + +[1] https://doc.qt.io/qt-5/qfileinfo.html#baseName + +diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp +index ba881cb..b3fd031 100644 +--- a/src/client/qwaylandwindow.cpp ++++ b/src/client/qwaylandwindow.cpp +@@ -167,7 +167,20 @@ void QWaylandWindow::initWindow() + Qt::SkipEmptyParts); + + if (domainName.isEmpty()) { +- mShellSurface->setAppId(fi.baseName()); ++ auto baseName = fi.baseName(); ++ if (baseName.isEmpty()) { ++ auto fileName = fi.fileName(); ++ if (fileName.endsWith("-wrapped") && fileName.startsWith(".")) { ++ do { ++ auto len = fileName.length(); ++ fileName = fileName.right(len - 1); ++ fileName = fileName.left(len - 9); ++ } while (fileName.endsWith("-wrapped") && fileName.startsWith(".")); ++ mShellSurface->setAppId(fileName); ++ } ++ } else { ++ mShellSurface->setAppId(baseName); ++ } + } else { + QString appId; + for (int i = 0; i < domainName.count(); ++i) diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 1bd1adedaf0..edb15b0b48b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -6,4 +6,10 @@ qtModule { buildInputs = [ wayland ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; + patches = [ + # NixOS-specific, ensure that app_id is correctly determined for + # wrapped executables from `wrapQtAppsHook` (see comment in patch for further + # context). + ./qtwayland-app_id.patch + ]; } From 4e199a91dc49659ea3ecd7f8e174d6ade2a1d717 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 15 Feb 2022 21:16:33 -0800 Subject: [PATCH 002/685] mesa.drivers: Convert hard links to symlinks Signed-off-by: Anders Kaseorg --- pkgs/development/libraries/mesa/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b91e140345d..de996cf74f3 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -15,6 +15,7 @@ , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , libclc +, jdupes }: /** Packaging design: @@ -233,6 +234,9 @@ self = stdenv.mkDerivation { fi done + # NAR doesn't support hard links, so convert them to symlinks. + ${jdupes}/bin/jdupes -Hlr "$drivers" + # add RPATH so the drivers can find the moved libgallium and libdricore9 # moved here to avoid problems with stripping patchelfed files for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do From be85a5548509d267cdeae8a13a02e019c3dbcfac Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 16 Feb 2022 19:34:10 -0800 Subject: [PATCH 003/685] valgrind: Search NIX_DEBUG_INFO_DIRS for debug info Signed-off-by: Anders Kaseorg --- .../valgrind/debug-info-from-env.patch | 31 +++++++++++++++++++ .../tools/analysis/valgrind/default.nix | 6 ++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/tools/analysis/valgrind/debug-info-from-env.patch diff --git a/pkgs/development/tools/analysis/valgrind/debug-info-from-env.patch b/pkgs/development/tools/analysis/valgrind/debug-info-from-env.patch new file mode 100644 index 00000000000..a237bc87d07 --- /dev/null +++ b/pkgs/development/tools/analysis/valgrind/debug-info-from-env.patch @@ -0,0 +1,31 @@ +diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c +index c586e3f33..e3bb1717f 100644 +--- a/coregrind/m_debuginfo/readelf.c ++++ b/coregrind/m_debuginfo/readelf.c +@@ -1508,13 +1508,25 @@ DiImage* find_debug_file( struct _DebugInfo* di, + HChar* debugpath = NULL; /* where we found it */ + + if (buildid != NULL) { ++ const HChar *dir = VG_(getenv)("NIX_DEBUG_INFO_DIRS"); + debugpath = ML_(dinfo_zalloc)("di.fdf.1", +- VG_(strlen)(buildid) + 33); ++ VG_(strlen)(buildid) + 33 + ++ (dir ? VG_(strlen)(dir) : 0)); + + VG_(sprintf)(debugpath, "/usr/lib/debug/.build-id/%c%c/%s.debug", + buildid[0], buildid[1], buildid + 2); + + dimg = open_debug_file(debugpath, buildid, 0, rel_ok, NULL); ++ ++ while (!dimg && dir) { ++ const HChar *sep = VG_(strchr)(dir, ':'); ++ Int size = sep ? sep - dir : VG_(strlen)(dir); ++ VG_(sprintf)(debugpath, "%.*s/.build-id/%c%c/%s.debug", ++ size, dir, buildid[0], buildid[1], buildid + 2); ++ dimg = open_debug_file(debugpath, buildid, 0, rel_ok, NULL); ++ dir = sep ? sep + 1 : NULL; ++ } ++ + if (!dimg) { + ML_(dinfo_free)(debugpath); + debugpath = NULL; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 6e736df235f..7aef87a2f0e 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch , autoreconfHook, perl , gdb, cctools, xnu, bootstrap_cmds +, setupDebugInfoDirs }: stdenv.mkDerivation rec { @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { url = "https://bugsfiles.kde.org/attachment.cgi?id=143535"; sha256 = "036zyk30rixjvpylw3c7n171n4gpn6zcp7h6ya2dz4h5r478l9i6"; }) + ./debug-info-from-env.patch ]; outputs = [ "out" "dev" "man" "doc" ]; @@ -32,6 +34,10 @@ stdenv.mkDerivation rec { # Perl is also a native build input. nativeBuildInputs = [ autoreconfHook perl ]; + # Not propagatedNativeBuildInputs because of + # https://github.com/NixOS/nixpkgs/issues/64992. + propagatedBuildInputs = [ setupDebugInfoDirs ]; + enableParallelBuilding = true; separateDebugInfo = stdenv.isLinux; From 4bb779294e0cf7e45eea52c93c8ad97a6cf9a549 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 16 Feb 2022 23:14:34 -0800 Subject: [PATCH 004/685] libpsl: Add glibc.debug for valgrind tests Signed-off-by: Anders Kaseorg --- pkgs/development/libraries/libpsl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 0a710d648fb..e505651ab40 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,6 +3,7 @@ , autoreconfHook , docbook_xsl , docbook_xml_dtd_43 +, glibc , gtk-doc , lzip , libidn2 @@ -38,6 +39,7 @@ in stdenv.mkDerivation rec { python3 libxslt ] ++ lib.optionals enableValgrindTests [ + glibc.debug valgrind ]; From d65255675854b4d2bd367549a423988bf8ddc5e5 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 15 Feb 2022 20:00:14 -0800 Subject: [PATCH 005/685] separateDebugInfo: Use --strip-unneeded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to https://stackoverflow.com/q/46197810/115030, --only-keep-debug preserves all the information stripped by --strip-unneeded. This reduces the size of the webkitgtk output by 22% (123 MB → 96 MB). Inspired by #159612. Signed-off-by: Anders Kaseorg --- pkgs/build-support/setup-hooks/separate-debug-info.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 1a23e6b198e..d910bce11af 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -34,7 +34,7 @@ _separateDebugInfo() { # firmware blobs in QEMU.) ( $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" - $STRIP --strip-debug "$i" + $STRIP --strip-unneeded "$i" # Also a create a symlink .debug. ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" From 21babd5d529aae112c473ad438d93686a0df2149 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Thu, 17 Feb 2022 17:26:55 -0800 Subject: [PATCH 006/685] linux: enable ISO9660_FS module --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 34e1b10b32a..fe1da91d986 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -446,6 +446,9 @@ let NLS_CODEPAGE_437 = module; # VFAT default for the codepage= mount option NLS_ISO8859_1 = module; # VFAT default for the iocharset= mount option + # Needed to use the installation iso image. Not included in all defconfigs (e.g. arm64) + ISO9660_FS = module; + DEVTMPFS = yes; UNICODE = whenAtLeast "5.2" yes; # Casefolding support for filesystems From 81380e5b4ac56057cfc741dc07e1280fdf5ae774 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Feb 2022 10:58:45 +0100 Subject: [PATCH 007/685] grpc: 1.43.0 -> 1.44.0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 28c47640ca6..37c2a1a4413 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.43.0"; # N.B: if you change this, please update: + version = "1.44.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "sha256-NPyCQsrmD/gBs4UHPGbBACmGRTNQDj6WfnfLNdWulK4="; + sha256 = "sha256-pG8RtAJJCLnxm+3hW1YsikyeNr9pjIRANeYhDJfTPbo="; fetchSubmodules = true; }; From a93a11df1d5c53376b1d5d66063d6fe42ac88660 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Feb 2022 11:11:03 +0100 Subject: [PATCH 008/685] python3Packages.grpcio-status: 1.43.0 -> 1.44.0 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index b20426c0288..fc069dccbaf 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.43.0"; + version = "1.44.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IXWQBvNqf/v/GH1BkfQRjActiqn6aCOhGq14QqPGzNA="; + sha256 = "sha256-rGE6t6RTgMv6PlKQItCzcxfYWPFyum5lwYiqc1VTk5g="; }; propagatedBuildInputs = [ From 4d3651ca292d2b641356f3c0282ecae45680f8c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 18 Feb 2022 11:16:39 +0100 Subject: [PATCH 009/685] python3Packages.grpcio-tools: 1.43.0 -> 1.44.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 78d952f4cb9..c428be64307 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.43.0"; + version = "1.44.0"; src = fetchPypi { inherit pname version; - sha256 = "f42f1d713096808b1b0472dd2a3749b712d13f0092dab9442d9c096446e860b2"; + sha256 = "sha256-vjf0WOpRDJqPHKq7wrJY0S5V0YmlZ/Xtys6Q8n3A778="; }; outputs = [ "out" "dev" ]; From eba4cbbde174f48ce985fb85491ffb5f86df940a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 06:04:57 +0000 Subject: [PATCH 010/685] libnetfilter_conntrack: 1.0.8 -> 1.0.9 --- pkgs/development/libraries/libnetfilter_conntrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index a2097bb17e2..32f7bc43316 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2"; - sha256 = "1ky1mqgnplw2h9jf0kn0a69d94jkydhbiipng9l2hdcj13h3pl8c"; + sha256 = "sha256-Z72d9J/jTouCFE9t+5OzIPOEqOpZcn6S/40YtfS1eag="; }; buildInputs = [ libmnl ]; From f1f9d37ec4a673c05c1db4341c6637a3d5df97f2 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 19 Feb 2022 06:08:28 +0100 Subject: [PATCH 011/685] libusb1: 1.0.24 -> 1.0.25 Update to version 1.0.25. Signed-off-by: Felix Singer --- pkgs/development/libraries/libusb1/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 69410cf2b98..e7d470396a6 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -12,24 +12,17 @@ stdenv.mkDerivation rec { pname = "libusb"; - version = "1.0.24"; + version = "1.0.25"; src = fetchFromGitHub { owner = "libusb"; repo = "libusb"; rev = "v${version}"; - sha256 = "18ri8ky422hw64zry7bpbarb1m0hiljyf64a0a9y093y7aad38i7"; + sha256 = "141wygijjcgka0h31504cdlvih4l2j02j67pcbb2l527p7dbc5pn"; }; outputs = [ "out" "dev" ]; - patches = [ (fetchpatch { - # https://bugs.archlinux.org/task/69121 - url = "https://github.com/libusb/libusb/commit/f6d2cb561402c3b6d3627c0eb89e009b503d9067.patch"; - sha256 = "1dbahikcbwkjhyvks7wbp7fy2bf7nca48vg5z0zqvqzjb9y595cq"; - excludes = [ "libusb/version_nano.h" ]; - }) ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = lib.optional enableUdev udev ++ From b7da6c7da765bb07fbcd3366d29d89c56cf25e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 20 Feb 2022 16:27:24 +0100 Subject: [PATCH 012/685] stdenv, dep-licenses.sh: do not skip handling of other exit traps See https://github.com/akinomyoga/ble.sh/issues/179 --- maintainers/scripts/dep-licenses.sh | 2 +- pkgs/stdenv/generic/setup.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/dep-licenses.sh b/maintainers/scripts/dep-licenses.sh index 28ad22c334f..816dcf6d7f7 100755 --- a/maintainers/scripts/dep-licenses.sh +++ b/maintainers/scripts/dep-licenses.sh @@ -9,7 +9,7 @@ tmp=$(mktemp --tmpdir -d nixpkgs-dep-license.XXXXXX) exitHandler() { exitCode=$? rm -rf "$tmp" - exit $exitCode + return $exitCode } trap "exitHandler" EXIT diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0777fa830c1..350fff48252 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -143,14 +143,14 @@ exitHandler() { echo "build failed with exit code $exitCode (ignored)" mkdir -p "$out/nix-support" printf "%s" "$exitCode" > "$out/nix-support/failed" - exit 0 + return 0 fi else runHook exitHook fi - exit "$exitCode" + return "$exitCode" } trap "exitHandler" EXIT From 6799a9184336146467eb71298d6b18ba7f45e0dc Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sun, 20 Feb 2022 09:47:28 -0800 Subject: [PATCH 013/685] Revert "prosody: work around makeWrapper bug" This reverts commit 16d0b4a69f94adb523da8732b231b0d1738bd713. --- pkgs/servers/xmpp/prosody/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 5d0ed06b5ae..74cabc63ebb 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -74,17 +74,17 @@ stdenv.mkDerivation rec { cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))} wrapProgram $out/bin/prosody \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" wrapProgram $out/bin/prosodyctl \ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" make -C tools/migration install wrapProgram $out/bin/prosody-migrator \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" ''; passthru = { From 6a08fcb524804d14cbbc527d417d81b658e4209c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 09:42:13 +0100 Subject: [PATCH 014/685] python3Packages.scmrepo: 0.0.7 -> 0.0.8 --- pkgs/development/python-modules/scmrepo/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index f4a024a46e9..ca54d726659 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.7"; + version = "0.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = version; - hash = "sha256-tZsogqcfAqpSo9yOz4z0mgY9SVU1epPmcBuyLJsHLfY="; + hash = "sha256-9eKQz1edfSneY0vE9ESEQdaRyZzkqqNVuRCfhU3s85M="; }; propagatedBuildInputs = [ @@ -37,6 +37,11 @@ buildPythonPackage rec { pygtrie ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" + ''; + # Requires a running Docker instance doCheck = false; From f94dfc5b40ab5ced42a13fa79ecc915935e7b182 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Mon, 21 Feb 2022 11:50:26 +0100 Subject: [PATCH 015/685] aspell: Build with ncurses fixes #161203 --- pkgs/development/libraries/aspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 777bad1e5a5..94db5562949 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl +{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl, ncurses , searchNixProfiles ? true }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ perl ]; - buildInputs = [ perl ]; + buildInputs = [ ncurses perl ]; doCheck = true; From a5eb7d85c83ba9e965daa8eca1fd420d835c7cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 21 Feb 2022 23:28:53 +0100 Subject: [PATCH 016/685] wxwidgets: remove unused asserts --- pkgs/development/libraries/wxwidgets/wxGTK28.nix | 2 -- pkgs/development/libraries/wxwidgets/wxGTK29.nix | 1 - pkgs/development/libraries/wxwidgets/wxGTK31.nix | 3 --- 3 files changed, 6 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK28.nix b/pkgs/development/libraries/wxwidgets/wxGTK28.nix index bc8fc6f5b04..452d7160c63 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK28.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK28.nix @@ -17,8 +17,6 @@ , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms }: -assert withMesa -> libGLU != null && libGL != null; - stdenv.mkDerivation rec { pname = "wxGTK"; version = "2.8.12.1"; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK29.nix b/pkgs/development/libraries/wxwidgets/wxGTK29.nix index 4a33d9263ed..87ad752125e 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK29.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK29.nix @@ -17,7 +17,6 @@ , darwin }: -assert withMesa -> libGLU != null && libGL != null; let inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index ae6f3e6a0c9..6e84b6deffe 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -23,9 +23,6 @@ , darwin }: -assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> webkitgtk != null; - assert withGtk2 -> (!withWebKit); let From ee2f1269d0734cafb182dc90e2848e138855e698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 21 Feb 2022 23:29:36 +0100 Subject: [PATCH 017/685] wxwidgets: remove darwin from inputs --- .../libraries/wxwidgets/wxGTK29.nix | 11 +++++----- .../libraries/wxwidgets/wxGTK30.nix | 9 ++++++--- .../libraries/wxwidgets/wxGTK31.nix | 9 ++++++--- .../libraries/wxwidgets/wxmac30.nix | 12 ++++++----- pkgs/top-level/all-packages.nix | 20 +++++++++++++++---- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK29.nix b/pkgs/development/libraries/wxwidgets/wxGTK29.nix index 87ad752125e..47724fe537d 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK29.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK29.nix @@ -14,13 +14,14 @@ , compat26 ? true , unicode ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, darwin +, setfile +, AGL +, Carbon +, Cocoa +, Kernel +, QuickTime }: -let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; -in stdenv.mkDerivation rec { pname = "wxGTK"; version = "2.9.5"; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 5b15d189a13..9395dd7eb36 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -17,14 +17,17 @@ , unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk -, darwin +, setfile +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit }: assert withGtk2 -> (!withWebKit); let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (gst_all_1) gstreamer gst-plugins-base; gtk = if withGtk2 then gtk2 else gtk3; in diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 6e84b6deffe..b0d3b418470 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -20,14 +20,17 @@ , withGtk2 ? true , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withWebKit ? false, webkitgtk -, darwin +, setfile +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit }: assert withGtk2 -> (!withWebKit); let - inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (gnome2) GConf; inherit (gst_all_1) gst-plugins-base gstreamer; gtk = if withGtk2 then gtk2 else gtk3; diff --git a/pkgs/development/libraries/wxwidgets/wxmac30.nix b/pkgs/development/libraries/wxwidgets/wxmac30.nix index e1f732929ce..73bf013452a 100644 --- a/pkgs/development/libraries/wxwidgets/wxmac30.nix +++ b/pkgs/development/libraries/wxwidgets/wxmac30.nix @@ -7,13 +7,15 @@ , libpng , libtiff , zlib -, darwin +, AGL +, Cocoa +, Kernel +, WebKit +, derez +, rez +, setfile }: -let - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; - inherit (darwin.stubs) derez rez setfile; -in stdenv.mkDerivation rec { pname = "wxmac"; version = "3.0.5.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f9cacb5025..a6ee1c3df61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20509,10 +20509,22 @@ with pkgs; wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { }; - wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { }; - wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { }; - wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { }; - wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { }; + wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; + }; + wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; + wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; + wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { + inherit (darwin.stubs) derez rez setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel WebKit; + }; wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; }; From 368ad4df2ea6900656287072d32fe9f0d22d9ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 21 Feb 2022 23:30:03 +0100 Subject: [PATCH 018/685] wxwidgets: resolve easy let ins --- pkgs/development/libraries/wxwidgets/wxGTK30.nix | 5 ++--- pkgs/development/libraries/wxwidgets/wxGTK31.nix | 8 +++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 9395dd7eb36..7fad497c9ce 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -28,7 +28,6 @@ assert withGtk2 -> (!withWebKit); let - inherit (gst_all_1) gstreamer gst-plugins-base; gtk = if withGtk2 then gtk2 else gtk3; in stdenv.mkDerivation rec { @@ -47,8 +46,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gstreamer - gst-plugins-base + gst_all_1.gstreamer + gst_all_1.gst-plugins-base gtk libSM libXinerama diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index b0d3b418470..181869075a2 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -31,8 +31,6 @@ assert withGtk2 -> (!withWebKit); let - inherit (gnome2) GConf; - inherit (gst_all_1) gst-plugins-base gstreamer; gtk = if withGtk2 then gtk2 else gtk3; in stdenv.mkDerivation rec { @@ -55,8 +53,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gst-plugins-base - gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gstreamer gtk libSM libXinerama @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optionals withGtk2 [ - GConf + gnome2.GConf ] ++ lib.optional withMesa libGLU ++ lib.optional withWebKit webkitgtk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6ee1c3df61..bfb810910db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20523,7 +20523,7 @@ with pkgs; }; wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { inherit (darwin.stubs) derez rez setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel WebKit; + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; }; wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; From db949f020acda8460616f81ac85ed6fd130c1fe9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 14:46:26 +0100 Subject: [PATCH 019/685] gmpxx: remove appendToName to have a consistent package name for repology --- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 9093073cecf..af4f15a151f 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -12,7 +12,7 @@ let inherit (lib) optional; in let self = stdenv.mkDerivation rec { - pname = "gmp"; + pname = "gmp${lib.optionalString cxx "-with-cxx"}"; version = "6.2.1"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4f9b4251d4..4ee9d15fee4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16930,7 +16930,7 @@ with pkgs; gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; gmp = gmp6; - gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); + gmpxx = gmp.override { cxx = true; }; #GMP ex-satellite, so better keep it near gmp mpfr = callPackage ../development/libraries/mpfr { }; From b14ec1a927b82b7792d0b1244be4a68110eb400f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 22 Feb 2022 18:56:27 +0100 Subject: [PATCH 020/685] libusb1: fix build on darwin --- pkgs/development/libraries/libusb1/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index e7d470396a6..ba01f820fd8 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -7,6 +7,7 @@ , udev , libobjc , IOKit +, Security , withStatic ? false }: @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; propagatedBuildInputs = lib.optional enableUdev udev ++ - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; dontDisableStatic = withStatic; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4f9b4251d4..23f63a3ebb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18721,7 +18721,7 @@ with pkgs; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit Security; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; }; From c01851e31c3f25a1debb130517b0a06c9bc8c772 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 20:13:24 +0100 Subject: [PATCH 021/685] ghostscriptX: remove appendToName to have a consistent package name for repology --- pkgs/misc/ghostscript/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index e80ad8a839f..327cf286234 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { - pname = "ghostscript"; + pname = "ghostscript${lib.optionalString (x11Support) "-with-X"}"; version = "9.55.0"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/ghostscript-${version}.tar.xz"; sha512 = "27g72152mlwlalg232jxdhaf3ykgmqwi2pccbkwfygql1h9iz40plfbwbs1n0fkvm4zwzg5r9cr8g7w2dxih4jldiidv7rflxdy1is2"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69a11ddca15..bf46d9ab98e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33070,10 +33070,10 @@ with pkgs; ghostscript = callPackage ../misc/ghostscript { }; - ghostscriptX = appendToName "with-X" (ghostscript.override { + ghostscriptX = ghostscript.override { cupsSupport = true; x11Support = true; - }); + }; glava = callPackage ../applications/misc/glava {}; From f24f73b562140d8af7299b6dfc5a976c9f8af0cc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 23 Feb 2022 18:28:27 +0100 Subject: [PATCH 022/685] kde-frameworks: rename name to pname --- pkgs/development/libraries/kde-frameworks/attica.nix | 2 +- pkgs/development/libraries/kde-frameworks/baloo.nix | 2 +- pkgs/development/libraries/kde-frameworks/bluez-qt.nix | 2 +- pkgs/development/libraries/kde-frameworks/breeze-icons.nix | 2 +- pkgs/development/libraries/kde-frameworks/default.nix | 7 +++---- .../kde-frameworks/extra-cmake-modules/default.nix | 2 +- .../libraries/kde-frameworks/frameworkintegration.nix | 2 +- .../libraries/kde-frameworks/kactivities-stats.nix | 2 +- pkgs/development/libraries/kde-frameworks/kactivities.nix | 2 +- pkgs/development/libraries/kde-frameworks/kapidox.nix | 2 +- pkgs/development/libraries/kde-frameworks/karchive.nix | 2 +- .../development/libraries/kde-frameworks/kauth/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kbookmarks.nix | 2 +- .../development/libraries/kde-frameworks/kcalendarcore.nix | 2 +- .../libraries/kde-frameworks/kcmutils/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kcodecs.nix | 2 +- pkgs/development/libraries/kde-frameworks/kcompletion.nix | 2 +- pkgs/development/libraries/kde-frameworks/kconfig.nix | 2 +- .../libraries/kde-frameworks/kconfigwidgets/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kcontacts.nix | 2 +- pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 2 +- pkgs/development/libraries/kde-frameworks/kcrash.nix | 2 +- pkgs/development/libraries/kde-frameworks/kdav.nix | 2 +- pkgs/development/libraries/kde-frameworks/kdbusaddons.nix | 2 +- pkgs/development/libraries/kde-frameworks/kdeclarative.nix | 2 +- pkgs/development/libraries/kde-frameworks/kded.nix | 2 +- .../libraries/kde-frameworks/kdelibs4support/default.nix | 2 +- .../libraries/kde-frameworks/kdesignerplugin.nix | 2 +- .../development/libraries/kde-frameworks/kdesu/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kdewebkit.nix | 2 +- pkgs/development/libraries/kde-frameworks/kdnssd.nix | 2 +- .../libraries/kde-frameworks/kdoctools/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kemoticons.nix | 2 +- .../libraries/kde-frameworks/kfilemetadata/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kglobalaccel.nix | 2 +- pkgs/development/libraries/kde-frameworks/kguiaddons.nix | 2 +- pkgs/development/libraries/kde-frameworks/kholidays.nix | 2 +- pkgs/development/libraries/kde-frameworks/khtml.nix | 2 +- pkgs/development/libraries/kde-frameworks/ki18n.nix | 2 +- .../libraries/kde-frameworks/kiconthemes/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kidletime.nix | 2 +- .../development/libraries/kde-frameworks/kimageformats.nix | 2 +- .../development/libraries/kde-frameworks/kinit/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kio/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kirigami2.nix | 2 +- pkgs/development/libraries/kde-frameworks/kitemmodels.nix | 2 +- pkgs/development/libraries/kde-frameworks/kitemviews.nix | 2 +- pkgs/development/libraries/kde-frameworks/kjobwidgets.nix | 2 +- pkgs/development/libraries/kde-frameworks/kjs.nix | 2 +- pkgs/development/libraries/kde-frameworks/kjsembed.nix | 2 +- pkgs/development/libraries/kde-frameworks/kmediaplayer.nix | 2 +- .../libraries/kde-frameworks/knewstuff/default.nix | 2 +- .../libraries/kde-frameworks/knotifications.nix | 2 +- .../development/libraries/kde-frameworks/knotifyconfig.nix | 2 +- .../libraries/kde-frameworks/kpackage/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kparts.nix | 2 +- pkgs/development/libraries/kde-frameworks/kpeople.nix | 2 +- pkgs/development/libraries/kde-frameworks/kplotting.nix | 2 +- pkgs/development/libraries/kde-frameworks/kpty.nix | 2 +- pkgs/development/libraries/kde-frameworks/kquickcharts.nix | 2 +- pkgs/development/libraries/kde-frameworks/kross.nix | 2 +- pkgs/development/libraries/kde-frameworks/krunner.nix | 2 +- .../libraries/kde-frameworks/kservice/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/ktexteditor.nix | 2 +- pkgs/development/libraries/kde-frameworks/ktextwidgets.nix | 2 +- .../libraries/kde-frameworks/kunitconversion.nix | 2 +- pkgs/development/libraries/kde-frameworks/kwallet.nix | 2 +- pkgs/development/libraries/kde-frameworks/kwayland.nix | 2 +- .../libraries/kde-frameworks/kwidgetsaddons.nix | 2 +- .../libraries/kde-frameworks/kwindowsystem/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/kxmlgui.nix | 2 +- .../development/libraries/kde-frameworks/kxmlrpcclient.nix | 2 +- .../libraries/kde-frameworks/modemmanager-qt.nix | 2 +- .../libraries/kde-frameworks/networkmanager-qt.nix | 2 +- .../development/libraries/kde-frameworks/oxygen-icons5.nix | 2 +- .../libraries/kde-frameworks/plasma-framework.nix | 2 +- pkgs/development/libraries/kde-frameworks/prison.nix | 2 +- pkgs/development/libraries/kde-frameworks/purpose.nix | 2 +- .../libraries/kde-frameworks/qqc2-desktop-style.nix | 2 +- pkgs/development/libraries/kde-frameworks/solid.nix | 2 +- pkgs/development/libraries/kde-frameworks/sonnet.nix | 2 +- pkgs/development/libraries/kde-frameworks/syndication.nix | 2 +- .../libraries/kde-frameworks/syntax-highlighting.nix | 2 +- pkgs/development/libraries/kde-frameworks/threadweaver.nix | 2 +- 84 files changed, 86 insertions(+), 87 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 8c71afd5dcf..dbe4dd14b8f 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, qtbase }: mkDerivation { - name = "attica"; + pname = "attica"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 0c8f181a188..d608785027e 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "baloo"; + pname = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index c5764b4915e..c07553f8493 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "bluez-qt"; + pname = "bluez-qt"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtdeclarative ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 6e79a45ea92..7fd482ea0da 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gtk3, qtsvg, hicolor-icon-theme }: mkDerivation { - name = "breeze-icons"; + pname = "breeze-icons"; nativeBuildInputs = [ extra-cmake-modules gtk3 ]; buildInputs = [ qtsvg ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index a5b0bfdae8d..2f7d0943dd4 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -70,8 +70,8 @@ let mkDerivation = args: let - inherit (args) name; - inherit (srcs.${name}) src version; + inherit (args) pname; + inherit (srcs.${pname}) src version; outputs = args.outputs or [ "bin" "dev" "out" ]; hasSeparateDev = lib.elem "dev" outputs; @@ -90,8 +90,7 @@ let }; in mkDerivation (args // { - name = "${name}-${version}"; - inherit meta outputs setupHook src version; + inherit pname meta outputs setupHook src version; }); }; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index b74fb29e5f2..b274999010a 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, pkg-config }: mkDerivation { - name = "extra-cmake-modules"; + pname = "extra-cmake-modules"; patches = [ ./nix-lib-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index c49eab2763c..6cb700c7774 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "frameworkintegration"; + pname = "frameworkintegration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 88fde8c5fd6..63a5b035724 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kactivities-stats"; + pname = "kactivities-stats"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kactivities kconfig ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index b53de41455a..f2f5d09cc8e 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kactivities"; + pname = "kactivities"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kio kwindowsystem qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix index 381dacaf496..8d3e89935f8 100644 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, python3 }: mkDerivation { - name = "kapidox"; + pname = "kapidox"; nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ]; postFixup = '' moveToOutput bin $bin diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index bd010f3f11c..822b28f3dee 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "karchive"; + pname = "karchive"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ bzip2 xz zlib zstd ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 630b51bf46b..bedddda3ba4 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kauth"; + pname = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ polkit-qt qttools ]; propagatedBuildInputs = [ kcoreaddons ]; diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index 4d68c3694bd..1c45a4acb09 100644 --- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kbookmarks"; + pname = "kbookmarks"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index f4f2b05ad73..3f02765af8e 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcalendarcore"; + pname = "kcalendarcore"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ libical ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index 22e2929ae0c..f965256ce3d 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcmutils"; + pname = "kcmutils"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index a62135150a0..69a9e812494 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, qtbase, qttools, gperf }: mkDerivation { - name = "kcodecs"; + pname = "kcodecs"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools gperf ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index ffa612ffaa1..28b4715f98f 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcompletion"; + pname = "kcompletion"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kwidgetsaddons qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index ba16e97ef3a..76d9a85e649 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, qtbase, qttools }: mkDerivation { - name = "kconfig"; + pname = "kconfig"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index fc10f3070b6..e9b283ebc31 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kconfigwidgets"; + pname = "kconfigwidgets"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kguiaddons ki18n qtbase qttools ]; propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcontacts.nix b/pkgs/development/libraries/kde-frameworks/kcontacts.nix index 56887b775f4..0d26d064dd2 100644 --- a/pkgs/development/libraries/kde-frameworks/kcontacts.nix +++ b/pkgs/development/libraries/kde-frameworks/kcontacts.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcontacts"; + pname = "kcontacts"; meta = { license = [ lib.licenses.lgpl21 ]; }; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index a2102c7d732..f790d802c0c 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcoreaddons"; + pname = "kcoreaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index 27dc6d65edf..4658ab5c6da 100644 --- a/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcrash"; + pname = "kcrash"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdav.nix b/pkgs/development/libraries/kde-frameworks/kdav.nix index a03cca3fdf2..92d57158e32 100644 --- a/pkgs/development/libraries/kde-frameworks/kdav.nix +++ b/pkgs/development/libraries/kde-frameworks/kdav.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdav"; + pname = "kdav"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; }; diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index 5c435b44541..b123129cf8d 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdbusaddons"; + pname = "kdbusaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 1389df5eb15..08f7cb5d378 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdeclarative"; + pname = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libepoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 250a999f4d6..180d508acc5 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kded"; + pname = "kded"; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 392aa9ea902..1e7b3073875 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kdelibs4support"; + pname = "kdelibs4support"; patches = [ ./nix-kde-include-dir.patch ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index f1305274070..6244b82397a 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kdesignerplugin"; + pname = "kdesignerplugin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix index 9a5f5a6942a..fe506401da4 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdesu"; + pname = "kdesu"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ]; propagatedBuildInputs = [ kpty ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix index 9f682b44975..b6d548cabfc 100644 --- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "kdewebkit"; + pname = "kdewebkit"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons kio kparts ]; propagatedBuildInputs = [ qtwebkit ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 8bb59bb36db..545057e7ef1 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdnssd"; + pname = "kdnssd"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ avahi qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index a87bef40b1e..83f3a04ee36 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kdoctools"; + pname = "kdoctools"; nativeBuildInputs = [ extra-cmake-modules # The build system insists on having native Perl. diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix index 66a0889b13d..67613d274a7 100644 --- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kemoticons"; + pname = "kemoticons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kcoreaddons ]; propagatedBuildInputs = [ kservice qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 7c16dcf4650..782b0332214 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -15,7 +15,7 @@ }: mkDerivation { - name = "kfilemetadata"; + pname = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attr diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 7001c98ee00..ab181b8d902 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kglobalaccel"; + pname = "kglobalaccel"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index bcd18ab614b..d3575717592 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kguiaddons"; + pname = "kguiaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras wayland ]; diff --git a/pkgs/development/libraries/kde-frameworks/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix index 2ede69e7495..9484dece57e 100644 --- a/pkgs/development/libraries/kde-frameworks/kholidays.nix +++ b/pkgs/development/libraries/kde-frameworks/kholidays.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kholidays"; + pname = "kholidays"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = with lib.maintainers; [ bkchr ]; diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 3ef3a043c4e..9677ffb78a5 100644 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "khtml"; + pname = "khtml"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 46f502d06bb..be8016155b8 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ki18n"; + pname = "ki18n"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python3 ]; buildInputs = [ qtdeclarative qtscript ]; diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 122f3108da4..f807193718d 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kiconthemes"; + pname = "kiconthemes"; patches = [ ./default-theme-breeze.patch ]; diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 2678cf0804e..6379a5e2e31 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kidletime"; + pname = "kidletime"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 97b413e805c..86026bf50f4 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -7,7 +7,7 @@ let inherit (lib) getDev; in mkDerivation { - name = "kimageformats"; + pname = "kimageformats"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive openexr libavif qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index dcd84f1f35a..9acd56f324c 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -7,7 +7,7 @@ let inherit (lib) getLib; in mkDerivation { - name = "kinit"; + pname = "kinit"; outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 5c05e0159b5..7b2815945c8 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kio"; + pname = "kio"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix index bb5a5a3fc80..281a490bf90 100644 --- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations, qtgraphicaleffects }: mkDerivation { - name = "kirigami2"; + pname = "kirigami2"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 0f398b0f57d..8abed8aaa09 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kitemmodels"; + pname = "kitemmodels"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 0e772978e19..ef350835f05 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kitemviews"; + pname = "kitemviews"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 2e116b7bb79..a4a6d5bb102 100644 --- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kjobwidgets"; + pname = "kjobwidgets"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index 33aeb284e16..a0f98532374 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kjs"; + pname = "kjs"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ pcre qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix index f552f963513..576727e81d2 100644 --- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kjsembed"; + pname = "kjsembed"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ ki18n qtsvg ]; propagatedBuildInputs = [ kjs ]; diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index 5de26e0c8dc..f92c2295651 100644 --- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kmediaplayer"; + pname = "kmediaplayer"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kparts kxmlgui ]; } diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index 6d170c0bb12..6e554b5faaa 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "knewstuff"; + pname = "knewstuff"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index d1a809d9f51..363ca46d10a 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "knotifications"; + pname = "knotifications"; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index 1971e3e8039..b2415d731ff 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "knotifyconfig"; + pname = "knotifyconfig"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcompletion kconfig ki18n kio phonon ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index d4edc09b2f0..c1d9bf387fc 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kpackage"; + pname = "kpackage"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix index e1d2a156160..682c2da6313 100644 --- a/pkgs/development/libraries/kde-frameworks/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks/kparts.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kparts"; + pname = "kparts"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix index 52c16ea2b9c..433cc6b6e11 100644 --- a/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kpeople"; + pname = "kpeople"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 68df24d0087..eb26b252566 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "kplotting"; + pname = "kplotting"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qttools ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix index 2456f4e22fa..239407d6abd 100644 --- a/pkgs/development/libraries/kde-frameworks/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks/kpty.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }: mkDerivation { - name = "kpty"; + pname = "kpty"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix index 0ae30be653d..20c1b2368a7 100644 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kquickcharts"; + pname = "kquickcharts"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtquickcontrols2 ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix index 189e100aa70..7cc083e5a26 100644 --- a/pkgs/development/libraries/kde-frameworks/kross.nix +++ b/pkgs/development/libraries/kde-frameworks/kross.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kross"; + pname = "kross"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kcoreaddons kxmlgui ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index 7db7c61db46..a56e56a2fe0 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -7,7 +7,7 @@ let self = mkDerivation { - name = "krunner"; + pname = "krunner"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kio kservice qtdeclarative solid diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index c1488f728dd..008c52cf078 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kservice"; + pname = "kservice"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedNativeBuildInputs = [ bison flex ]; buildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 6a74dca7b4b..5788c07cb05 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "ktexteditor"; + pname = "ktexteditor"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 653d0ac8899..6ce7aa88c3a 100644 --- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "ktextwidgets"; + pname = "ktextwidgets"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index de0d9aab922..aa4c87a1e5f 100644 --- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, ki18n, qtbase, }: mkDerivation { - name = "kunitconversion"; + pname = "kunitconversion"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index f93f0437dbd..e2a54a03f6e 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kwallet"; + pname = "kwallet"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 749735c4ad5..6a070d22780 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kwayland"; + pname = "kwayland"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index ee347df18ab..0fead3bfd6b 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kwidgetsaddons"; + pname = "kwidgetsaddons"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 7643572a7ec..ec102dbb342 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kwindowsystem"; + pname = "kwindowsystem"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index 0b29158e4b0..c666edbc196 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kxmlgui"; + pname = "kxmlgui"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attica kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index aa334d69ef1..3b2d869d177 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, ki18n, kio }: mkDerivation { - name = "kxmlrpcclient"; + pname = "kxmlrpcclient"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n ]; propagatedBuildInputs = [ kio ]; diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index 5ecb5317cfc..507e24e8f61 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "modemmanager-qt"; + pname = "modemmanager-qt"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ modemmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 2ff4b2c2b40..b79c79b084d 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "networkmanager-qt"; + pname = "networkmanager-qt"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 32b219ab7e1..7121944d5d3 100644 --- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "oxygen-icons5"; + pname = "oxygen-icons5"; meta.license = lib.licenses.lgpl3Plus; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 12540b07007..cf118beaabc 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "plasma-framework"; + pname = "plasma-framework"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix index 670fd02d616..c2063e22bba 100644 --- a/pkgs/development/libraries/kde-frameworks/prison.nix +++ b/pkgs/development/libraries/kde-frameworks/prison.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "prison"; + pname = "prison"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libdmtx qrencode ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index 0f376ce9ec3..ee4e9584641 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "purpose"; + pname = "purpose"; nativeBuildInputs = [ extra-cmake-modules intltool ]; buildInputs = [ qtbase accounts-qt qtdeclarative kaccounts-integration kconfig kcoreaddons diff --git a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix index e400967407c..6d8635c4f28 100644 --- a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix +++ b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "qqc2-desktop-style"; + pname = "qqc2-desktop-style"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras qtquickcontrols2 kconfig kiconthemes kirigami2 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index aa1b1ebe345..69ef8c8adca 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "solid"; + pname = "solid"; nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 2eff7bad240..78aa189559f 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "sonnet"; + pname = "sonnet"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ aspell qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/pkgs/development/libraries/kde-frameworks/syndication.nix index fd5a9b9db84..1d32f9b7021 100644 --- a/pkgs/development/libraries/kde-frameworks/syndication.nix +++ b/pkgs/development/libraries/kde-frameworks/syndication.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "syndication"; + pname = "syndication"; meta.maintainers = [ lib.maintainers.bkchr ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcodecs ]; diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index a295b23f321..fee392140f7 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "syntax-highlighting"; + pname = "syntax-highlighting"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index bfa529c9267..fb43b9f28b0 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "threadweaver"; + pname = "threadweaver"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; From 0269c10d747b3d95847d4afc19e84701c9ff0fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 23 Feb 2022 20:26:44 +0100 Subject: [PATCH 023/685] openssh: 8.8p1 -> 8.9p1 --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 6 ++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ pkgs/tools/networking/openssh/default.nix | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 612846122a7..e0e42a23260 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -329,6 +329,12 @@ relying on the insecure behaviour before upgrading. + + + openssh has been update to 8.9p1, changing + the FIDO security key middleware interface. + + The DHCP server (services.dhcpd4, diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a8017f26708..b92ba066bfd 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -113,6 +113,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading. +- `openssh` has been update to 8.9p1, changing the FIDO security key middleware interface. + - The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened. The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities. The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed. diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index e8cad75698f..08c1eb95d43 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,11 +6,11 @@ in openssh = common rec { pname = "openssh"; - version = "8.8p1"; + version = "8.9p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425"; + sha256 = "sha256:1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx"; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; From 1cf552b7db2dd9aeda460b3ab8553a21605c2f39 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 23 Feb 2022 21:41:06 +0100 Subject: [PATCH 024/685] isl: rename name to pname&version --- pkgs/development/libraries/isl/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/isl/generic.nix b/pkgs/development/libraries/isl/generic.nix index eb6fe5f9cd6..0a8c89d88ad 100644 --- a/pkgs/development/libraries/isl/generic.nix +++ b/pkgs/development/libraries/isl/generic.nix @@ -9,7 +9,8 @@ }: stdenv.mkDerivation { - name = "isl-${version}"; + pname = "isl"; + inherit version; src = fetchurl { inherit urls sha256; From 92074a45f308a1c42de2c57233471bfd7cc6189c Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Wed, 23 Feb 2022 21:57:01 +0100 Subject: [PATCH 025/685] darwin.apple_sdk.frameworks.IOSurface: use Libsystem instead of xpc (#161561) --- pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix index 96c0475c087..5f26a14341f 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix @@ -89,7 +89,7 @@ IOBluetooth = { inherit CoreBluetooth IOKit; }; IOBluetoothUI = { inherit IOBluetooth; }; IOKit = {}; - IOSurface = { inherit IOKit xpc; }; + IOSurface = { inherit IOKit Libsystem; }; IOUSBHost = {}; IdentityLookup = {}; ImageCaptureCore = {}; From 215b0774d134c824ace91865d8a37c8f7839e7d8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 23 Feb 2022 23:41:57 +0100 Subject: [PATCH 026/685] libappindicator: rename name to pname&version --- pkgs/development/libraries/libappindicator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 469235e2e6a..8ca2acc11c7 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -13,8 +13,8 @@ with lib; stdenv.mkDerivation rec { - name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; - in "libappindicator-${postfix}-${version}"; + pname = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; + in "libappindicator-${postfix}"; version = "12.10.1+20.10.20200706.1"; outputs = [ "out" "dev" ]; From c7d1c41680c7d0c1ddea0098205a469e06175e95 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 24 Feb 2022 00:18:33 +0000 Subject: [PATCH 027/685] flac: 1.3.3 -> 1.3.4 --- pkgs/applications/audio/flac/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 0b1a2edc3ba..621804840bf 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -2,21 +2,13 @@ stdenv.mkDerivation rec { pname = "flac"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "http://downloads.xiph.org/releases/flac/${pname}-${version}.tar.xz"; - sha256 = "0j0p9sf56a2fm2hkjnf7x3py5ir49jyavg4q5zdyd7bcf6yq4gi1"; + sha256 = "0dz7am8kbc97a6afml1h4yp085274prg8j7csryds8m3fmz61w4g"; }; - patches = [ - (fetchpatch { - name = "CVE-2020-0499.patch"; - url = "https://github.com/xiph/flac/commit/2e7931c27eb15e387da440a37f12437e35b22dd4.patch"; - sha256 = "160qzq9ms5addz7sx06pnyjjkqrffr54r4wd8735vy4x008z71ah"; - }) - ]; - buildInputs = [ libogg ]; #doCheck = true; # takes lots of time From 4fe96a6b168fbd2165ee4962503f487ac188695c Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Thu, 24 Feb 2022 08:54:39 +0100 Subject: [PATCH 028/685] Test curses dependency --- pkgs/development/libraries/aspell/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 94db5562949..b839092228b 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, fetchzip, perl, ncurses + + # for tests +, aspell, glibc, runCommand + , searchNixProfiles ? true }: @@ -55,6 +59,19 @@ stdenv.mkDerivation rec { cp ${devaMapsSource}/u-deva.{cmap,cset} $out/lib/aspell/ ''; + passthru.tests = { + uses-curses = runCommand "${pname}-curses" { + buildInputs = [ glibc ]; + } '' + if ! ldd ${aspell}/bin/aspell | grep -q ${ncurses} + then + echo "Test failure: It does not look like aspell picked up the curses dependency." + exit 1 + fi + touch $out + ''; + }; + meta = { description = "Spell checker for many languages"; homepage = "http://aspell.net/"; From e693994cc8704b5fe9d9ca294c369811f9ccff58 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 21 Feb 2022 21:50:59 -0800 Subject: [PATCH 029/685] patchelf: 0.14.3 -> 0.14.5 --- pkgs/development/tools/misc/patchelf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index dcb4d2362c8..6919cd0f23f 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "0.14.3"; + version = "0.14.5"; src = fetchurl { url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-oBfsPSFSoZ/ZacDYez+LQ+MqZuT/q9yHZ6VgYrmuwnA="; + sha256 = "sha256-uaRvKYkyLrifpPYjfiCDbFe0VapDoyVF6gk7Qx2YL1w="; }; setupHook = [ ./setup-hook.sh ]; From c5e32a90f8df3f1f890fde6c3800ce67673b3ab5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 23 Feb 2022 08:46:28 +1000 Subject: [PATCH 030/685] sqlite: 3.37.2 -> 3.38.0 https://www.sqlite.org/releaselog/3_38_0.html --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6704d894f5a..5fa77aa8293 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -11,13 +11,13 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.37.2"; + version = "3.38.0"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-QImo2bRnU3s/JG8he4TNduALHRqXH+WsoeMOIw5Gstg="; + sha256 = "sha256-HHbiXcY9nzk14PQGrsUgoz7nfPVOpRR9/+H66Dae/2g="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index d8d3735fe3d..1a5d709016d 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.37.2"; + version = "3.38.0"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-SGdwtNX4i1uw26VA3W7hdjBn11Od/uGKfGb+m7A9Ftk="; + sha256 = "sha256-d8U9SBLK14VvXxoeB9KiwqNETSapZSdCefjdn6pv9IA="; }; nativeBuildInputs = [ unzip ]; From 1bcbec677a6925ce415841f3a50ffc48915e4363 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Feb 2022 20:37:00 +0100 Subject: [PATCH 031/685] cyrus_sasl: 2.1.27 -> 2.1.28 https://www.cyrusimap.org/sasl/sasl/release-notes/2.1/index.html#new-in-2-1-28 Fixes: CVE-2022-24407 ("Escape password for SQL insert/update commands.") Co-Authored-By: illustris --- .../cyrus-sasl-ac-try-run-fix.patch | 23 ++++++++++--------- .../libraries/cyrus-sasl/default.nix | 21 +++++++---------- .../libraries/cyrus-sasl/missing-size_t.patch | 13 ----------- 3 files changed, 20 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/cyrus-sasl/missing-size_t.patch diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch index 8662e812e99..f0376792e00 100644 --- a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch +++ b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch @@ -1,12 +1,13 @@ ---- a/m4/sasl2.m4 2018-11-18 22:33:29.902625600 +0300 -+++ b/m4/sasl2.m4 2018-11-18 22:33:59.828746176 +0300 -@@ -339,7 +339,8 @@ - ], - [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) - AC_MSG_RESULT(yes) ], -- AC_MSG_RESULT(no)) -+ AC_MSG_RESULT(no), -+ AC_MSG_RESULT(no)) - LIBS="$cmu_save_LIBS" +diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 +index 098c853a..91d98def 100644 +--- a/m4/sasl2.m4 ++++ b/m4/sasl2.m4 +@@ -350,7 +350,7 @@ int main(void) - else + return (!have_spnego); // 0 = success, 1 = failure + } +-],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no]) ++],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no],[ac_cv_gssapi_supports_spnego=no]) + LIBS="$cmu_save_LIBS" + ]) + AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[ diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 6e97c61a6a5..24cd2a7ebc5 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false -, buildPackages, pruneLibtoolFiles, fetchpatch }: +, buildPackages, pruneLibtoolFiles }: with lib; stdenv.mkDerivation rec { pname = "cyrus-sasl"; - version = "2.1.27"; + version = "2.1.28"; src = fetchurl { urls = @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { "http://www.cyrusimap.org/releases/${pname}-${version}.tar.gz" "http://www.cyrusimap.org/releases/old/${pname}-${version}.tar.gz" ]; - sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; + sha256 = "sha256-fM/Gq9Ae1nwaCSSzU+Um8bdmsh9C1FYu5jWo6/xbs4w="; }; + patches = [ + # Fix cross-compilation + ./cyrus-sasl-ac-try-run-fix.patch + ]; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -26,16 +31,6 @@ stdenv.mkDerivation rec { ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isLinux pam; - patches = [ - ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 - ./cyrus-sasl-ac-try-run-fix.patch - (fetchpatch { - name = "CVE-2019-19906.patch"; - url = "https://sources.debian.org/data/main/c/cyrus-sasl2/2.1.27+dfsg-1+deb10u1/debian/patches/0021-CVE-2019-19906.patch"; - sha256 = "1n4c5wg7l9j8rlbvx8i605j5d39xmj5wm618k8acxl4fmglcmfls"; - }) - ]; - configureFlags = [ "--with-openssl=${openssl.dev}" "--with-plugindir=${placeholder "out"}/lib/sasl2" diff --git a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch deleted file mode 100644 index da96818ca26..00000000000 --- a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch +++ /dev/null @@ -1,13 +0,0 @@ -Gentoo bug #458790 ---- a/include/sasl.h 2012-10-12 17:05:48.000000000 +0300 -+++ b/include/sasl.h 2013-02-23 16:56:44.648786268 +0200 -@@ -121,6 +121,9 @@ - #ifndef SASL_H - #define SASL_H 1 - -+/* stddef.h to get size_t defined */ -+#include -+ - /* Keep in sync with win32/common.mak */ - #define SASL_VERSION_MAJOR 2 - #define SASL_VERSION_MINOR 1 From 7cc08a32e1b043abe26fdf306c228fd5413095d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 23 Feb 2022 11:54:17 +0100 Subject: [PATCH 032/685] cyrus_sasl: set up passthru tests --- pkgs/development/libraries/cyrus-sasl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 24cd2a7ebc5..be20a9b1678 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, openssl, openldap, libkrb5, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false -, buildPackages, pruneLibtoolFiles }: +, buildPackages, pruneLibtoolFiles, nixosTests }: with lib; stdenv.mkDerivation rec { @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; + passthru.tests = { + inherit (nixosTests) parsedmarc postfix; + }; + meta = { homepage = "https://www.cyrusimap.org/sasl"; description = "Library for adding authentication support to connection-based protocols"; From b69be3d855d33ea41d8a240ba0784a130cc98cd8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 23 Feb 2022 23:23:24 +0100 Subject: [PATCH 033/685] avahi: rename name to pname --- pkgs/development/libraries/avahi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index a52d1be566e..dc55b85d5b2 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { - name = "avahi${lib.optionalString withLibdnssdCompat "-compat"}-${version}"; + pname = "avahi${lib.optionalString withLibdnssdCompat "-compat"}"; version = "0.8"; src = fetchurl { From 041dcd46a5de60165e43912ffdad4a32e65808ab Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 24 Feb 2022 00:29:36 +0100 Subject: [PATCH 034/685] krb5: rename name to pname&version --- pkgs/development/libraries/kerberos/krb5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index c632c2fdac9..e1251b0e942 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -18,7 +18,7 @@ let in with lib; stdenv.mkDerivation rec { - name = "${type}krb5-${version}"; + pname = "${type}krb5"; version = "1.19.2"; src = fetchurl { From daef4faf187913c17b5bd74fee9d54a570fb79ec Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Thu, 24 Feb 2022 10:15:45 -0800 Subject: [PATCH 035/685] python3Packages.uvloop: fix tests on Darwin --- pkgs/development/python-modules/uvloop/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 72ede5dc171..b4b75dbb194 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -62,8 +62,12 @@ buildPythonPackage rec { "tests/test_sourcecode.py" ]; - # force using installed/compiled uvloop vs source by moving tests to temp dir - preCheck = '' + preCheck = lib.optionalString stdenv.isDarwin '' + # Work around "OSError: AF_UNIX path too long" + # https://github.com/MagicStack/uvloop/issues/463 + export TMPDIR="/tmp" + '' + '' + # force using installed/compiled uvloop vs source by moving tests to temp dir export TEST_DIR=$(mktemp -d) cp -r tests $TEST_DIR pushd $TEST_DIR From 9427d3e060a90e359fd5473cc6b2f8f9a102a3bc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 23 Feb 2022 22:16:32 +0100 Subject: [PATCH 036/685] ijs: rename name to pname&version --- pkgs/development/libraries/ijs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index b300731ce44..ad13daef788 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, autoreconfHook, ghostscript }: stdenv.mkDerivation { - name = "ijs-${ghostscript.version}"; - - inherit (ghostscript) src; + pname = "ijs"; + inherit (ghostscript) version src; postPatch = "cd ijs"; From 4322a397635c4a9cb5b4c14fcee973ffd4f01b27 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 15 Feb 2022 01:02:33 +0100 Subject: [PATCH 037/685] apparmor: 3.0.3 -> 3.0.4 --- pkgs/os-specific/linux/apparmor/default.nix | 30 +++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 5c1cf272e0e..f588395e4e1 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook +{ stdenv, lib, fetchFromGitLab, fetchpatch, makeWrapper, autoreconfHook , pkg-config, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders @@ -21,7 +21,7 @@ }: let - apparmor-version = "3.0.3"; + apparmor-version = "3.0.4"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -31,9 +31,11 @@ let platforms = platforms.linux; }; - apparmor-sources = fetchurl { - url = "https://launchpad.net/apparmor/${lib.versions.majorMinor apparmor-version}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "0nasq8pdmzkrf856yg1v8z5hcs0nn6gw2qr60ab0a7j9ixfv0g8m"; + apparmor-sources = fetchFromGitLab { + owner = "apparmor"; + repo = "apparmor"; + rev = "v${apparmor-version}"; + sha256 = "1a217j28rgfq4lsmpn0wv1xgmdr9ba8iysv9i6q477kj6z77zrb9"; }; aa-teardown = writeShellScript "aa-teardown" '' @@ -48,8 +50,9 @@ let substituteInPlace ./common/Make.rules \ --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" \ --replace "/usr/bin/pod2html" "${buildPackages.perl}/bin/pod2html" \ - --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" \ --replace "/usr/share/man" "share/man" + substituteInPlace ./utils/Makefile \ + --replace "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" ''; patches = lib.optionals stdenv.hostPlatform.isMusl [ @@ -60,6 +63,8 @@ let }) ]; + python = python3.withPackages (ps: with ps; [ setuptools ]); + # Set to `true` after the next FIXME gets fixed or this gets some # common derivation infra. Too much copy-paste to fix one by one. doCheck = false; @@ -86,19 +91,16 @@ let ncurses which perl - ] ++ lib.optional withPython python3; + ] ++ lib.optional withPython python; buildInputs = lib.optional withPerl perl - ++ lib.optional withPython python3; + ++ lib.optional withPython python; # required to build apparmor-parser dontDisableStatic = true; prePatch = prePatchCommon + '' substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.am --replace install_vendor install_site - substituteInPlace ./libraries/libapparmor/swig/perl/Makefile.in --replace install_vendor install_site - substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h" - substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${lib.getDev stdenv.cc.libc}/include/netinet/in.h" ''; inherit patches; @@ -132,12 +134,12 @@ let strictDeps = true; - nativeBuildInputs = [ makeWrapper which python3 ]; + nativeBuildInputs = [ makeWrapper which python ]; buildInputs = [ bash perl - python3 + python libapparmor libapparmor.python ]; @@ -159,7 +161,7 @@ let postInstall = '' sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d" for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do - wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" + wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" done substituteInPlace $out/bin/aa-notify \ From 68cf28cec7f7984609db006912fc104c00eef6d9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 25 Feb 2022 01:42:59 +0100 Subject: [PATCH 038/685] apparmor: clean-up python path --- pkgs/os-specific/linux/apparmor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index f588395e4e1..a7afd838624 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -161,7 +161,7 @@ let postInstall = '' sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d" for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do - wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.sitePackages}:$PYTHONPATH" done substituteInPlace $out/bin/aa-notify \ From dc93e10397b6efadefe58fe0a74925595d273d75 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 24 Feb 2022 21:34:51 +0000 Subject: [PATCH 039/685] rust: 1.58.1 -> 1.59.0 Tested builds of fd, firefox, and thunderbird on x86_64-linux. --- .../compilers/rust/{1_58.nix => 1_59.nix} | 30 +++++++++---------- pkgs/top-level/all-packages.nix | 8 ++--- 2 files changed, 19 insertions(+), 19 deletions(-) rename pkgs/development/compilers/rust/{1_58.nix => 1_59.nix} (58%) diff --git a/pkgs/development/compilers/rust/1_58.nix b/pkgs/development/compilers/rust/1_59.nix similarity index 58% rename from pkgs/development/compilers/rust/1_58.nix rename to pkgs/development/compilers/rust/1_59.nix index c854bfdd37a..f3ded56c1be 100644 --- a/pkgs/development/compilers/rust/1_58.nix +++ b/pkgs/development/compilers/rust/1_59.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.58.1"; - rustcSha256 = "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"; + rustcVersion = "1.59.0"; + rustcSha256 = "sha256-p8juruhb/O+EyWsCsxcdHmVA0VF5/4Pd3Z6vuhhfhfk="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; @@ -37,24 +37,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.57.0"; + bootstrapVersion = "1.58.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa"; - x86_64-unknown-linux-gnu = "ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda"; - x86_64-unknown-linux-musl = "56876ebca0e46236208c8bd3c3425dba553abe49639e1040ee8b95bc66a45d33"; - arm-unknown-linux-gnueabihf = "b4448f7a96da4feee99a2c4b16b5738b99ab7e86e22d284ea6f7dca5921bca9b"; - armv7-unknown-linux-gnueabihf = "577682b1405e8901f971839407daaad06d8ae68ad370305b75d569ba293c4fb4"; - aarch64-unknown-linux-gnu = "d66847f7cf7b548ecb328c400ac4f691ee2aea6ff5cd9286ad8733239569556c"; - aarch64-unknown-linux-musl = "91c8e5171e5715261f7f635142a10a9415a4e5ba55374daf76f0b713c8b08132"; - x86_64-apple-darwin = "15ceffc4743434c19d08f73fb4edd6642b7fd8162ed7101d3e6ca2c691fcb699"; - aarch64-apple-darwin = "7511075e28b715e2d9c7ee74221779f8444681a4bb60ac3a0270a5fdf08bdd5a"; - powerpc64le-unknown-linux-gnu = "3ddc1abed6b7535c4150bf54291901fa856806c948bc21b711e24a3c8d810be7"; - riscv64gc-unknown-linux-gnu = "f809df1c6ac0adc9bd37eb871dfb0d9809f3ed7f61ba611f9305e9eb8f8c9226"; + i686-unknown-linux-gnu = "c3d282cd96cc9e5292e62db1ebb9fa6d5b738f4684d5ece9883f7472e2f76ad4"; + x86_64-unknown-linux-gnu = "4fac6df9ea49447682c333e57945bebf4f9f45ec7b08849e507a64b2ccd5f8fb"; + x86_64-unknown-linux-musl = "7036e34eadc8ce22d16b0625919d9f2244ca49a5441d6599f4822116c181d272"; + arm-unknown-linux-gnueabihf = "739389d46c5862b0e67d01dece99aa3db2229e055a3d7f7624679c55b6c33e06"; + armv7-unknown-linux-gnueabihf = "6cede2c7795e8126b0f17b1032d52500e594bac64c7d190bdc0ac1c832ef30bd"; + aarch64-unknown-linux-gnu = "ce557516593e4526709b0f33c2e1d7c932b3ddf76af94c2417d8d667921ce90c"; + aarch64-unknown-linux-musl = "b1533fdeeda483a3633617fd18a79d8fad7821331614b8dc13efd8b22acc30f5"; + x86_64-apple-darwin = "d0044680fc132a721481b130a0a4282a444867f423efdb890fe13e447966412f"; + aarch64-apple-darwin = "00b44985bc87e53c53d92622fb10226f09e9f25c79db48a77c0a769a36f83b1e"; + powerpc64le-unknown-linux-gnu = "b15baef702cbd6f0ea2bef7bf98ca7ce5644f2beb219028e8a12e7053da4c849"; + riscv64gc-unknown-linux-gnu = "d8ea2b11a4b24d1169fa3190127488b951b8bdef28293a4129ddd46c0ba9469b"; }; - selectRustPackage = pkgs: pkgs.rust_1_58; + selectRustPackage = pkgs: pkgs.rust_1_59; rustcPatches = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dce4ab3cc5a..471f8529328 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13087,18 +13087,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_58 = callPackage ../development/compilers/rust/1_58.nix { + rust_1_59 = callPackage ../development/compilers/rust/1_59.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_58; + rust = rust_1_59; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_58 = rust_1_58.packages.stable; - rustPackages = rustPackages_1_58; + rustPackages_1_59 = rust_1_59.packages.stable; + rustPackages = rustPackages_1_59; inherit (rustPackages) cargo clippy rustc rustPlatform; From 5db064dafb15a5d369d3ff09679514d8d18b23a0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 19 Feb 2022 12:22:41 +0100 Subject: [PATCH 040/685] libva: 2.13.0 -> 2.14.0 --- pkgs/development/libraries/libva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 10f90a16c92..4b7420c8e6b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "minimal"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "0vsvli3xc0gqqp06p7wkm973lhr7c5qgnyz5jfjmf8kv75rajazp"; + sha256 = "0q395lg6gp05mwf04zbrwgj6q9073lahh3wrcfa2i8ll60cfq9fg"; }; outputs = [ "dev" "out" ]; From f4b7ce72bf10d4af61e6ac6b240cf341f5d28e37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Feb 2022 07:52:00 +0000 Subject: [PATCH 041/685] libva-utils: 2.13.0 -> 2.14.0 --- pkgs/development/libraries/libva/utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 05ba3519ff4..f5538c34acd 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "0ahbwikdb0chf76whm62zz0a7zqil3gzsxmq38ccbqlmnnyjkbbb"; + sha256 = "sha256-WuNJCFBbXbLSftL+L15ruq9PxM1XhIfYpP/IccB+aBs="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From dcd0f1c61725ec45bc5774df5a71a24f6efca8ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Feb 2022 22:43:45 +0000 Subject: [PATCH 042/685] modemmanager: 1.18.4 -> 1.18.6 --- pkgs/tools/networking/modemmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 126b3b513a8..c9d56044b0d 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.18.4"; + version = "1.18.6"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-EfuXD2Pi2ojfS22HWeTuZJlExRUkS5eb9Qp6bfHX8Zk="; + sha256 = "sha256-1PgEsxz1BCOcXx1Jc8YglcAMuh7pq7UDcY2sbRRqRwo="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; From 59f6ea24c994d40443c66cc4fe643d8e1c453a94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 02:59:40 +0000 Subject: [PATCH 043/685] bubblewrap: 0.5.0 -> 0.6.0 --- pkgs/tools/admin/bubblewrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 4c6c6971fc9..0f92bae98d5 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Fv2vM3mdYxBONH4BM/kJGW/pDQxQUV0BC8tCLrWgCBg="; + sha256 = "sha256-ETk88gWPIuamxunMo8hf9MQjmAbLKP7mV8YqVE3zVpM="; }; nativeBuildInputs = [ libxslt docbook_xsl ]; From 8f548c8401d5ec0c4700b03eb2119975b07c76ec Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 26 Feb 2022 23:18:39 -0500 Subject: [PATCH 044/685] python3Packages.requests: remove unneded trustme dependency This removes rust from the build closure --- pkgs/development/python-modules/requests/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index f5b021801f4..86b2c2ffc39 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -13,7 +13,6 @@ , pytest-mock , pytest-xdist , pytestCheckHook -, trustme , urllib3 }: @@ -54,7 +53,6 @@ buildPythonPackage rec { pytest-mock pytest-xdist pytestCheckHook - trustme ]; # AttributeError: 'KeywordMapping' object has no attribute 'get' From 97acaf6d65e869abf7dc9e6825aef4c0e7b98432 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 4 Aug 2021 23:50:10 +0200 Subject: [PATCH 045/685] glibc: 2.33-108 -> 2.34-115 Announcement: https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html --- .../libraries/glibc/2.33-master.patch.gz | Bin 155232 -> 0 bytes .../libraries/glibc/2.34-master.patch.gz | Bin 0 -> 122816 bytes pkgs/development/libraries/glibc/common.nix | 16 +++---- .../libraries/glibc/nix-locale-archive.patch | 45 ++++++++++-------- 4 files changed, 32 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.33-master.patch.gz create mode 100644 pkgs/development/libraries/glibc/2.34-master.patch.gz diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz deleted file mode 100644 index 777e94e2b2ea5d258abdbebf8f671f8003327e97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155232 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%0DX$-ZyE^N&v1T-ZyxoKSeiZ`ovCs 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 z zHCA)o>W!~xY}plEw)9J#c)cY6IRhlNR%>xH|8#yjzTbZ;h_|c5`)KskF-g0GYbchJ z*he(WSi)JzxG#K^i;M~;c%F-hCn5_767*G2Ed7XsVNh)GKRRjQ^t=Lm z)qz*V;8TIGeR%5-tW}VlCnOAfkV-w?`}TjljeLMB>R?^-d~OQZRa)K{4Ct`e9$fqf00960>|J|r+c*;c z+xsbqZVSZgIH#8_+b9l~?PlBFrD-nCVQ+6y7}UdwTg7rMr-}E|-wcP8L_KUN**<_> zpr`_hB8S7_Z(bz*4ba*y%9|0qcaCL<$#h0S%H;D~5wnMinEd_=P1pnDfM1cqHo;dx zW@V?->GZ^|=`l%?(4KkR|In2`=S46kpWlFh`K#^YVN5pi`KPf!ZF>;=>Xf#Fu$0`U z2sSb(nIoUyh=4r;z~J*QGg%LWudha58}LFRnVFL*{5kXo4Ha4;IWxy3XY~9AVUuiW44#zfzo!NOAs^t^AVN z%J!+V#_137GeZx{f9(2Hu6NFTb6^hq`S9py5xh-z0{>r zTQ40^siT*UsdP{n1r5$B4vt1=6-H;$@T|h{Od6k67@tW4v}9(UCD2+2E)eZqxL%-rycA)+>u0weFC1)Y21*P7fkf zW!C)+B(OUHv-N0Y2{B}_m`)Goi#5E4ce8tACT?mHl{UZo%T3gI7V`T;hX3O-qFMdV z^kjBCo&EA+dU|q(i>I=jb>!_iZ;;$ov}JebBF(^4if@-2oOcIj`6{Gb+Vb|s3)d(+ z-gXlvbpD8S5*|gJr&dM-{VF{6Dt{jy`+0$Mi)Nq@+X(oEt0w%L)yEFzWHB?F0Pb|& zdtvAF;D+B*Xw({0XjDE0(`wjK%RBQ=$~#*gM3B!S@60B=v;M5SvnY}!pGDqTO?YSj z33;cK=Gd_K+?o%A=Yi`F&0sLJ!?8Q?TJA7FefdwmWR}ZJYhoD_ z(3PMtt^5{)vy)$@6LuWnNlowe3e?;^3}XZ836FaI_&@f&ChwdQ*XC{t5 zsZ9wRJh8kEqmU=z1PAe(WjjOb9h=gzJa4hYgSet@uwC*SD3iBtZsHFi==FoAr>}oJ zWKYjek1v0Id+`STe0%Zw9AO;6N?vx zCeQ>{e5H0(DDnn2v?gvO1KKtmY&#H;tLS#`qkMNe9tQyb718 zgoj{7*seP=hTgz4oRPuJ5qB+PXJq*X(5+1;9Pv&GReu=h5BK zvP#(B#JHVi%WP)Y6T_Sg(vyu&&N!T~w{nLIqhGH__s_~(f@d+x-4UIOm(;6WF^T@s zk&svUQksm?T>g$c`&Gn!oJ3(-dTYM)kwro>eK4kd|B&{|l<5-S7`Wtl{N~UxhFUF$iK5U%^CUZ6QQH9uh&jG~u7HHfQtjPT$WXj+HOP zt$8XQfqx&7?9ia85mB(_cd|@OzbKO>V!eW_izR^o8zJF@qr1pw(Yy4IauBX_pAXda(5gW&9?_>BC#jnkP|q9 zO>^#hfcOJrj@SB)+`%ZcL$`SVB-h~na7V7Puoj1hBd`^RYJ;cn_B3S*KH`g47g(P9 zqvtQ)oS*!=^JxW&E&Lb=U6{W6@#5|APcM$Am!15MzkHn+uZ}M$P9hv&am2d5d9Ok9 zUUl=rU6<+_|I`L{ajb@x`}PD%XXlp}vx}3LozTC}zq`o4TkG$RPhXy8?*b9!p`+t< zZBw1mn5wF4*g=iJC^Ff32=@%Ae$Y8e zLfU_)0t!c<(>C41C;a}&;XhXE_{v+LCOSF0y!e$J5Ld}4blgL0JYc<{b!a)O^xxU(IoL<^2bxH~gN1~*s&q5*`yBvGvTok!3yuGPBLj#J&3o|gZ5T+msLvpD|N_$WR7 zNe@%-n$WEBHG_$UvE3veJStIMhFBH4^OIZaB?JTJEpfS2`1!O#j)V8NiMXrq3MNhj zr|KP+ekZy0K58?x4#W%zuLW(^u5g4<`m4I`l5oDBs}7$NC<8d*R&;iavllX9j`B!J zs_>GEo%Up>dh;0|$l(cZ5=S6B78#cmQkkTNldxr^hz3Eit3@Wc)lv&D;hTQpqh5KY zdIVi6*@8FaAVbRjY>()`c4(VDic1RPa-Y5i@)Z+boLp^)&p=(Ij7+`m!FRm^Lnkz0 z>B=X0zu_BjLGF0Myl{^9{p5S79?*Tf#uCx1P@l9ERUJVGpyEeb4m9d+I(RgPqcEkq zmLW<&vzhvVIo*Poia;S5%CmSqLrb`e0~ab~lF^!@9<1KHu6cj6LMI(YF5BtiD$GYO z`jvn+d6+2egOX~nl2bRu3zt^$Vu_BIoGwA7F!o^)Y!Vi)7gyjGN9+@iZpBq!%g_h5 zKr@tb#kB(#^6C~FkuCtp(HfnI1%*Y#RbSXQ-Ymt1;9(CW8S-lSIo@xzAg5Tk2IxgC zl;5Pp2hW$JvM)qMU&x@#^4vSp>>z9oK2pDDD}0V+K>b6LqC9m_RFCocW5tx@o6X^M zU$1ze)oY65z510)3yw$rE#4`nfbteRzDOamP`L;4jlgSkW03DOP_aI{YII^*nPoaL z;MAi9^DJ*>s#o9V!&n!gI7vc|CKoQLrtCmgV9of^4n0+ce*H?YfX42j=tL(ftFZ(3 z_Ql-#dd#h)y?W}sFpHWfni5tQAXbd1P8Z}BF2-jT%iBFFp*T^)vkvG$C;jUD=1uWNt>bct3*`YYA;dHX!fFM0tHc>&Q zw3tGjr9e{+oq#h!DjP*f?K$86=K?lW!*ZpmxO5kyJd0gSea5DAwhrCe>xXO>Gz{8(B1 zOkMmm{Oay=-ZhYI#ieG%S@p!(&52V;{22(eyE(|NfZs(8L3TYsy*jz7G^2_HIo;i! zvF^|UCZY^6ZRO?NS@w9%QjSFc78KB0U~JLzNxem zcJJ=QQ)C|yC?HS;SA?&J`BChQJQTghyn$7WPQl`X5&W0-$6kY(vtCBtd3-*A#^5@f3@kYxw* z_DfJYP>Z5A=cS@sdAU;x_-Vfe;1#hs+ex^$S|cnC4DUu%UhciB{biv8;)t-NtKe9! z9lT#0uUcPbs|UbohusV8Euf3ll@UvzHA(8TZ6L2tg8e{#%jsmzvq>grS#Pf@df&?bVW~emu=82V$aiZ>UT^6{3gwwC{n=eJPD1vKM{V zG>A_>m@zNm5+xVrxnvckCl*U-f@W4-8y6_mJUm#HmRFZVNvLj)hysqT*p-_cSn4N zJ!13!BPXpY?5pOi(odz;RJOAS1M?a`1Ng#rc{dnA8=$uEp=my*meYDKS~-%T$h-?K0SukN67gobcha6RXE{Dk8ol0%>^x zAnp6Dgi-rom~;0j-ggGV$3AIN zMlvm9e>+<$I!wl613C4l;`s-LA$8hY87DIv8b*^ZL!!-<^5?@2|N2c_k~bzlk17Wa z4vK1tY(_j|uQ9&1bTw?yREYR#2@C*aJ?z?-q0oAmRXRe;`EYctPEW`FbVUv(=A(a? zo=ap0Qw}0s>>)b-+=oM5;fSjfE{))XBYwiN2I#N>HqpQkMB%Q5eDSaub79sqSnLpJ z>+;LjKP(Xbuj0BQYOy44>ZpiXn$kL|7>TM4ZCPEAnkLyciCI=lG$r%4`DKT!)P`3mrZ)I{{%WJn-{>T4M0d9{cw!FNGe+-B@=!#lE>T-NE(4;~yH z-?dkgk9sYO2!KKZ%;fzEj`VEIai-5N1%N&4o+xlyt?nF{iO&F)8vPL7_A9=NM8&J$ z`OeZjJ_0yY1XY@#gR@aZOV|H9&Q{8jf+U+Q(zIyQWGu>9v#AJ+Se8U_*|55d+Gvim zB_N?bl9s$9Sy^S%wls@2b#r?g*LB6xB&lYO-B2y~X;|v6IP&gh3kTjoZ5dfr#!tF3 zl{)x^)k;n=>yF&BRu&n{CPGQe6RB2;uF`9Brpa=wNs?;K!6ype^IF)`zJ2>b_1U_z z=r?SDho|E0RN`_?nZOcb)|l^p>XeZrSjWi?VVWmo(S&+579uX$DP-_s`aGQVEDvWr z;Nh&*H;s(RG-FA6K7zOu4hThZ5HywDh#Jm{8V*Dajh}Zo?GM$D$MRKlkLji5(!wyL z5f(p7i9Fw_KMbNZ3o4?)BGPEQBQgZKx+JO2N8xXK^2j@i3Gc{(yP19+ceg$KPE4vF zeuw&jwST10sFKwE${JT}-T`Hzcqwzmz3O>xI=!ZZhH~_GFo!{8E1h~cc8}dXI6YXZ zID@WSZ^#WLqACJnwyJ{n7Fq+M;*TK+35puOA(x>wp3yI%9qiAd_9j6hmr|L3ncEDG^>B0|4fy&eRn6o?AG^*JyCHE#=daksbEz;w{9M0 zbfO4VBAyg@c|CI!eBQyONmVMZ7Y1^orr7ATc5F0zBJv9`UA7GMAc?p>-1z3pAav{L z#@qpJU+{mpfbKClT$1uW8Ub{Z^a2bI)Y_t}KhgkVP!%YgF9Zn(pFo1c>kKlFyI0L?x+r2^Y7CPVm!5GSfrjlLw&e|idEkAwHZZ6(j@6*{!KAT}FwqkJ z2LJ&7|IA%WZ`&{oKJQ=XGGImL%$DCh4!iWw9op?Y*p9meTil{)yY1gkq-0sPC0UNM zBtU^Qu_BWUtp_Q7pDMs$+6ZkUyt*i03!K5Spf)ZGRKfetT{k60nJRf8=y&RM1Bn;Le(})Hq}k-Jra^1!`QaaR8=%LjyNX}AAw&ZGm$bJE>sxMOfhG8<)SL&qI7@yPg)HtMeje`_5 z=7T`ri)|W5+1Y9=205L^M*yYifM`~$;(lG`aT5FVIG{9f1bd}R;8D*dDvbuUgqToE z3;~NSe)^$9iMd#UapG2@3h{o3q7O>+^*eJ1_+JElhlUbgG4&H)WWz*p)TAiW`OaNx7esdRYy5iG8f}Pm#G+|Evf}KJ-9_-F%@SKH|hw#sGPQH z;T3t!hSYgjs7FR;cZd;70{0~Wn+t%vG@$T`bAm{kE0*og3VMVE?+^$J-a!x+ycq}! z`wGqTty1#2Li4YW3L~9_CYs`?<**Q*6&7Mq|3X=)eA4$%Two{2VPPlG`zeBI2DF1t z);l*DLP-!SlmxLtNlXk4pEj?XbX$3%&Mfse<@3=ZfKYRSwSXICeT<}fX2#F zow1a{T4JfjB}+Bj&i?tT|i?-V80A*C(8#zVo-4&mqus<=<9H=O3RKlt+$~xM5aar*f zu^jNk07D$Z^BJaLpNe2~nAm>ImCQZnYC&H(l3lIOj>~acjkVj8MrBINEKmKorg2{4 zt6!&8nFY~0DvQEjCs9P{LP%)j3(48vRhV4)=>#UU;Gvj@3ElgW4ima~;&{;82WE=D zWVhwdGkav&fck<1>0ek?vrRVAg}`&p+6BHB`fmx_ce9~yTQn8#WwU*JVyhlFeuQHp zzdgS%TbHw6e%F59unP#t%=YaBfMqxi^tRl5e|dP>33zAT!F&0p>E8XWcKD`4d9HSF znfLQwke+SO%|$^&0837TI81B0uI}T^PwPBRGN0CK8pJg4i{iMK%khYLEZj5)YDhY_%fq1^(o~PT01byX6 zR!Spa;nTJIcymoJ1~iLY4q!#17c;~r2b4(Z%+&7o%Z)|wZ%@zLIl}Wag3l>Ee0n;M zYTR6^ardd_T%4+z=~d17xK*=TFP)wugqb1qKR%=D_}eB7$p!>_pbv*`7v)2#iC zh2Z|EilWZzq^wq}a!u=`uA``!N3Z9WX6-lT^m=#(J(XwB^)y-*;*Z|7o9oYCVY9kv zUKY`Pm^w9*e7NvoL;(^|Tt?yhD9(@0iE;Pkmf7-RWMlUEXE3rikt|kDypFEPBi?t{ zBFl>Zw8sHktOOXto+1CUE&jmwp-SX7V-00qNXDx-_u|YxcLC*~yn2_cP37vz*Sfs4 z5C^lutZQ!6^?qy_nCpcQwaS)Z5X{6GGUk&Qq@6IR_xkt;@VvxfE#(FAwxqy6Hs61s zpnR9g`do2L)}M9#h{*`J225qI1>3B%tvv*EMNsY^00030|ID4uYQr!L$Ip8U-$M@T z*kOk~#n@@=(9sSI8!dHV?CmF6{!kLjA0b(DDul#MA}bQM^#571hFxSDv{MRPi>=Z* zHbdKJX*DdNIaqV&-K0_=>A`CwIE)S&0~Q?ENZ<(XvzESL%bB)L-=K#)exI+u%5RdO zlW`?wa7gTe_|fL*x39q|$pz0R<4Vd06%jcdfJ(TB0ITG?nsl14gb~pnQoJa0KaBPb zygA}UX8(iDxwHnatfn2PA}_e!tZALn#~y>iO?&tp;(H@$CubRm^k@rrV%%OY80zC{ zqH?gLp(VtsgiUfr$pS*u?EoS2*Ka+r!&F;8Su;eXD4*6dkzYx%eTX028`m^zS=tyu z5tm8C3z`PlHLIT08$8(kO8#EPL|D z;P-NYcuQq8Q38{nhx}`i;qlT#A#u2$1?MRKj z6@Bra?)5O=y~dh6exSU+Efea6yl57pW4&453A27pgYK3yC?70o)NWa$&Z3R{0RRC1 z|J+S%r#%P~zsIAZF^LEO$={J{x;JcXQ=CjZ^KFf6cc>$VqwMyRqBM+E>{EV6 zhyhz$NL)0cxeXG)f#_|&xC9z!`lf1rQk8VxJrtrvHW&LXYNqv1is#9w%`j7CA8|6? z$WJ27jK9TiT%W$I5B$tGKRUDl*x*NU0kuP0Z)n$>aodAqVz>eJ6;ulVP znK=j@d+96srm;(R{j(Oubk$`-kaCooO(UA7Z0u*x?RcH59d0OtrWlMtbH}sr#QM(E z^~_~6=i0bmPnMofQN>ho^~JM=E^rGOG|??&(1f>WhF>3_s+rTGT`abfmT<5ME;1+3 zYDkyodL!Q{v2hPWVWD2MirtI8U@Ull7mUSc*552E;-&CYahKDvMz@!5mA23P*f3}I zfZj7o1p3eDOhF251s*ASTX0e9lM2E%0ik*U00960yj|N4f-nsI7$1o-15Nw@U;GRW z7>R}vyv4tF?ON8sCaA<0o@8cZZBN_v9FvGu7OU>L+W?GwOvLoSXQhRLZ@Ykk1v0q5 zTSIgCUYwtfzNymYdASwT+`AXec~`sai7iC=2AJ^Cjzb9Ll$CfO&mtkoK6lq#pxIUB)r4`M+1f#qN!la(x9J7 z(g<&0`=L`KSaDW`{FuN0ce)z`vM+=Q*Ibd0cBdjAO|`trtaX6^DV40kaw}O+7|q{` zC!YbO=%X#wKG);vx{kP48>zyDCAx=hPB;-y zL%{j~!|~P>LTSqj00960%$-eY!!QtquOjHGgh1m}$su|Nw|0slm_SlUZ(q&m-x^6{ zTTZjfQdXpSPczbd>JOs-^>@KKp(YWB=WPPL`ut!C81O6_)~a4kRMR znUgArnCSXe3WQYP* zYUm3t4-FEN_$}1%j_y|QyZsy@!sOtj0aZnLrsj^eX@u9jUZsKqAgrbjJa~^iUVPwK zAxRRZZ40_xtrWl-uBOZo*Fj#{Lc27DPS@}=duqL!`bBL=cJZ5EZm~7;_^$vvl@*7# zC`g%|A{{;OIACjt?&oqIzFJkL7QS9%AsdRNKoT%ldHphYrhnP$ptFBTDF9ajtO6_* z*F!|Jd)WNtZA(oD_yqIZtl{^B#v^^uTOKM5tCABgn*X1EQa;^>91YCO32wpC>*UwD z!}d0+PaRxGLEH$ui1`Bm0RR8gom+3yFcin1^DXkg11Md|J?Y-Y5MqKc#5M_pc*w=o zO1oz2E?W8YIxT+@iCpV7Yi3%dH@$@!Nv=CfA8 zF~^$FQ=!XjeT(DRWd(G-dyXu1-?@A#11`E1v$0GV|7>=xrF%-TVOkdVfY7SN4yGEE zp5BM18#H|bkSIMD<=D1u+kRu)wr$(?8{4*R+r}H)-ub`Xt?H^yrIOo8y3^gcIrki3 zPs3&%Wnf7f{5gPpO%R!br1y`wb2_o8+$&!1vh((uxY(aM zPDGi%PMyq`TQ!`KsI9OKa80!j^mBubsIDFl`j$ z0;I+wEo~X{=gsBL*TWb=pAu~pwg`#h zKy1%beD~i2#3C2sx}EXf94^s4(r2OySVkluamN6>W;)1=0f$U5Qyda!x6Yb+a?2MDgtL!7_|OXKXeVToC77Xm2XML%yc`;(tI{C!L$+P;uRYP~w!S@zdxXK1 zF^rky=~;j1xufaIP+S0xk1B9UV4mblp&N1SvitKvw8@1y`ePCS%_AteFNYq1$bSN` z5@vHK09-!hg#&i;lgZYa5=XCM+80Rz6UW0UdegapIZbJ-z_!VbdM(WQ-C7$!&T^zj0rP99r?s>h%kElVK~UrXi=g|j zR&hNl(YVrCi7q~U1^-P-cn#8a~PN^g())H;Hc;5N%^g7GkD)ORz#hrWH8 z7Ea5(LEN;RVjy+0zhLSB&8#ZH>wU9UW++@>RPS|#|Lcv2?4+1X%gFvJjoq+89;yOz zERTCr2wV)4Yk(n`D4>;-mRqv?9q&FRyr)XDCG_t*%cOh(;F0Wnc@BL5E|2|YY zo3_7xmtTnjI)-RM*9ExYZc=0Fy7CLu(0pByGPV-~4zXW-c4h+lG; zPf>NJp=Rpkn74=WSw-T~?(ay8vsBXtLXByC2*W63j82GfHjiHSi8h$8hG$KYZ3;v> z_d-|>xfJ!OxDHL2mHPa@e<{j zhBOJpOc`~%^wT zXZT#CY%EBIk#|WJej0$eV=echsxxa@uEE=T zW;l2s)x0Z%-I~j{YAaU~0f#-wy~UPsZTy&qFcyw$-)oM@M%_iyUl1~`w3qF(yvmY- z-zlHAGb2HxTW|_RzJsT`Cq{~4c<_W~Kj`o#)936@vS3{mc{K1$xl%FJxqKIFZI>u5 zdsTrI>qsm0to-@czn<{o0RYnLV=9C{?XZJ;{KxyVCb;unWEOdquSKvrfBsaV>aP)U zQ4)T8**n4!1b!NG@khVm{xh}Tved)^Mfe!(%Pn@R6#BFBe4`Op7d*gpnyr6 zIp1x`wY#S?5Gm$z#@_lR$`$_(Y~3=}+PsE@77UrTW9@!-SClO-AHjlePVPwdFw%Be zq1mLT6t&?MQUoA2OKVMVfQSY*4vjFx%bv|e9m{ddDFjzVE@as0?1%KV(IQer9(h{WY4~*v7{L-=VuG(3@UGQ}^ikXN+nqc*I ztk@)Ym|jHT$dW~fpEwJmv#fMBxwC@1EejJ+je2p*NPTmKVB*qgIvMJk*4^(&*4YXQ z_x6o>8yf)DPHhtIN^ne?7hR(*L|-pP(=$gk3~Uzew%DTI4xe8Oes%Ey&IYkOQA_)& z>qAWcer&0$qhBGLth{O81o@6`Kj}2}8t(hl3ssO$pBX_Xc^F#qHFwK2l${dUqi`ry z%qzyr6B~mUp~iPp6b{_t)uCN_40y$$ReG=Nc5!C8J~J(rYzs&`ys#4eD8jYy;y>^j zr=0G@g}rU*UM@h@&=&+nbUnk)E&p>G=$z-VT6&iPt9O~^`SU};ZhUEJ== zn8jaBkT8m0vRt6PBg)XKBL*R%0Ul|xNExd%DHp?1xit=imAD^*xymVhA{wGBoShd}?W`LzhN%{1y+pz1ZVj zb$WYAWPz8*t-;Cn`}=C{_O9>OaVsv@i+>+0S%cm&*=MY1#GPXknjn_!7J+ob9Au$H zI_Mci#M_MnnsL%R#kk@qZVdQf?H?-z1&zm#bpok@p%XtJQq8D@PJTnL18_O>93;ay zp7DM>uf!nU3leZ={&53p(c(G;uXhLd7MJxR(I1BNXhnL7fqHi5(1^p%Ef8rkg;P@9 zte9+L28eBY7D}-nS6nrtAH$>uKU>Ft9^O-OK6d9^EB!ynJ6cpL)O>@7o{=<$#kS$f zd$~IJ4=4-8oA_ z^9AuOJ>mLeiqg@JmfFi8zf#=OgWft2T0&Ez`vvL;(Qa=dp}<>5D4F?fy|HasFYDIN z&&F(-5ff%237(`uaZ`ypeLQ~uEL|<5_93%LphS(#jz$8ILF@S=zx1=*f!QUp%n_tN zDR4rP9LxrZx#O-jZQU(FQFCYPQKTCLFGIF&+h)exjLcZh%-zpX`Sjh-L&k48KEz9d z{8rV)g(XyzywAk$fT9)svweRA&Zgnq`b|1&;JM?F3+M97wAxoaJSQ7CYbqI~6O%LI ztCYT1Z=Bp_dtF!}#7Gu`NWL87?a-oPnUHUU5;#BLHl1F&2{q4Gz1r-VV+S(M*~N5! zp77M>@l)AfD&LNmGw2V!wlv%D;>S63iz&JFOfR%}ZXBf5isyT88k2a?;wI!lp*!Zh zk!#FLF~#OK7vnC$pKbA~2bO*C(@K>)5(HQO+|q`4PZD^w2$~9rn}Yys%BbRT=m5-7Y`!l#K4)wJXK$`+Gz& zHn$!8qKa=7R_O2>oMQzw%792kjLj#z#K=uQe-0VeW_IpLD1SC7y&AbLbKOUUkkl)DC@fnH5%F)U0X5}^>zL;Hx`*3h| za=h&yb`~-}?;oy*y_~ogUGd1I424+BDAJS4s!iWX`XoAz)>9uw~SzK?&3egZR6CaOQ zGS5g=L;2?_q4{}Ck$a_dtn^eB>41miPQ`QlDNZWAGKYbn6EwF&T&-u)hmh)#DjVtG z@d_8r05~IjzZT;)^llgWJw%Ro&9;6N|CM_4%ZL58|LRFNHmddJ`F_<)sH65J{N?Nk z4-w-k68**a0%9Lp8Nt*sk0L2?v7BBV+jy=xo zRpc(iD27Ai5Z4jz35R{|VM}wTZ}Fi^GlzfW0gR~DFt{7pI^Tkk{iqG-jQPm@0Ir?T zjG&J-f!I)}Jz%ZNvb5ZhNIAJ4QISBqO+HmAoAQ?C7nbZYsH%C2g?&)Ta3hMba)jgpth7Xs-u9@#7cKt zp1e4551w~ArK7CWLlOL`DPXCaObP*xAQYr*T?dCMP? zO@otfD270Uks9e(2mk$+M~b8%L#@2x)bF&fh@rmCW7BH$!&53fT)lRAr|y(Ijq_c@ zFisQ(e40>(z>r84b%^NJT*#7vf+fPen-_rs7}9Y zjy4A4Au{qyHVL#x`4bEEudE)8US4~{pjxspTi@&Pau`BtoO7=;U~v|9fY_FRXQm9@ zvUcI7#CK=;8+0$z`$qUvCfEjjtDSH!H68yY%OC1dojm@W`An~Z8!Q)gWbDFM`kHR@ zlh-{b;G)WXP>UHFBdCg&72X~sg+pGYdRK^A3n6XE&|)_S&qmRaUSW(|_04mYdy6?B z3!>DcHP{;s6Bcc=l=<6Cv{m!FD74bG`*2#fwMQ@bVU;2)zm#@SD^Wa|tt3l%9)m^$ zfybU?EgIJPh2UQR`j#SFZnG|Re}!P1_Rb^Bz7tC)yG>?RN6CfD^uMiD8^)Ae1jYSb z&Vb}6Az`N1dHAZc9kU1ZC)PPKjOulZf?SQcE0vlIX}7?MO&c;?T5dMf?ArJ1ik>8ev-%O^gn!`^ z8nqYBg_hpw|0FVI(pJe>a8YV9I~0^kh2vnHSD}`fb}Jl5bXT9IRtC^*LY&P8NWOyS z4Ud20-`*@G2+3Ak+aiKdd{)`1gSB=&w%mrqGjeK}qIE+sZjjh*RV_R)`YU!66@YiE zJdH-P`0C5*E}_MxWQq@fmEv&RWbKo)}-fNQirH7#e3TC z#rO~aT)Bnm+tBR91ovwbeTIO@8efT{Q+Y0>he>{@_ptykYKhG!y&P&<& z>qg}|lmtrxMuS1A&Zu}Am=I|1tKTo)ADNJ0HTu4Ec2R0r$5;N~QV2gh83kpjc;ER0m2NLiE(CE1o2aGA&sBh(tJXua(YLZ(R68{~bKqh9HAuyV7Sak&KIs!I*Ve7u= zH397U04z}`*1nSJ!r$|+&781=jFbO8{@`D%xHOE4=7Iuqf&O`*fa_Bg`KvCxjm@_r zT7=tw86@aK6Koaie!GAcjq-cr*BBPkmQ;qsD=B!eMBhuX9AsMw#V{;3Kb0}gR@G#V z>0F|dYa0sOU0LOju4xLUz3X#Mn44-$BJL$6FyIFjQez7x&|nXjB$6a}FhU2XUYPlD zM=er|6Owp%8!pNDcuu|F{5h|evZcX$D4S@q>G>s*JZ73;u%!G!2L9gDv~f;c{``k# zyu{V{Rjj@B_(I*mD=A{Bs{ccf@hqT4MJO1yv0$@6LJc|26{7%RV#RvZdozPyjy#YU z&U=~fLqXD>6?1d>ahnYp?+C=W{Q}^4&uk5sdz?}Y-Vb!x)78?-&Keud}x_c zM8&1tLScxHJVfX1-jPvtR;Os9mD0$V`pf9jh*g>E+CfvaJr?JcAolmhBRj_n$1~>! z|AWpXxwsFe%JuP;<1-b4-&7g4kY`YLZ$yXxbo#(`^TvPZC6S^mvnp}F!oI}J{`3`Q zO(Cvn$geH==5~1-tOO*TsM<{!r{KwlQu}6Pn9E>YMVb#k9=%KoDEsiZ(3gh(Ud~R9 zNLI%W-j7HA;cWs$9rKsPp5Ym=VR8**F8}tuQy`BJwPl5Fk9^2vuA&~do8lX7+sn-5 zht~~1wCb{FB>#HVh>0;1H!FPR^Wq(^M12WB9egQ_CA=FiD$q3(%=%w@W0O|v;|<#a z)c2;ZAj)+Y&x#@V{^jH0PG2zQ?GS!D$kTP)7Uri?4 zkYBNL!OH3x8juQ$ll9l$43P1q|mk;?_H=au9V z4sEoq^YRFLG$Q}RSGMeK)GJSC*q3O&*;QixdM~Cw^#upgS53Bc8>ixgtVFNH!p@iC zln@~EVxel2DIST1^OLhKjC0C>OJLu^H3%)!hj!Hb_*OR!tt?hWAqC-5H6XN{^u_*( zzi>Jo{dW}cIDwp$1UYGv#*x4aXiV95`e~ERDP1_)vvuKQ={`h#yXz;tBwg%dEQ-5~k_bN-`lNRf-Q=0+C3@v_TCCfVG6MyvZw4mF34k-~ z#X*GI@iZLM8+v`<5{^vnwjcPU`xQ^$I`PyPRD3<)RKl-AP1DCz3$_Ygv|&o5Oa0#tpgqU?!>%G zNh~t23(=5KT>fYnE!f|E8Z5yQmN^DWwWMO*9xCN?8Dz07SwhKVZo)#uUuHTeY?$gu zyrm%Ks%W;`urqxWTV}ANSkOfvWsVCi+r?#ua(#&wc?y~!snIklo`O4%K*r*65CArn zv>Q6J_hc{*A??P0xA4CAB}tVnevaVv;}umb{bOpo+k=Fu^hU0EJVb!Es44gb#m*rx zp~=&Epy_b3-g=N|1$>j3EAbjL7zo0Z`~*V9zwc4#-Y2O^D{bf@7*}j7Oes=1Z)TB< z;}&R&=-*t{JeCjz+IiYsMzB^OP~Qc#kHhgnjWE+IPmuM68qQy}5dhgo03$pf@olM* z=j>($Pa8rpWDEeWz=5Y=2_T4vFk9c@-vtuC56N4%1ibL)^q>@P?P4ER=PaPJ=;Dgn3%aR0ri1Ho2= z?(`CDpnEB3M=eczX+pvL@i(AMyw1lB6=*q|^2f$j&F1)e;zn02s*&hodC;vAPK}ko z+nEX3WnYA5)uFj>&pDcBQQ?wHQ5^S13>oK1SOmEic3|->9}~&?Bq6s+fF2oYKpDqK z7treXC-l@sekuC(@MU(VT9U-_J~<3I;XZ=oWcm!I1x9KJ161WPi2q+S>nObQ!E zH*80AJP3F|AgUMuYXe97HDz&dGG>ADhMCM{`M_%`(WDH)BnjUyz$}wCIM5!ryE$! zV4dfbVn%~w&UlR2Y_zSbm;3W9IDTOToZl&wy0vWz?1SPr&Hc0iq_LOx!_5FIX{@ww zFCC`cP+5C=7&spZIymqAx1X8~eLjI=Ft9(}!x~$IEKPI5+7!v%%0HU7yhq*qY~#zM(B?GYX&e?$6hmrC zeaeEl?R5z%(6j34tmj2?A9h@QTT5RlG%!9*wzZa8Yk$KVG75$)FhdiW27)Mzj(NkD z2rx~q7*>P!K}U3~3G+@QYv)9{=_M`uRq$MpaK13SBMS5jK&DIoeroga+CzQ`x2P_% z_Kq`luLK2m!-#pOr3o2&dgE~{g|qx)_$br^eab_)>wtW|q3nP?QZTZrJgj}UoAno< zkLv96jxVUiDa8U{5|Xt`OO}Vki#1qD+oT#duaL`AMbO&6O7oZl;o!jlsSUQihK`9V z!?9W{`uD0qm80{CtW!wJhjjZY>{y!jO>ukVe_G^wz1Y_IOy|MX0#RJY3FS(^LCa4_ z=T*$38VRFSyKATH7PvL%V~^DE%e9|)?@z;cjj>9FhY}YUv9Z#l`vzR!bnhxZ&|k8K z8zNGesa`~GXa^hDNLQg{J(5Ffpq~9K1LdSNw@Cg(2i=o zM9jb$XfQb%J%cvq-V%SWWCX|Pm;%jkapOF~;3N8GYWBQAT|25)*pKE>X_Gl!gIr$i zuq#|24j%lpn&xlg0Z!I>1L77PM-N(_v{DWhpx?ui(%5 zxvSQ{U{y_j2rmH53qLgtNW!kbT#J`*X;}>R=DT8rZmC?k^;~%J^gMhG(EPi`^>r33 zI`-|*Y~fnS1R=VmO^v#qWr$%-gLIGWTx?UU%YeRw)(4qn+WZu2-Wp;YJN>?ylxvtqvfM@+~KQH zYrCeT?A5E)1FJU(o0*V4EB?-Sn!!n{sP@E{h;acecN+$KC*;I`Tj<s-WF-34e z@NC&7x%;voNL@~EKKhv?#$qQqYX?%Rl3RG`@eBm-liel4#a_gNB2nd!FvYL)59~v; zlwv7r=jO4L%HxD74EEg!1QwBw$x3KMjs`F|ls(@22? z2z)PSTh$VRQasM*B0Ouw7N1sRJ|F4=f}j>vIQRfza%pxiM%z0508(tBBOy2D@~<^D z`cmDH&`ht8Joo*F{q?pBSD=d8_|QY^?#Bm-kL8h}~` zB)NZB9~v!9iiSnj5bwu9KUHd#LyOF0I%xgC)Pvmlos3!eZI+82rzTB&>i$;3{ZhrD z^NtNQSl_3py=1uAmbY6^+c9v+;PhHZcPLs8h_>#u&K2$1!p?F1%aR435^gFMSKeSW zl4EcSY`-Bvyz(i%iyHU8N?@}Z>$M;nW$eHT$dISTFa?Yi3XNmfJqIxBtd_-Q=Ko5` z!+{YI$}Noi0<6fllZ_t2woP}JAkm-igQBkMBhm_W2{aASJsm|>{{lG`F79Qsu($hf z02=_}iY+rS{`QS3E7(Phm>0udQXoz=FU+YH;GY6Ok0IKY=~(dq1MC$z?SZAsUz>)a zt)`mh9c&C?XgSCzGs;{cQc|HVlY#BU43m+ewef`72^li{!$SUJe{5uE8cllmKiaDQ zZGOqbEs7)XX6ns@BWRl7yluj@A`0Qi?=?`<3gK+jGaF4G{i$cVysRy)=;+vP*(3}A z?5C~ImfhU0sj2Y2S-$z6Am95kJbCcmdOMBNVoV|_?bP51CCW+Hp1<)CvyhbNWeJyF zfY`NZRxBXl4P1pMhZPmOiV>GaZw%m3`NL7gX97(LTkdr_L5Ox!NoT&?fkAEzt%+;mSXPhcU_@>a?SYt2% z>^oz_V#5|6Q~?x7qoIg*-kMZZ&aNdq#)7JKBdA;rs~#;Y z{!HOe(cXl&Cll}4`?D?hkC$d!b1ADzd3-(00FU0Wh3;yU3KGd#hxDK|>X3#?ic8{< zAldPYQc7xPb=wZUa2rBdU1~QJ6T8Y;P^!vdYot}X9CfAOOEZer<`1H7(c{u9Pzi>? zjB}%v!c5aPMGqX!D=lPLpYsTf6=|$jQ<#3Vo$U>Nc>=@j;hu;beZnw`#CDAFp7I%} zAxim?Pi0(X!+zCGD1*(ycYJ0;JLh#QZDmtASj|+L&5O)Kq)Upek373H=Xa@!D|bJE zq~zaXiv&~zks^aEF$^NmJtd(o0fYl)3FN$6wu{PWYhShIe_HN5Upr+tK28xAvk$7>c1x z%2kLvxH?y|VU_gauZ1)Gw8^Oldnv|@Ba3OeLyHI}cg>;MjKg?8da=nD&&vMvQkTF% zR*{Z#h3cGOq+`RV2)l)%p>Q%2u{OHz)R1osL(fk{56gc9>b#dJ0K9Ve9DMJOQ>_uU zt<%%hky~S-f?7_XKV6jwh5I$X%cpPH6RIMYDb9P7@#o4?Y_wy8d3YS3#=^C7{v*wtHhNSx)wR|)ceCaAns zL(A$Mb^fLP-R@eT%=F|1Tk`o2n6xmgE?)|}%L(4Ijh>17s@8ROpj%!R;h==OvBF~$ z+4|1{xs?^(XclLOAOy899=TZ1!Joyg%Kx|rFggK^3Hg^v?)QDWpfaMM@QaZCO$y=K zQO=A>2feW4D-^gU@L!35P_T)f_F4;q@2aDR z?LtItV!%^G2GRlMqySy$rU=E;06cA$*VnYM?U~hq%59NXiElI7v z1%**xY-bzhR%*)s(=~@nfnnvC&n#M(!Y8gJpT{myXh)ELHL#Ad^n|9bM%<|Z%&1r! z(c>hXrteY^rI1Y!3D5=H|J&x@MhBw(&+GQTMD*?eGTa0OT}vdSmqA$L*#FI5(&7D| zR!{Z^J&a3)1Eah`;-V=vlM6+Mi`zjPE>5vIBFopy@tu_0Q9|MYMm;$&lgQ*zCw$K# zvP$SYHgl%HY5ly+NROXq+p@aH*6@#|ocg4_zzX9&AEC;O@Lsx;bYSftA?@V|AYiX3 zpSF9xOwmQGnR=TBPVmfVd`()Z)HC&2k`{)^w%DqC4`BW*&=N0d)`pOjoOCD&IcY$K z=oe);*T(f--hFOcm(Huk9LcRU&Z5l}SQS@5ea$K~mhkhH$%#)?9ypPp-VTUunh@Vd zgmiSzuK~~PD?CzMtu%6um3b{$zn{SaJ?Z=F9G?Mq<_v(O%gDdG^{{`k3k_IA1~CTW zvfR=NM7$)Q9R$F9r022-^*1d1_dPyXK_$ZkB6KSIs*R~1g3tA_!+m7%WJNtb5|ia* zmx7nyE3#6d4Y#XQS2C0Zt1=->xi|RHCkM15O#+U?7Ka*4JwN@DO3OJG=7oMHZRd&W z!|o!S$Ugk`?+OJ#K{aU0%ZJtf(q}cx8+$dw=e2m3J2mLCy}gk=JUpjB=F+LWH~?1I z(l0M>T(KGYnuJQPfHNxC$J2eo$Kh7;tcIK{I`$rF1U!OhA2DvwY@TNm*dXE<6QCFev47ZzZc4o&-`T?Z0-r z!HZ5F60m^?PmO#Zd{7PJx@mVcWy~kRW$N|%{Cvh1G{LEn%2kJYHS|;?ZrXz{VQD>O z$b4$7_I{ndrp0uQ`&N+;;~?Y&Y#QmrvJu~(DuA*?Q{@pJsKY4=3|dj-?Yp4N@uA8+ z_HpIzEA1(ePOoqYrL66u+8xbtjJVsOf|fPk~Du{?5pA{}iE1U^aO$#I(*2Mr5= zGns7iZG}wGQ5G!2?061xC@x> z6cpZ{z*uwC;}aooC`MpcXAeWjjYK$YTJ14gMj~+7CPwzDepMWbydl!>Z-(|kw9t&P zWw;du?f?6NIMR`l{S8FWaf%YBp_L*r2ylc#(*__ylSc_a2s}jg!;0h0T`QN;s;8}v zxWb%$nDRo-eH1#;^QWsHtGbR!b^k{v&$N{!XbEi(lWT0slyeZRWT45TpyTeg)4}=W zTVU+YKVU)*2F7snTCdv=86e)Cf+gg2(fN8KMdCE;_4CXz6MNEk(1f6mzA*SXRC~Bq zhiUMFXY|m#iSJdGVQ-vYHD2!`TXf4aZNEOJ^W}WV!wJU8f$+$I0MKO6gCIYAJrV>9 zjL|=Og|)KgBXe_jedYxiB}69Rk7bJygcNS@oNG!Db5PxSlW%A%)pXF_6K3dU0Wv{c zvAklRE9#7I`PG&|4s#O}4WV3-(!A)AE{6r5#&v?1q#_V@M4qWAsl0VDCxnXw!~|@n z0YNal_tvj+*KkL}kOy@*yrN<;SV3}9Gt=~Qy8v{x^%pJgVn{S18?(Uyw8meNPKVHK zLf+&%nL4OAHZzww+^yqe76RFl>J4cjMAr(hl~~73k6upju9gK~WF`=!D3@+r5Q_=ZJ3M z_-571r+UpnrmTglzBL^U8KAiATM$o%=LJJ7XbefNm#i40@Bf6bnzHqvfCv#rY7YPdKU-}t zwB}&B0y@A15if1C`OQQJRSVKQv%?hT0|M?|e9mh_B;=1kd+g0N>JRL+W)SoCXN%_~ z;kx5UFznyMG8RhR75Ec!9x&Vzxe?vzgH8+LMyw9y1n*>>YQar>4VHKq46076=VD&R z9sVjN8La!_tcnh$1dfF!urp2g>oc?+cd9sb^tVg?iv(wJJ(~O5XJiP^o(<^NyT3~y z4HUaB44vF>sm;lDh_gEV@P%d3ltgNypIs#@ghYcpDah5|VvRShHb?50%|-k4AKC2^ zu9eaz$E}xNNDZ?z@_iX?FYpzN$*B(4oNHb!X6*P_i+4IS33?J9FP!hkRn3u@G!V#w zY;Dqk@Q#iIwFSPe2dMF~u-w^^X@R_40<)7pbNXC`-+KLwb#ip5Ky++sH7;Xz-|MM; z{lv{YwZwEzB(G9%DVQ373OhplEXq_MYWL8ilrnRVn_!qoDHT2PolEf9TB999ge)rh zsPk(F-?e5*@|aGH)J_ieHW5!1pn7O#^vrU^dYfO*MqKVS!?`-gfQ*m<2~#jCI)?9_ z=mJbT3@^E(k=|?1t-CjI3QTqSNiw+DT@SXwc`D~HmrV2p7gH<^U7{^}Vt|#?E?Pk< znJHd}EEMxi>decrQU^WPCLtcIsF|a`epNsah@vNMt&Maye26)6-BT4THNufwCK+2_ z-+`*z(XcxJp1?!I&Q;&aKDt+bORK9Jsz{#&F&Q3v?ZP)Z!ciJ}RpjKF$@dD@EnccF z@Dhf1j&F{BB(+ZmfUW3aWmdI`wGB*esZEAXcAD9Na?6vKY4{u+)mq-8j#PqeRg9p( z=ZJQwK&U)ZUBGv<#UptQ71|-rz-J6>3`GTEV3KvR!X>+E z%W>Tw8{n~n7{fMa@(L6{3`#UsyD8v>WmhWsrq12Gtupue&lI=s5n*tAt?5-VD}jqV z9btT$2q0E`iF7=UP_zH{1mpo& zkt+e;GMBsoM7>k4rJ^vq7Od=RkedMWz6&&)_8KWr;y1hKEFGDdm&S#jcDhE0z6LjF zg-xkq?eN?;A>Hw5QMa}DbK@7_kN58m+g&}Cxt#YY?@(#f(v#{b(BkeuY&WOQs#JX> z`6Sj`!h)l?*&tX3U~PBx{+Sjy9)?Ym-<;WMNi9#{npWB%wel>y3J{Gc6)Q6d3X+6p zAawTg4L14x1y=*uXi^F_GH7&3eUC!+vK=~;Nr9b;7&C@R#Y4Rojma-d0jq3hU|ns{ zEp62sZ zv8XxxkC$4tj&gwSW7}Odg|>G03f{G)#Si=OWe5FVvBIjS$s{YEmNAeqhnOW+z4p=M zq9ATL_z9yi*BbzT1LyBDn?JHT@j!)7xe?06!bMY|BueG1+Q}eRQFm>do4cA-&B@5+ zNVAf(Ro`1pLcP_UwWwBYYT*L);qkqb@yU};O=_v~6Wqtc-^Jjs^Hkh%d#eVz8vlT4 zA2`Q@H5k<@+n-C!2mmR;;O!bj@D}u;5~E#PW{S@@wxEvRK6_m3-}rQmSAdt}K~b?I z0pGzt5IIrpaW;l}Vo8!t|CCc}FsI(!6I$)LamKOUa(9mmS8D+Nn>{6`JK?20Vdq^l z@(h-1E8=b|B7e0fzZHA+!{cO5b%+YiAx~FfY!7mRe)|*Rj;Q4bv>9D&BBd0(1@{XL zgvnVOh!ZBEnG}cNz75eBO11S%&H+#6!;xFZb{J_Jm98|y;wA12M|y1t%@s@Dx%TFh zzav4tkywEKdM2%@Co)#{s)$w31HLU-mcW=8OK7=?uw}pFwGfe4y2614QrigXIY{@X zmnCm0LwsXEP7HW1v%$=gp}s z$oWhMZ*$g$-F>bXRTz`VBeXbUBtbP1R=n3zY5G>Pk6X{1V1Pmj+)NP~nNUAOOid=w zHPD9loH!oEBId-wV&vrvMu52@3Yh-g-w8L9F_Za%D-|OE1$9e3{753ZYt55gRA@1> zGVbbiz0cb!3n*OA z#)Z@QkbYjnCp^P3H!NUE*0IPk0M_+x2Q=PbtqDfb_vuci#HCn?736Ltu$u6KG}5eG zFm~h^vLaSbc3Z>=;>;I^e>^9;uAE{z74koZ!7GQ(liMsv3X;eX<-Y+3M8kQo!;GDy z%Mc7R@Yij)TNN!27AH~?fV<;^Ho7SSmd4EEf2q|E>c`43-T=VRH&p(7;3*IBiDlAo zW3*){2T_`{NH;#%78zzSe8I6{vW=x!u zLZWUNAVJ`BXWH`DaxmQafQiQbdWHYr^8WWP!0tf&{^3aNm1O~nY-o=?x~YRypNxV; zFrDXGm3T7Fbwu(&INh3!Yum54;=F~CjqJ|csUwQzKE1}$P0eMs62F-qSp<|L3InbQ zL0Q)LZ$nju=Ugj|QC=4_x@hwP`@MlOqPr{%aN5?bU~J$;;3cd!kgJ6RNe`=%syUvatd<6)h+&FQ?Xrm&9 ze~Q#7l^3z5>9-?zwRP#NUluU&X06LvyE+(Ao-9ML{h0*L()5Zv*A6dSJDu!beNWx` z4giKV-5xQ)eS^LY)wxH9VWF>hj>`%ZL(N4#)I~}8`^%4ha#SS#=#pwpNw&15P)ZZu z%AmcQB2aP6f92R#1Qb6KZ-XxiM7;BzMw`!Bl`%BpN}8{o>8V^)&hHj82rlyTbxSTD zl13Pw3~A&9KEB*;Xml7+#10;7TDr^p(vB z03cpPpsLZOF9+=!I*+PCcFr=V77v^UiSEgCd0|s03zzo~GoRP4u~eicBt*mqya==M zRO11smc&&)67){9dq~G3kX4?em5zQSL(*LdBc^jzpla@6*Ns8^jW}y18f;+E3G#dI zTYaHOvb}xuCMiozO%W?+fJPP3T~i|#fj3^i?-PgdiTm3;QJ^g$!kG*xKcZd)O(P8m zQ@iEp28yjI6b+D(nJ=LiY3GeDZ7{?6%#`aU(ih93w}$M+$cE&Ei=}8Y2(@nPf%Epvgp7ZJba78NKqq3bAEw8QxMU}VYMJRsw*AF z++|x2xUkUvHzqA=kqiciaQ+CnaesVhNhb_12H}U3%kGhMwEihyf6?Fd!C#@60)Ljg zRDv4NR~Q03EVo_Q<;n>JXED;|m)L_XTQMxRF-q)p`;wTxze(!UNz!kpq4{TY_w6rk z&r5}T`{BW47Ztp1)_zL&dU8tnPL7!{n9`ttf(os?5L!q{4V550M0#zRkNp7*{iOzf zxo0!p*miA)ig=8=VmFGBI?e3X{-x(D{3tG-9!=`eU|*aeI)nS9rUCjbi1O6Gt5MId zWZx@SJzd=+4h?2Y3G_HP|C69z*W5)qsScqi*Y0I5Fr7?SuUj)1XO%14rJPTrFZ+G@T*MDvzZ#z^9PyLW3N6@ycjfLVt)fd)=v9+V8=DW#t84xE5sM96aO0 zx`AOR2#F(rG$!d21B?5uCbW{YxD6qkPl>zIFcHAK+-o{`x_b7NtTN$7g~6FpsX*Uf zT9UIF17su5{n;psVP+ucJP~Z#gGKJR8pGJCy~6GM zsvJhiwT5AUY4JP>#%Yo9!DoBpqnST~2i+7-hDO!VM#y=vfDY2PFns~k0jK@c%**c-XN{Ey|N{NW`I%o^IjyWo% z%ggIPNr`(D|71aNtD}iQFLb_APQybPTZO)@oD$nVlC;3N8!GV}X55dF*b_x!OrKBp zUEe~AsCc~4?^sbiPb`|>54lsplFRIb4^)1Dn(nL-F9{E4J3XFQM1Yxh_yRw z2I@hlMa{opUHg<|hMK*9)uET0>X-ZOF>lXx_2h?1KQItd=CEwCZFz*g(uqnqKo}*C zV?>|n@SAO}0>fKERR>T`VqrgiRFuCKUtMs|xBu;F3o#W2UXf8mCb~G--+O1pYF@aM zuLVK3!N_C1uRE<$5M~sYn(I3)RX$vE%p^&%c!R=NdSdheHX(r95hT|v9zS%W6jMKL=tG`0aR4jk`hPL5@Y8_; za^nr*#t;5?y?E{{|LtvWxxxjpF{jBa1MOap8b}`$xXGdhwNf}vg8S!?ZHvOPF|Zpb zOGdAUeP&pi&Scq-m>w}zQ&_!JuBogloofL3`G)~n1@y?Rg3lu3IoJ|)wt>`Ao^hj8 zzg-32HV6dZURX^%4yx?{-6-=6 zN^kQ7^@fg==8p=cxw@~THTN4uD|R7mQ~XWvobKC@NBb*Qlu|zz3OfIkmv`zg=@y67}qN6%Y7~7P#pjcipU-y0+M)Ce~ zty*3%KC!G;yrF|$lpjYTgjBUS_dp6k7X-af_0`Zo^V3p5)P<^P)C; zWYE$ze-t+(;~rygbsKcVdi580`Gd43->r4{t28>XN2jiHIiCYF9I3SmpW<+95oHhP zDhUhAC;MSj#=?Sec(f0A{gCU!3K%N4ouK~#00960!e>1I00960++A63+%^z?u78Cd z{IG_16;Zb~P0_@44j>6qJ1JVAfI&*6tw!s0rQN_rk^kNqUXpgTM;s>wnupkyhU9Qa z4TqeWj}5O&32(b*?`$q|MRARMI!M-MqPc1oANN>LaU3sse=G+l+d7d6K#X`IVxBOW z16O1`&x$nPKFO18)jVOhF8 zWoGGjiOv#km7t~S2+{^~grX4CXF(8Uo}gLmF+AfdJQA~*@QfvC00is{JxUn&hta_# z#9)pvoqA*~I#_y?o>ese=*SQsyz);UG6VA}9u`lVHMUHUr5&%*FY4r35=h)P8SgOc zn(EYv4Pn&A_4NC=q*f1gu@{{~-5!L=7lEH_ISwWq_$q=TfDeTf5zV47@I3C*IAbuz zSs+MC2_+93$I+htxUQeFFf9_6XAgT46lO6xo{#ZoAh)jNwYHY+PIa&Cs}6-?c*)vh z{pV*1L5}|0?%bN|Q0bSnk&roEPuSd{^4e=nr{aK=U&&ms%~kM@@yE4yr%|c0S|`;F zd5p7R~KrORvYaS6|B8`ZSu^ z(+bqu@>2B@z9_`@Eav$V191(Y5vUN!rSs&8tVG7{DL<8W%N)xU&{Y_eE~ClH8Hfno zwFS%lL-j_z4@9cAK9LD`@ZjBG#yM$axZF+dI*Td=NSg-0h=sGgp@ zfA!nxxW~tyc>o^4#TP?^M4tOeDm>0u!4f|Rqr52mAd7sGC)<|%huoL9dvVw0nEacu zXbtA<+wIE(>7Z0UzH(oFDXz;l7E%X#$+O~%ix+P{oZ!%&o&M^K2$47i+xFL26}O-J zj;(Enbk{DpWQ)!j^v1?3dL=HZ*Pcufj#|jZAzMm$E$3-Zj zB#J0WLflZ?AFNX57A`9%m0*>@lw@mQmGV>85ZQgiMD=07Gl@{xPY$sWYH=T@vYQyF zdbyS;6+_L)DD!MgPWn8;B|JQ{{^?8OA^-ate&33`cAUu4n`1j2h{ips2q)wwZg zN_TmFvnXc>EF|L(KqM|{%RH5NU|oT^1oe$Zb+jT|O%0U7!$r3!mGVNkOllkL)U>M> zw+joZ5I*fyh-fI*IHuBk=`$%ub(PHn1JyUgDzK;PS?}xC(%qmO&>IMfD*uph1gbh0 zbcp=3ZpzLhY}P(j*)E_x(Hy*?3Rs`&Sbf|}&_)_^60Tfhhr%R*+GeaV=&E?P+ z`Ecl(9<1kK=)(?x7b4-2Pr-nS!z_u?)T0cR`!ES&=6~lTHJg~`x<#51k&={%@0+9+ zN69!t*v>>bV!uJ|)9&0N=U%x*YR>D_qRGzGB9m8a&Cji*D`{7QCu8TQpzDvuoun(t zlu22_mz}gJ%dmOn?8}ErhH6WzTqtEAn*{HT!)^d?b7dV{6F7@vT7+5P(SUG25&;XS zAQV0an0-DNabZ&AzIUIL{O+=u3@w{-y^z=UDFtORyzy6Q=6eR0`Rx1^dUjM?>fp-x zzgipVSFDY$$;39%s0!!7`9!NFH}YJQDXfDPn4qZr@%Cneg+0M99S;xcPGGBnC)aiH z+fuGfhBI6~#)!BK3pAeKK$%Nbv0>gWVba_KyV-R#G=qEy9aYiqIQ+WTJ!TmfcyxeS z4bZN^bMC`AZ&?Ls%#%Dw!l+0BA<`sfA)|2yikEp_5~nl^Qp!cNV-QTR zlUGKHBxhOSbJz8YA`?YK;_XSuwuV7vZr{pi2N|yl|EJ2^D|ZE@;D0-#!%?$jMOhz> z)xd$eP&HlD^Cb)!mzFlX!%cTSySb<)*Yj)I?li@@Xxc8>@a z0aa9U7z;j8F4)Fx?q&za%8G!Of8rKn(X&JjS}^)mPI)C%YynaDN+csX!)KK;Zy7hU@xpQuE0iMfil2G%F@!V0B(teH#^GU$gtqp{~1AAoW#Cct^ zn$~x&1`m3_`T|P{Y{g_8Ja+EpOL^IH&5II0B(_{|)Ni0yAK?KXR0D!6#T`Bbj6jy4u4Y zasz8-Jm2%?J-^>OS0sEYK$A=?I49H_Rhh@A3vR-N23nERsgtGXYO!GtVx9As{jqKK zT#wcwTPa_RxU4*b)`g7L3G>S#wQ=Km?>^2v!x`TiH_l|@jJ?})8g}H=fWVekF%;0< z`5q;nwA_$l8ue(y$>1I2ao)Hi*Sp1rT)EzOIGrM!(Qu4wXX3eo*~pm~*R#p>$0-KD zno6mAocs2nUaxwbHR^yuSOw{`SnV^UcQ0pzC ztrlnkv*8_&jfMvYf#_rK2a5Xe&$_{;yn3()vY=4WY&EH(I~@J-ZHI@u1+E#djNvEO z^RFCtgdeQ*`R{Z#7{IovCqQitE2|PM;(3nHtX6n=ki4N)O+S|ebc#deji?JZvw0NQ z=I_WG)mv)vhSlDYHy*uGKFJ$T^2U?A@tC}!PFXro&Dt)~*cbg9m3ry4H@EDbh4?nv z4MMXUbvs>oVxI}iwoXiO)|O|Ydv;Q(m#&fw<8B!@GG0O>FQR+;@fy~`0%`p_N~SeT zRJk&&o?-U-w%zY4 zDlHEmJTQpwC3F?EV>Wg_sp`xr1%Aqqr;>~)kQ$whmodf4LaPA$OOil@Af({jr6LJY zBnnn9QRQp>0~J}uWMOFW@@AvL4~4IC`4wr33Oxj3SAf$UUA(gr-U)L)D6$0P0bJ^7 zc2E75SD|Q^HDwQ)xe1q9@Hpe@)?1VyziiYK$UNTHm>nwvx>h5NWeLCUszHX#*rhve z<-an12T}V}nn6dLcCC&TL_x2E5F^_(+krHNJr{O6>UI8llry?zi?&)}5J?e=lTaMM z871_q_Q&}5oYDUUG}QQyp`qUa00960++9&`+At7)9>2nUqgt|wH3U$%Nr*+$R5}pt z18)&qf>gmk8Zd3r`rmio-8ptbvuBk*@qo}cfOoC2`R5^Gb=B8LUeD2|0}s@ znak1e^8IT&Qekh^GM$1~y-w86qFzK(aJd{r8NJ4j+?Gdem8%_Ar7Tp>OeL4_h(di!xfy8!j_my0eIj6;E*s} zV?v-o%kbUeY`ZM%Ur8ziS%jsn`-eV&UWD^8Dcl{t=pHC%=lDmBOn)31EY>S~U?Rb# zIvg0iJ_&G{vqMdoWH-+BVuyWAbF*x}uQ-6x2CjZXC+Tm(w7|uMDp;==lrFb5#56R< zncVy=UBD_1JNyw03YVGttw*m=Q!12;EphpJB||V9umU*USNM#^Uae<=FMxC@Jt^)y zWC3Zay0mozb2k~?q#r)chPN=IuWfbUQ4=4^-6u$3TJce&`#oN>R-5##ahEIz8kEPT zo+e@+pNM|^eXLZb^=d?DG*tyKuBhWJhgH3J3O{ZpU^+hoemZXiKAgYlo{o-I&ETig zadJN#-<%=CHa!;fQckjqQqCwP97N1hgs4<`BrUPFWo^iNsooh-b4%hF@$P<>3~ygu zT5k_l9bPijD^KEY`7s(#l6f+^wiPkqonzCHT@Icr57s>l7{3^rs_6Z@!d>O9CL7Kd z7UBQpRdv{u)>W-o5c^YP)`H0T_y-{Ii6{h+?^E7QOgs5JNo;07UrUemo~gs;;U|9l zpzVu{t_r<*vQmo}UCt@D>U~sszn8^%w~tTmoWH7aaQg=U0RR8ZU0HL}NDzJwzhcS{ zRI+6mU6!o?RiwaMO92VXu@6hRQnHS+ibTrVGJysD`}U>LNHXBWdDs_%rO}+-JzsZE z_xz-KghY)oi-C~i02D%N)qYUOx&aKar1ah}#M;jQW$kN#vhKzJ^^^IysR7E`-vDLZ zi2=&Gg#n7^VQ&MJbt@oh?FvLK6Gx)*v+9CNjYPL0R;%l`>O2JYg|gj}Z5&ICdIxyb z+8wW2h*zyXUbVh5AzIAa#{twLJVrCO!V0u_ufMtZ_ZvxiDK1z{|2~B-mc1Z+V8~cy6^c_zv~9v z;VxWV!CnKa-77hJdd9;7lw%x7BlYkd2MQ7Bq3dnK9y>+uS5Ii1a(onxQhKmDsc z2zXGBViSKFAhK^kl7~%>hXPiTZ#hG!AN)8ne1N#h_WXz-I#EJKWFW5xoN;hK*}vvm z`(YcU{<)0S=U9$ukUes7QHdsiF5Oh$VDYgiuO+-pC>(Q+qMWM_X_Fp@j3(hQc_kyK zEQp#35T6)Kgqn)oRiaqzNI3$JR7yG~x5A^F&%{GUrNf55I!Lppd`U&5FR5?e6aypp zIXn6N^h`n`5NpG9yo$aocngp=se#-~0grN=thh-63Vj|Wf3f^ODAO&I3 z{3yI42@mAuVl5Uyhm&@o{f@GH^#DjrQZ88dfX*GRSvGz_nSV*(93JPoQ+gHX(lTQe z$n9%B7szh66;K3FWInuJrhJ4Q8YWsJV8ljvia)HyqHeJ!Hd?bN#y~oCD0GVKH&k!V z&t4qyN{Cck#jqhBX6&V{Y5J(4&*v3qq{Zv8bj;-{Lz81;TPN>Bk`eOF(=hCNBA1h@y5kAfGV+1XN zaWu5*)e))NjNar@0TKsYp6+yti*$tv&Rms>9vS$-%ZMI05lB z0{4%=ZZb@$h5ZoZ`oM!FI)6nr8JDAw9b`QUeE;kr=z04PsVEfUU9*in^@C4ehF1~S?VL(I94M5gWtP9~1 zB^L&<2)i4awVTapO&-=oT2Y$mxZ02xmOU!sq|OVuCx)kKH?OFZcnN5eX&6oxk(-jB}PUqAz5-*Z@@$p< zga5Yu1Ev~yWY{LR+wi*9Rdugpr!_75wxm(@`wf*UwgL(4{Ix?89fJyFjEXGv9Y-ad}o|;pyiaZ07&fCR}0sWRIpP{|e_b*@a z@ST8C=kXuR{Y^_GOGw{TC1Ib#Ry%n{?}q=cCFNo1(el1>|TDRo^6U(C^O_3@WFKzSR-*W&`A|=~NI_b=tX(JK@4uG>fX92>piy5~f?%X>#vxybSZGL1Q3h+;urXLmFgS2QP2i@NPakySYpH_$%G z^7-@LOInHpLddKVe_v$#g+exi*TgFLJ>bw4AVP z`CN|ZvxUfWpc}I*!AX>7OCT*d5^9ENan~0v_YBLmx$ZblWZ0(R2&P#!{vVox4|+Ww zM-ds1=P-)yizM1_HZfr&+-m5>DHpdy*GyM5_+C*I;It|G3G=z7lxzRuH|VUTxwait%siLd|uTyc2#>0tiKLcG%p0o4Xp&?M=yUQr4)~qiWK~j|1nl}okOjRKq|8Wh6|YEkEpk%AIFu;im9h-@ zift9BU7p;R zE3zFIP{-1B-C?@sZJSh#jN9L3-(&#>@$kpm)TpJ~rm!vMOeRL8Ifmo;f^|*p5hBX$ z9_fH42s4aygAC=bw87o3U1NlX5h>z7MNks7)kLIVbzdkOD9XHIAeoYujs-u5>o2J6 zv{>a}uJH5(Nsq|h*Tw$V#oma76}*9cjGyx$rAsj&PtiKb7hga}kZ>gqd*c?Rx+}^Y z4f*9Pcys>W^NY9V&Pb-!ui@NZvF|0VH@}#b0(-JjCU|Qtn;xm$+iw z&jag(!JoLMwL}z%VW&YOCP1w(-mme8+95ZDt_h79cIasas5&zp&GCd`P>Y2Yz(0+& z&xt?!foAUF4~^xv;xsP7n5BE=SrsN?EH?peHKCzM2n9y0a=`=_DH9}#i?Y~2g6xBB zTm57clL$2zrQ{1Ilt}&Oq>PsWB?wrQD`0{xGzb@igO6yORJka?Dge)b0Q6iUdLf$Q zuZjm~d&&P6P`NHOEzR}07n$5KLr1qQGmJn=K14_+gh;L>EM{#36`(2?t73nZ74hvp zZ~;6qm}->CK;V(DHB@<~M;!>f3}Z5}Odc@@P*QZE>M<$`s~+otU}b2UH*&~O{<;#Z zTAD%n$mb0fCE#+C@$*#NmTmo3iXVXZqxe>ezQ0zC+GaP3qFl0!8=!svTQUWQBi#}@ z^H>xp^Ae;Z+m;y&DOQ5TQOqFrgU?b|%4SX2DHQWKO~GkR2>Euu-k0U5eOd13+*en{ z>&+BnP}nx}G)w=y;f%ctCoEgt1pom- zv7$F=P|RcAMHRxpybCm4mSlzK4>s0%8Z~Vg+ktfrYzjUoXh8aJp#4%xM8?q#C4zf=47IUltqxhF=Goi zK89QkARp6JhCQx^28Tb=-tJKeWFW>nY!N3sh(V^%2rS+}Dc}|z0`;1l~ zL=bP5CU@k9rb-Q(4&pXe@lgd11EW~@Sd+tm1B|XvW}`9+uun~<6jIfm)ry8e!C^bY zsFNd_&x>C$+xbh}3Wk9cq)qGfqoKdYVU0!lz7GMd?Rk+E`IIxqvvl7uEN+CRtc*4Z% zDe4>>)XE6%<0wg_pp+61>nvA^5`x*H1c)sMDoKtM;MJc8GAWi$tfZj~V6V$CQOzp3 zt_=rTHc_gn`a!h8dmH1VX^Bp3y0WSu(E*M zAt%A?^v9FnyVKe983y_xkTyKsGg=-d2rf@vo?f0D&!lGwg4qw37jLDTMYw?Ftsw41 z{@ldnf*gZRK*ro;%UKTDG72V(*2oeBv{(iK#H=wbBvI^HF7oWA@#P|)v?dPDXFouO zEwqX2AH62QX!z(6Q&0AmT|!(MO86qQI!;> zBw7?h(~lw=dXC1pYr*;q=Ig%YIJzI{p{LuP0*bv_sM|}GM5SE!1`j#sW153jlZ$U& zf)#)G{jST{hkk#?NkaF5LsfxO z{5}U7>>JGRa0PqdMLFQq9(V4blLrDoTZz zEK9C|*V1sxMO;9WT=W5sBIFloi@$AIDa?&VhV~E_MFsjU$KPY@m|Xv-N7@Sl#&jJ< zwl4>&3eftcNuwYX1L1}iq)|HaoyZ5*%(q;_W>D=9HVrbg@!XNFL2RRbp$QTNk*BIq ziX9Po@FfT$uIi^jz?SehnM@FEzd}jJ5j=|Tan$a%Kr z_z2P;vxkR>qwGLtJ<^$^-RT3QH!J{B1f(0MVy!h@N?pZ9B*p}OUmAo|@9m~q$sNzL zxbGWwG@1B5=(3Pt85xr{dKYw|Q*UF)WBrAFR zh2?vh{$N18im?V=mU$djCDszi`Niz?)jJTxj~73kyd+Ce6m+fve5~lj*G&+Kfzrj4 zTmi2|0%_Qr6oR(0N?|X_9e{o*E7q#KwGiwIlWQz)H?^_u%#@WCO_Dn-Toe$$^*Jr+ z1i!BjEGKyA2f@@$mS5GGf`FJ8l8SXX1h>^6sQC)Aq6MTBYZiq97Py&7)!0>44C6Og zXC0=&>T(F;Rv34}2X*`ivwv5Wb)vIUYz%OH0SD~KvpWK_Rlu(Ge6Uo^q;T!6Aby(3 zbs^!70AczE=-xoAia}+SfOAPDkwVOuA}yPP0r=7|r(hzbd7R>A z<1C6~((*w|*hzCfsTA~~8w;LhQxS5@FdZurj_(LdcRkIcuBJsi^gT^uzVIG8wb(}A z@A^JxoKkBt5sXn`2#Yx%=NsD89`_CHo-$xJb#xBu2O1U<5Q18o zviMKFrTKhw0)RSsLxBZVTE+=lG$<7oT~uZgmvseEc2}ndEgcSNo`Y=$l0yGUt!QTojXtM0ztkvnd~xyL)05!r9{@i#J0x?@vA5co8p9Ag#4$=-xDNS3eGU-qaROGT+*i<+{;<9MajH)qE`Jo40 zGmYw%Ua>6MV@0%7~DxuK?;Oi<0FHsqJOCS2F{eY=a| z?NJJ?+bxL7t}KDU-x8D2pbB#EjFd$=E*4AqTgv+J`pF=_BB09e<+da1ZkCqa1erIDqQx3>N>nP^P&ozSKl zm4e>q;(9*?Gua5aOBN-qjj&oa(lxyP)Ek0d`L4m$1BIkm^n4IG0Eb#ogm1L>r&96HOgge?F@h;j~v>MZeE?hFG%nwO2sQYF+gRYIMp0_B?6`U8%VcVLPv zD$(=~$z4_f2&D4lp=iSRSYCSB&vHoyn24Y)BM4r@8SHCWv?o6Uh=Fh43q;t2ysp9| zW^(vh48be_C507ZYq8kC&nsNav|bE(g?E!AI35xa%Pa#4T(2vndNX59b3}mGeOlr! za-tH#0WAHFBosMck9?FLn{D%^aJa^$kF*b z^7iQR^5}f_?oc|T48DqMp=hCB#T*GXnA5bx7(>Y08)#>c~ zWI83UE-uLtd3|&_J3W4Lc63Qzzqtgbdje5NQ(T8#DBj-3^)<&)6PK7QaZzFt*YM#T z$h>xR@@D1QDbP+B^pRqfC7ilQzQx}|jO9StN8sIr9JMay-`w0x=4mA>`H3P`>_4y1 z0ei!*;*=#781GYX2x&H1Ja4yQ!36Kd75B7bbhp)97rZ-d5N8)9-)dCQw@nn>Al)7g zVA`P@N+If?zqqd7XD8EH z@YBg9hSw)QpUz0XudZ+o5WH$_0TT61%!VYq3`TX_JyfMh2-DkN)%E9H@{pUeGw6V{zhj$Yo|CupK7=)5hedUCu&1ra3C4>rN`lXkqTVn&fq>Kv&X z*Vbm-$Yd)g>c*RD{OJcG;nBm+OC<)74XLyGd*rx@@RxWc6_~e{-G}>2&FRRxVUBTd ze_(yz{@UR*Cb{cSdidc;dQ@NC+=RtE6UAEPKI_Ki0kWApsC=)h{5#MhZ%!+8*>AK`!r$Iu%UocgGNE3|pKXItt=l%ET5GdW zFB71%q_?m;m`~sSP|R^CdDh`VGZ!>NAMnU2QkJ)rnrgxN&qZ+g^6e%08y=3q7-#b7 zcmW%c6jCIZ}_^;{S=HG@$I;bc*Pq1( zrAeG#HLUFF+5eGqZOv)pQ206j!qaYck}Xh6zWZUf6xiaHKnCb7ogI&CSq-UMvL>V? zo&NVdN3x6w%n;3Sl|#AiX~FlJW)kb8+)H<>on!~h7jL(|!!+GM#X3r}V$ zP@B$k$-*=S-FVU;y^q^(KfKe#u}?2gjHmG6j`i1#@QCKOa}IBAyE9Z5?P+`z4dHVz znZB8vsL~xB|tkppx7QY?i?KJ6;dBE-n86%Ci)q&mIa5x1f5s0}{oZcBkK)L?^u( zctalE2Y%HX9rdQ;kGne1*TS9CH6Yzv?%%!r{#peHY73_%v zvr^Crz88S*#bPth_mb2}h@BG8_JvCYce$B4;whz=@;IziWYm$0 zOddcmIDqzxMNfy7mrXjy( z67oj--6)dZqVY8DMw4lK*y(}sejLkgK=0t9+xz7MjD9j5N5fZfXEdCSM}zooWMk)= zJJ>H~=jfWr#r&}k0_x`da{jS_dYKp#v(rCW-AYQyNy zzh_wf3saJ3>@rhyU^SlQw~P5Q#o(eMEiV_w=h>y?bbydBr{Dw>7_T{DsPq|FzLl(Xtz<92Y-e!yDpzvf zXTWt~p=7DgvP^K>%;1cBrfu>7mJV2X9xNa;3(^Ot$!8!G^6lK6D6hAxk}M7(+%glZ z)v_55Ob9|Bm@41s@1A7&Mq8<6loodyfud5Wi;6;ok&p5h0eGWcjBNadVJDqJ!vu19 zQL$uV+2#wh!Spxc3vg0zF6kKm83zIzH{>0DMaUtRCYK&nVf+!Irobk$>;epAIVRas zM%QE+9(tWc`4a?aP?qqAK+C4la1af9)zEt5e*gdg|Nrb=TW{OQ6@K@x;5tBH$D+cU zDAL(&cTuN+(ZDI3WS?3HLvrY7!$^imZ4w0e?>(2fQKDqoPEoX72Z%mccNE}U{II?M27ipQ6AOlR2I?n?U zO@ez6M{^J2X!a3DvqcsF_3WJF_0@-TTq{hZVTStCEX}7+$#E$GB5^z1!}|KxBfR@IVAsMZ{Rb#oNqoe zPzXs?h&;%rZ~>m=Qy`Q$7kfjRtvmVFa}HKcI9NGRi%YH*GXsD#V>R-O{ZUTVz;x0C zvt>E5?)VG(S}d0+0N=t3qa!p!T+CZC8j%YCRe)hW*XqK{cVg8{B^zm*(Vd`A3IIJ* zRt@Erh@v(x653lzdCP&&<$AS}6ckP7E;3i+BEk+l5iO~^Yhb*Bo%ookD)UZ>U#e4O zQttI_kStg^Nth>^f$NCv4({zo$h|!t<1>2lVt>5*P$Pp8@52QTbz(^;naIKz4#zU**2wle7Xa+r(B zcAhyTc6q@ti#$3zfJc&1`H2oFBDr}s!;xQHUVG0FJ7d<$rk-`8{eUPGx2Vno8a{rG zdCxKLIp!VjGLLUmp}o14JyHP+0FRcN_E}|{RVWw^#u!hq_YAGfI2`IvzZq+PB`dFq zpm_RJRr|wF#vr_9rB!vJA@+DjMb4{VT>~^Q+SlloPKY^zb|*1YhD|`P-WF+u+kI>O#zZNUyYwqo5|m@e|fks4cVgi9KDfi=^Ilo-|E*dDaK~-#ig_S_4xL*B(EkMU_WQVDfQ>P^rFwj5X zVAB7FF#|0eCIo1K%x7tMxc*ZI<;D^XObIk%`azy1=oLWzHjL0fu?c*#$`ztlj^%j7 z*kZudoi@dSdf~0s+%MBzW;CX?Hy`OB2O$jkH?(nsUPEro172j&)duoNG;qhTZW|o^ z$t3Wep+FLx_Q&$3!^7H44mqV0oCV@OnrO2YOZDnq$xk5H?4eyCQjTL}XBafl2{`>$ zH`0v7fzrYDmvlSF6WyRuSs6vOt0WcO6EiwBIA@Gc*dB4_;E0H#j*BXhaJNhA0`9Is zo|k1diGsK+k`zR;PzFWz;2SKeW?##>+P#D;%kq1;#E}A?=uzrG*4eyrh^sgv?q|6ytK`wt0EMHh~j8 z89)f4S0>8(#so!YFvBrTAtsZ@ z{-NGN%1UFPw7@brFmZvgB)A$42dkJ}PBID5gRE;9B%uNRwr)G)Y~z?24A337OHS#y z;0fF&KpeQaL9{TGS~2Jqp-IN$Oy+WuR#ABXOi7OS;+(CG8!#X+ z1rLA$@dyTlw$VQyw;^%z9*rmBA)ZKY?yyhK`<N*PRcs$MvQKm93 zrW;|6!|(HS59i_hr=)H=!;g@4sT=d-?Ah-9skw0D)@h`cFba3Io) zBNj;%;}LvcbZal9T$oqk+632J2ZZ!1C0Rk*KW!d%NYwc{yvA zu!49*d`2bB)BX!uP~1(XxO29Nl%FaRt*5z&iYTqi@pw`tcmn59u!ls|+XDouatL)H zCDer!5srJ*iDhQw4UK%hN2HjTD{K@z2bMbQ_Rrf&{Fm3)SFeF!1x&&@IbB-)I0-jI zJIHc>a!AKei6R1xj5HwDSb>IJL^WEM6%?^NRjtlZ3WwDPC>?-g`o?eOn8YJdHDcbx!|!4ys+n2K5iRg~{AU2ave zfnvLvO=@~Pt+!bs@Sk%r&)%~`dFEW$L zO$ykuNrpBV*<{?WBus453HkdVzl1sw=|rp(s3`YUK_HLNq#~1wO)4>|iAkk4Ch_hH z`md=DA`Ek*0w_7{#9^XaI}+PR=h3>8pM4@NcKb6ALz|3jGPX$^E$QP!LLtVF{QIop zdVws~{f^fsUu_NZ__p(ZhmG_h?0w_Ta>i$yjy~JD?VrlNI*YclacX;+Pk3y&;V7Za zBj?JLL;ED5 z)IFho@Qqg;*w(8#-pX|tA=)!3{Ay(MEzldris_b1R<_v-Egt-;1=zge^|5zKdaoZiC$3z-wH#`C zPo8$~M;>*jt98WUo_^eKRfeHuaQRO z+WREj%HG2Lf}mdUmfRp;>NrO{Efzti$sm+z`y=i_>VDBR9 zT7OWt%tLC1J1+kCfUDQIlaQbeW>3>7KUYBNEu9r{Vwj&qT_s#OtkaGzW@LL|NjDSR0aS5 z0RR8&T}^M=KoGs>S6J#P2}SX@eaHb(sjZrlC?u77sE|L_2!#LwqEJ=+@7*`!wRa7q zBMgISfFXCMr?dHd z(a-}#Q14+Wlp27sSv^oe!0>uX%-S?}M))WgO4AREav=VjKrWp~CUpWZ8Y3_TL zFHTQC7)LY@$4^njxc5*D3H{J7(jfPvXJd%@JRL!T7C~ABX%XaqK#)DkR4uIRgB5kc zT6Q4bbUVDZe>u8TIWAF>MVS{mex9c`l6M2oc7g;&6_YbBi}T!1MDn{CLJ&Y9`c5j= zk3!CS<5loEw+gA1yddy-G+t280-Wi$QG^10i)k_@n#2Sd&iO+|;YYcYeWh0DNXwJ; zk%}{C>#ew@oJQm|P=qtAHQGEVMO5|#V>?xSqWUyXwSEOfs!OIzveGMPQp6p0c)$s5 zB@dq&B1Lm3s9-%77-!aZAaV=pbUx0?uo3;N9K`WtMk46QEm_M~F7f0e^iQp;`BVbQIDmCiF>Me+DH7q@BL0i48yM-A zml!#5ZT=zB&NdZ7dBezsS#u#8&5Ey62p4r+J-6HSc zoXbThjx0@0kz%513IZ&&izRQakc&5}+%~S_VXyfiCITV&kAN(-TbyddTJ;ubbHIlP z8Rmh`=h9}TD?u0orhE!|Om3-0) z(xgpg+N4dbN?YwM3M0^{6eT zp0#n&HE-!XbY!@qdm&D%-405Rwz+_l!cYfUovNa6QQ1w~9&hTxV4XFyoR@IPM)$_%pbKrac z&obu&eqLVl+U-t8{o@Zu#bnZdEkv{jpVs@JM(9O}hGf@7 zL(&`|)d3ZfEkwk{#>bmhONIcq-}aM(qj&B1XlRe4`pdDe0&c+M>#7`|8n?3n+pa@v zi$E@QCk`^rwNF)#;o!&D0K@)X$u0)QmF^7SRoXzRY0JFC)b+Rktrjg$0C{ueOEGLZ zC&}|O(7jLcSr=#gFj84g4a{43Y#Z$`q*aG7%A_J1u)TEOUl&U{rU1W3;jF`i0~Y~2 zBJKEP35q@Web?uhu6fRu>#=l_WPx&PiB|sbBM4s{Msf6+%DLvTNbZr-m6V1TGyvK? z;6B_GHvGN~o;?z{w1TX;9MVFqq0|mREtwD_LA{d? zPHlE1+(Mj6A;-sAtzvBC7=%yT&0=dZ7n=V(@xh6`9|c|5RFFg|mPl212dk&~@7v{K zzF4njJkPBqwqQMnp7OF_9&<8X=bY3okeaoNsX~!T=B@8edM-+lwPFI?*oqky zGq^GV+v7-JE*V`UkpNY%VB1gYbhi8nMrS0-BBd7|i=JAVq_?Zhs_yNM;oQ<&X#Roh zjA&CFSf+5&yea4((r2~?m5IUt@LFp%3r1^i->wzB@BB^N=bP8 zixE>AWtcs-1!L~28hVfyqw#dmTn&WLygx+&$`y$?cjZ11H!vy;2S~RWI@of$w~Y}5 zO7q+(Q7j7yS0#4sdMU$&qipywkcel4QK8j1TPVqybLXD75uV7CJqsTZB(x4|WPli~ zRq@jZ|Ed-7KD~^H;mH>RPbHOPu{cK@tBb!mhX<+mbY8-Jxtj5%=hK)I<>^k5Pk${t zr?V$^PG>LdoX(!uIh`hUPA6jL#QhuKF|k?Tvo*%c>0x=YS|&Gc!fLj0US#>QUs`c|d6fMs*vWgywQQK|Znccox6%FQUm2DC+Zv>p zXgyAfQFR_gi=ix;xtGnPn3)talVW^GG4lNg3S&v10wBO8EbOa^oT(SRzZ^rrI?UAX z31|#x`#MLBJ`A*V5?^g;4`+(LN_Nva;xoB}44pKU+yG>7X<{+?`yB%@Ro}lzpP(X7 z0Dm3do$7Cv!His$4an_qbS-c|mno5-iun?7V}X%k-Ii{eC=`x-SUyuaU?#`Man*S& z9+p^eYn_r00|6jGF@4<%+%HI*M{#oWVQ3o05)T8vYkGgEL;yt}dJaqr4WMLii;0DL^`pU`!aI(CS=?w8)!})zLL)`l>~K-J~ZZ(~2CiVqG-xz|`3$VVHK? z^gTI9^m-%5E*$30Z59LbO9F~-YPQQ`7$}EERIo4XwfqAB0RR624H-aha|4!#`RRF? zRlx90O)P@!FiJ%~wE)z+Ob5-Xz?w>sP{CEifUY<%OGQ1!3mSJC5NCrfzJa(FNS1@i zR1gW9y@Iyo$y*s$0SXdCz(D7AkjLNSVP{|ATsDUzW9VQzPEQe@_Q3~upd@{aM30_` zh+M{pE776`8NOxU;1yhm^8yt#u&mqzO&XvsEP!QGc-IP37c4NL>jA;XV4);S91@1H zC?x|IL^f-n%hic8%X0T&vVUctQ)0!sV_G11%GnYPoJf{GYTOxU@o z(9V0bkNE-ah{kE?IJl|u&L*QMosP30XrG6!Z^%E997atu(L2fAN$yT^e=QFk3q6Dz zH>X2TOJ4gR_Hl}8xP^#3xyD6IA_mXML5*Go2ye?>dRUj6s%U*z%3kYp+@Ffse^#Zx zP^6G&Vq$1e9{QYyZ}2 z(mGZ~v5q2T-4^SoQJRYw3}%cFakb&D<%oHwG~$Z#dCo{9&4}VsM+TSMS0Mu!I4wRF z>#`}kSe%of8U*BmrIKDk){X|D%^W!c6Met2Satlh(L^7o&EYrVdVc%Oxngq z)rEK2y-<#mq8Cd2Ooe$Cp_C83jKxGa<7ai`JlT;ZNjPIMDbNzXYstq+Ppe}wnJjrH zsD&*r`(f41I)1zk*N3W3Ds2vLvL+pmx6QthQ-fg@vK=NUeeg7FRrVr8zlhiA+_N@D|%(9!jx)JB=2k^s!+~O6# zJFTQvl;)sXkwaC7i=AT~dEt?(Q;aWMcClMRwk-L#SYDG8631TNkpL~#`^`2lugu% zm5#ggHpL_^6z!T@pnx?cK^W3q5~Y!~`3B7il*N`jEN`e@xnAFLB>V%8a&OEZwD1Zw z!L>?ppzqJ?(D3k;KdXDkewy=b1t}-P4vw9zd}YBr>pDjuUIShrm01CnS1Ic1o4A6& z=CG!Q{~b^o``?|%Qprtk#mDrWWIzw%WJ53JcWDYQPT>Cbc1 zJodANzi<*iiE`hDFwSY}N1h#}krgEi%PYK~?evG_d{_eyZ=3dC@&%IbNcqYM13#M2 z)6|XZEG#0o`F+2mFszMA9@TpSB3ta|m5b1F=W=AMwXz7Z~ zb#y(bbCs9*-GwZ=oI_Fwm01M%ntaLT#j5(Y%3(;%OYlf1Y|hu!iZ;-rZN*?P=&2yN zFRX}@4~TwTnS-KVSAQYn&VlIZei-E`q#X<4cbugCxNCK?kHc04@&LociQxYUhUMT@ z7n8*j>{h&=gOnJYVxZ*UvUb3<)seQ>^JfftKfW&qMUMkmUCXt*9a!^Fm zdfAwaT`X`an%Gt}bD(>Ztk`Td8pzd+L?N2af!KrbtOi0F$0B$L(|AyKTw9StZc$d>o< z1GuV{5Hk$)>w{U>9&4>|e{GYeTB#HC$)3m}o!mpKGL`~`X{)?kRrwa9v$7pN3M!|3lwny+4_%-j?#_nhf=w+vu6Q!^|ceQP>wA)q{<3q zT3hRivqq=jnw)MP#7O_Z#H>i9iaMuVh?^eF1_Nbs+z*j)ZSUMzG>iH;hw3YhoNlHp zFDgO4XNpkqIWwFL22adQc{hKi`|G?(4;@4!|Jhcx)3!oGn`Q0;@wn@dHKcq)B5J(l zV>Jlf#7UAYN#=7WaO1!({Gd}LYPL4d(`E_g%~-fosfA47>0suJ{S#!n>ErbWM)rmS z_K&*i;+)9eG%>I8`%UfJE(~5sTTN{SX!r=hYdS7=WeKCc7T@A(vz3#P_#XaT!Ji=_ z;KI6uP4VjRmE3Dgheu*KL>e9_c1cxv8Z%*E0QCKp;+mSD?*1JM7F+s~8$tHV`K8DOE3)){3tHeB)-W2m-vj&sj`jaDh7II9L zZLR$N3CC~TDi+|42i{M(e0hYI;DflLP{7E2&(8nx;MCqEm=+ggf-D1nX<<9T-1-*) z0RR7-9ocTDFLVa?Ajb(}w4;d}c0Q-`n>jKSgTc9WcQlesQ4!M$(CV$_Vq2xo> z%1)ApMB*r2PB!02uA- zWd~=F=5VF~k(pa(GwQyVDE(b!cjan@VJ9A)(pOqN)vKy$&wgm9f$r@nVUU{XJ;r|3 z)pNPYXn?BP-njeyy{a>U>9C=8b};f<=g@?B;-}-@Wud&0) zAxF-#8ANm+xZHTD-Eu+=j7{E7jzKYpX9pHV016};L+%w^l^u4dB{Co%3|%`+UR z={D16)=cZ3HU@&UrZi@;`sn|_ ziwq8|4PB_>Ue;%o{RR@^`TRpL_A|N7vdKJ{JZH@`iY6Dwpb>!%9_`Mk#W-H;VTE;M z$V2?ZbQGAB!Uzs@6i+VpZlE29PL3i1M>vFyT11Wk7d1jBVHC3C(B^?wy5OKd9xkAmb+zS9|o2%e#LF{Re2vt@}1sW5Vp8p5sUocQ?Pr)q7o z_5DqOijIA3rX=Quh!erqXz_4$t6K507&JX?!NX;+#EeLFGqSAsOc!01<_#;-Y3qwl z^Nhuco0JLRlq<9>T$EZTIZUfzHj!F^lFj1y^4ip2S`w>D$=N3_4b8ivKYlsqLJFgtk~E{(c_zMC5lhMcYvVSC__HMH05lP zT_W;42=Kh=FZj+0oBF)k)K`|5P~Ycz1>7owb0+zyk<(IoAX^$Z#I!7<;MS|)RtcOY zs^IF<0f($x#NBIR$3U}xv^V8MXxzupM-ft(*am*GmACqy4L zC8Be|ipW+Tk3WYGg^)t`H@4hwiG%Tu?B~P&DcK<$BUxIAN{?}W*s00V>uMJmB^JQzA$e? z{BT(r>_bV7QMkq^`AZ{EIU;C>$&c-st3 z1$Q-V4CPW-9K=){_I&%ABZoM99aL@2_H{pI`F7qC>$+=;X2$s5x0)t0WL zyz{k{uiX#dF8}}l|Nq=wO;5ux487-9MB+G@vV1i?a^Vla9korNNNkrR$8wjF$#jR=hS)RrH$Dpj~;MG7FPok&z8z zV&k#j!T3F(Y#;kAMN&0($77QsOfCevH+b<%N?~ro%kFSQLAM~M6S>>X>tPIyQ7EFh zhHl0y@6ulwl(A=5gLb8;7}xj#v=dETtjSIA4rlJ~@)Iv|O;%?w651y3ZtoxB@G)eR zhxfYe{?rZ6;VxF;T?`)`=(e%%plL`wD}&H834_o%=Yp)}6bt{^=ptf#vwk8ep`R!g zaOxQqI8p{vt5jH9pdrpkJaD(gd3=$He@|Ak=phtUtEcF|Ll}#&C=gCYKf0_?lIc<= zF(`V*jmvTzdd;?ZlNY!=R+fD_5lC@|NpFAZEM>w5dJIsmUOJfrx!~ObP&2Q z2HP6CX8STQevy|#nv6Ib{rS^LvSZJdacI9JV4o#fIh{_qd!94LLK_%|;lOyEye>x4 zZU`GqyMdP_uk*;4b|VI}ZX|UMvyJx?K5n$hc)VZu)4_U4`4fz`KaS9kQJ&Mm;)`_k z`4ZpD`%Hrfd6WT2Pu z*U{caijFC=(pCT@he6eLx8qQ_t<9b-VDt|i*J{kLirnQa<-Y*Ac$ zT66tjWmQ{B7X6jI#kGA|u9LTxXe7nz^ZCJ+jWle^H50i*P@6#;)HKo#8N&I4sdZ`H z8i%{Cf~(gCoUx3?in3Vh9i@O&r7|R?{w!D~MZ`+3Pk^i}U@G9OKTjh@XJArY%v|vd zs8T?JKtjkU%?X_tP#tJ=-1H4RU{O4VlFfNSSmqrenDa60>sIZ4-^^|stT8f$B2A~^ zgD|xOsw-3(?a0m?y+?ZdRUt(&(uN!Z^OfMWxw~(Mm^h70YA5%`0hntTqLs4hTMN&z znIO*{QD3(q^ElRV=I`_pb1W?*BFqg(_ZT4K>fGE_&!?ldM1d)jepJa*nja5|oyPfj znr4k*`S^8{e7oD+->%-k&;6_|(kY;XKS!{AuSL#iS44Bgp;nAoq}t4o7->th0wF>< z&q$hOoasC4HH;2hK)fKVXLOcDp_lcC@5%aZz4^R+SS46E#h^>Omw()UdRWezCksbhI8rM_H~;qe8ud6h*CN!j&v?!Vve0^plySxP%|U!s^K zKmfZ~>@L9P*=%aopGQmM(8eG9s}4oHEanRd_~+5+YI1o#x&B#ERQD?+CRju%zjrgf z8u5DqzpGjFbaHVfXP7p`qGt@|Yw{qzfkpy*bdov?U!A-iAsq=7R=*-hv2gAu_vJKbaDv~g5Y_zNsd#7*F_L1pz|fmafLKm+9zFSp#l2qo3^Qkw&l2?1MAi>bX{9> zRWmg4FXK-F9f6L3ZPMKu#Bzyrv`q8lcMh)X7m|8Mz`hW033TX|72#tfK$dO8wwfTz z8RI;{$hrdNoh`Uqg`NpQc0Ce)4Snm+D-y7+KMui^5Vt(XC1Qv(5mW>?Q5q5}wV)qD zkYh^JaKy3slYCCnk?is16j!@}^6wSqi-Pol31lKrLk>T5*lIhnEpz0Z&hB&IWO$VX zP_Q7*ik#50F?)yTTbytZ;sR{ep>md`O9b3(nIjr!KAB~MVbXV8mFIkij;?~Q9NLG6 zmZm|k0xf8LnA}yG8>Uy$m;1JaRPI5b&;-2mi1|26LcEDk zZ-bgXli0IG`6!pO7vB9Q@$)>7zyJlxo#)|yYJYN6Na1$C-?MkulNVG zO0Nf3F(C3V#pik8XbcpsU*fzq${w$^?0R%Iz8;; z;!gGN*asMG?-9%b$2@-NHS2?4D_5_x-=)WED%{duJqmrxv~?{8XB;=;%{U0%F7549 z+=kAYnuDof{2{kmj0UP{9NrO}omAQWn)uOOUU0O1GExX3=$A3jzc{Agt7C2e5%z2+lV|^k9L)MR;Ecu|E0I54y#i?t-C0AQ>75n{5bESk+Cc z(CiMM9b4<#pL-c$^?j4Xu;P8?c^{@Dbj0^KN+@Mkme0b?jcb6K7OSC z`~(3qtTj!~T(S#jL-fo|>uBh#Eq#k+F+XZDd6fXZ0;7;q)Z$8>&Li9+xXt|g9Fa|L z@sOIU_nUMBh}1}gr1C!J;mJ8F4c6f=mvdy)!N5+a4_sn?CUXObU)5++L3&QT zW5~~2;N5Jsz!4wN8;U#1))TxMXCcF-Nzgs;G{V(nI{wFYp0{g8fv=lEJTw`2D3Rqx zvCmBAhHhj;v2GcbZ^!PM=Z)j~y50psb?vxXem-bBmd4^3mO2oA6gsii_NKc^3xKqa zJB;zrCEG964#`_zcW}AY84)3C_x@knAK#5qIZvs^bz6nzPdjkVuht%9998 zxuhJLcr&Vef_b3FBxm9d)icCOVfql^GO;-vwm5P3_S=0$e8AENd!fhtzl+o>h(O>E zLbWZjRamm+Dc>y-^|aT%+Apg+mUyQ4;16QFyy@uTyf4-Q6z9Ha(l(*;rJ^Z`a7wak z&h$vrB@J?xJ)qlE5AobtjwF>eZB zNA3a>2OuZv@G&8X%MLj9K1Wro_yw^Q8KccjY$8g%L^GSF9BHyfE{GgBHS#Xdkh4_M zWP@cWwW6#eU<657Q&Gg#&u+;fuZ+(F_)U=*CEmL6Sy{(Ci5XJT2sV*IA%+te4$MPv z!`eez$$s}y&HBnCkwLGDorGn0Ry+0sd9ZKdGr= za>I}04d|SzTbrdn1bTC~3dpExksiPhao46x8zfr&Ryy&lF34J5(13_eu2oE$@ZGe2t(F3fmkbWvn@5Lv zDw7)U;NQnnZ+zLyih0ECv_pG;t}{?+gfK(s-6ar8FFeeO_nQ5NF%fTNktdqb!!m=` z01cGpUvDqQZ%#eU(+!R-{SCHyGJ7|=_NMRPo_9KVe|0jW%9fJrP!<|C%I}Gl|BK#F zN(G|%#YYFVD6xW3#<|e!YF>f0rg=5suA(3Q24P#o7kl1_BuM5-A;HpVx|i7rPqY)U zHE~}P^?c15upIPbOH+`LJd(WBK2MSn^2hq6)0?3$1M}$Wh@348rQ)_BRYzSOIq?{0GlTxC^OMMsSlVkhCgkJiDS<5$- zdD>f&wX}(V@3I#C?_VWLYV-vCw`4(p+WedXUj%9A9BIhVt>6n}JuVeKUe%225t3G{ ziLllF+R{=z+!Y|57 z$^BwYRfhJFsvViuGg&Eu?1wpk$3kW6?_u@-osxeLk7jAG$_sC?9CX~zYxjAwN^^#~ z)vxn1)>siw{S2nJGI@0d9vBSj_aR+qbfMb8-Kofi^ir%d%Q8$$*DW;)Rom2us;URN z2IK8Iks7OR6dIA+PA^@KZlkRABLLE!nplmCOyvASNbm}eWMd< z{J1#J-=(-=MU0@UTYi#QFhE3d8BH+qhF~OTM_h+~RW-+PKi348`5`N5zZ&Z5FUmL` z=Ql5odBV>f*~m(=A^P>O{@hVKgbOL=5d@JsRRojeSCa8(WxNo3QKUc|TDwz4Uf0!# znxZ+XqkUGq+4%j)do!L*f3WCW)G3S`u8K*XuOuN%94-oIVv>gVv&`^BFO0|Ex_z&D zmaeho-n=0*f@)yLS`dZS;h~|chQ(Ypd}e>WRYB8*YTZPkyZn%jD^Kavwi7l?G)bAW z{z!r8bo}3d#~&Eq)Dq_3DCM>KzRh0!z3nZX7bd*irfNQi4dLGXcm09fY3g;hw|Y$M z_-uF~ZVQ09Mn(#y*Him~8ng;WV4OkOFhk|t=eM4x^uGSI_kzvBY(Z6S(8zgrl=xbZ zG`a>+UhjIMtstFO1<3^Sqgj(bVc-S*? zV_j1X!w-EH1dhpuV7aO@4$&P%kJ$r6p#Su7aq*S!{qox3fA}@z?Dey>$tjKN>j|!Q zhN4=yzRL4h2SZ)1ufpFtqC-s5`AV0RnRxJU*t`r6PF8E>xF|yiU!i-rD$}Pa{LsR( z0251oXC_F{(aCvLQn~O$Yq)7nJ78j~NKlF^1#y{#^wkP6Eg?I*+(g5MDOG!D3#k2O z{7#0*q|h#lG()~*A;w0LXfP6la(2l)1y#aR)96E9UyR?6L4hadqR5Q??O0abWmCY&yERw$RIP zk8mPKK6i@YS`O-p>?PwW`{E))j({%ZiQHHp8+UF+n9C`YtX@rz$<9JlvF3-K)f!xIYz1TDi7%sT+O5`Z; zB;3t-_6|>4o?L!ZZceVRPcCO4k7)tGU1avacwLx^#YNx|&$cYUUZgQq@qPqhGL$)a zGrkzlK4M4C$Fs}PbgG); zQg;6X00960>^*67+eWgV?O!pgDkq{vQn(37k!ux8c2uj#DNEi>%66e}3?$mTiia(4 z*6+8!?w$h!5Tr=iyU(xIRf#15gE@M7rtj{Ccel#vsrq)F1No^x{50F2N|$tcrH%Ng zS3-kk2S@9yaPdZ%rEM$U)04ru*^Sz@ZH%4sgvDPRA@ zEL4^eT4BB0(_d-A^hITDYRos~pl@JQ>-Nzt{QGDu*0?kcns#mX<#RcqTOtc<*CL@N z@Pv3zX(R|hz0-CXgVLylY#jy+7k~=q$JYyn10NRUJcw9 zefLMW=}W`GrwYxdohLLLY+raNACUP{`3}I}VjQ!!u>R_?uIFtI(yHT>Ij02ViN-0l zOTe`asG0URJ-H)2@p>8La%xAiyt;f^t^&4QFGD+Ur=(cQF07!`w#7DItc zE3Yh6x&H(0ReZuwtaz`esYDWC-y#M}`<3BvfO;j5NWKAL!5=vj3&E@iQr`&A&>t#c zAIH=8$XE-$RO#%Ow^Y&?^W@^SuI_(zHsnQX+|KnYR%m*r{6h^RKi<$i2Ltmaj6meE zt6L~g3E-*F=mC83fK{*j)iZg()P4RJIS)XZev4kv;1A^KEH4IFaa-L1atR&%skFSv zuc|A=YVY}>eo6kM>d(*gQ@0oGKI^r^6#ICkz&dem>Qnh;xhE1=jZKlXLV@`6TG2`9 zbL-Ef^pp5eFH9ph0?|Bk?1-ZTWH*cE<+qLEkd9#x`SBuURg)N}jt|^6fcKTZVtFsh z+l1Vm56PM4ge#YDIwqG_$4^yU6d69N-H7AcINoFWA4rRZ@#o zsOSamY`d{;fICsn3p?X$bpv;gXX*!hU+D*~bS3mPp#82L_^uuJt{wOy?Er?mjOH7t z3`laF-9uBbUdOOPk5E?`G^!ZL`D28JuiuWZeu;lQ{@n79hzav&j_N6)30TyZsp-6#GTK|0qXsRWjA|E#5fv-D@?$ zw?d?p#9qITfswzS-w6Kai0Nb{yXN5SvVB_%O!|?OmINDMe%8`jl=^Te@i*x%%HbaY z@p?3Y|NpsY?I3g5JR7tRuAGpDL4EkQu+ksjSU(=t-D%>>tCwdN&yBv?%+LumDo+HF zj>knT*q9i+U;G@)%8tudTN@ogceD8slIXUVpUUhvi4&kO43!^QrEZ?nW)}03hb*fUEm% zvme9GNB*F!j*g=@U0jnMT+0F_d zJw4}^v1VlS-uEZcO-}bLT(kQ#;meNUR)E!Ih4-?5(`Hh}k7&UUzz!>bUkF9kgCB8o zieg?>_#&~3@LOV;A$d)k&R@-aP+p+qmqHvdbYp9Mmnm1TWv1z~HhU4jJb7_({zscx zfh9Lwt2+$+3pH=lzR>mZ_tTeW&;EcVA;n|6S~zaAXYupXt7qpeK#z`HB9uuQN>REB zDcDPy=ZoSfuail+CrZ;&k)@X(`^}F71@|f#9aI?vRX94E0MgkGkj{31bhd+}(+tWJ zE+jcR8pGtaKU@r@0Hz!pO7O}_HChd}wi|41IUx4}5q@CU502O>N>p9|+nE)%HY}8f zxPmus1Kzls;ElT--niT0jk_J*xNDDK0?Q)V4v!%@yMU~CEoCpUB%KAM`INdVjwwEO zS3LJuJnyY|9<6w8uNv5Po38?|VN1PDw$$5hOTF#3)Z1=Ly@o9;-sT&oCOr|@jQh+Lk!yq5(%?&ZE0hW`eaF8{!{mR!1C!A7pz zj{camCbZ+|nAFC2!mNBInu)+vk${4fER*Ep$Y;Bh^(J%zt5tCcQxTtuqWI&*Y_)e7 zsnJNIc+;QH%P4(b)ueq*x2qs^tT41v$I0#7Dl*>VQQ=!bnj}HNo!rlQMONfl-R-Il zEz))^Ka?7*+{^5+XZ75y+jS$KXI36YwbcC$9}AsU!wZqdxb51Q#<=Y`wb=blf?rI| zZAAb~vy9vjJY#-M`9Y*yrCv(e_~O~gC9WC6qYRFX6m;=$F_`x!AZ5+@a8i|-I)7pu z6l#lcJt|Q(wi}ZUsE$S=d=~#Jd7w^}*K4xxF5N?&+C5~`J#<9tkoQnWUq3nkV}q{S z%;e!ZbxT6$^TSRxZbt8YJ$$BQI-0!A9@8H);~qBN3bT`lo#`}Km>M^vwH?=tkZJ%d z4OkKo$z8>UIcHA*xk_kOwqqTX8kpJkCK(hB4foM1Tp1it1dWts*Za(?jVqee`tf9N z45B3wNgPor-pozFON|a98Xo|rI>tzED%+K_l^)!FNbyk8e|yE=80OA`S|3SYV&ys=_T=%Gc3t(rIA3~hK4K2a|2b@;H(KTZE0OyOhm>9^r)WQ zj0bsp1#Bs^044z63;b^hhOn5s;a4`g7wnWB8UQjJ$~;4;>?W&Hg8B7F(hA*>u&N~J zM9!8UDsyEP1U)yjEU(*5BHxapqzKZc#8s7#&E!>;7nC8thhgx0l$)Q-mFo6mXbkTs z1I*s~AN*Y@GSo;J_;p z_;P0R5S;No9P5C-n z2RdR}XvIlV2d~k&!>zR;q_1U;F*z!=8+({4nIPU~PtRXmp2jbaFP@*q@cZfSr%zjw_|?{6e66(_ zv2C7Bokvo0P3W3kJEJFp0oHEXn0+l438>38w^xD+B+b(2;GP{Q|MOOv54El^5}viD zj;KtRDVC~CLav+SJV{*cq>=5pnHz?omu7yF1b)tQ$8q4Fp2zQ(Hs@v`(&o6#iVl4L z!1q?9%{dlM+kAf8$B2d`r{tWX-cc<{EBRCEOf0gvLFfjyQQY9T>d0Ej?uYYanu@Y@N`<^}|?vA5`z!`K=t1f zlrZs@i7|^2tlex4RA*X(8wnf^Kj4_FkFkH?_=!dmy@IxI>(wI>ym0*wnal@?J+x_) zQRSIvyzW*I6}pB#Itk`k#8?1T)&iqL`e>UhhX72OkF)UrJ)IHp6ga3WJu!*L=9;Uu zGpJ%2k()Ic3p)UuML+Kh#^Xsh!(B-ekwsMGqhR^?BalC6Iuw1uoPMP^2KHk1AsLvN zD87NDRZi$d+$nt5we2(rLf_3&-}a+4@G>lgoabqghQ4=q(yB61RkxdESz6e3QqOwc zn6%2J=ok0?NvpnA&MEdy2*tsb)tkJ-sV^# z4DViXp~zd2@LZG`)c1RTj_#KxNn`j7NFja!BZ`7f)bkLNEoGFQSW^zdW&*2quN5+59a>kXy;9tC7Yg?ccTo& zS|SrEhm$BN?aXi}l@P8`Tr2@uUbhApQ0EYo-|GmDRX&E((4Q~WiRiZQf>dd`F*`X7 zI!tEo(W;SAz=iAuY05$eipi;A%Qlf@jJlBO3j9#JaABE{YY@GF1H=eUV*~+jdY|*< z*X@U zc{#uB%%`8|Eaagt|fe|__iJ)p;n(Ey&Ae*<;OI}+OZ@nqil09g6nuKeZDU*g4W z`MYzA>4VgVORR<2t4Y6PuH==k;dXW_|?$3y}avrGLE^$HR% zrg>8wposJa5DaAzEg+2fBI6R5!^<)o%q~4S$;5FQrKr zu{l+Bn)rh4!aq{ExK~T2zG27@vGSVx90DX@*5Z&0eN2D!VT^JP9ZsnZdIg~A&m;?o zxPaQwTvj1h8SX{Z5MX71hZDub;m*%NT(~9?>lG~Gem;9G_vP(!T9$XB<9E=pY=phOGs3fsZr-8(`nF2k zm@H0O*olBQa4@v>DqK^|+KS zL%tRzuSbC5$rQ-Wv_-U?Qcht{JJt>Ztfj2;FuV~+I0p$rT~{|)d5_BQ@lja=0_P;E zIEqM8Q3DL*C^8nJ0*lLPhr;eihv*8iM{xf*?k6Vd96glzTtL|O*cs^x_V z)(FgadYi&v_x}u?E{{ufvLfeIjbh|!x;fy5oJT?M@1h6|l~qaQRyX$~D&0_~ z_C=cEJgZl&F%EQP+&8K!P*ol(H#bvd`V2;7rb?fxGT@83wq4=XNu?91OoLHZT&RG6 z77*WKsK)xFE1g&DL^tCBUE{*tiK4qSzm4~Df8Ih#r)iB9BMRE^&`^{ts21cWox6#g zj-_>F0XS(81`tWEemiJv#X1zodY~$z;M|8?MfQ@tMoe)cl)u2{C}o!>8gPvbl9Xsb z_P&qlm*4ShzAuhdhqOccoqeH}-|q$9Dnj8qLFQ(KZF3&ELC^KPG)Qef4}yq$@Fw*F zI{|J52t~DYhNz&tLHP_>hZilet#6Hd@PvnU-m`q5m679S+|B&R>V;{T7op!vxE(pX zNP@c!MWu15+f92>|Nb&+cpq? zUjGWB0|t4mJxP`&tHnBWT?Q0box(w|M}yW!W58C7IBw(re!LHg6eYz@=f35kYAo?f zyrXz`zvCSo<{4=3Bb1_1XQ!R72S8A~2ctBeHPt;QeC??~i08eXX7kmFRf#(wRiWy2 zi(0PJQbYb}H*+zcU(Oewg{KM(#2=jnW|#c<4XA~+^n@qrQUL$dHU0q3c|7Ak@>J>Ge;CblPJ$itKb%IThehB25t}9Xbh~4DfVz zYvDX;*v5G%LGTW9{Tie?+uz-x*vmU8+Y${z{tWIsgFDaQ&WYeoo!<4Sh|i-nyYZmy zNhr}Z2SBUC`sDk~=3pgl2cA;3?@6x#@0wdyjiCfi#K*sS&=E)>t3eUif7QaQBlGtn z9$#-ESLwR2tp4oaL%-YE0Qj+XRP|cPtsC{#zOP%xZN#gi99q*sG72pmFmb6(LstiN zg>W?BvI?aYA+xO5k_m~`j^>Q$9+ztAtO`ix#(%kQ1JmYo*gb&{Zj(?;c)##Z5@NUL z_~d;*$n>DIfU_w<`#S5%<}ga`SUA2r|72es5o!ns!jEaTGMq-Zp_+WMx*75lOZK8P zz-2Z#<5C-|bI+#Hn_|5!?)qD862Y|3;|H-y7#^|wp+R}xR}h%M#JxIBD{l5rl()3z zihkg=hmr}dzXFrZ0$nro8ylA_b#|v(h)8j(X=t@>=`}-=3oeTrI{2yr ziO4K~$g|S>2lZ(8yEWuU@Fu?a7347A8pm~|9isLALSBTsgIf7_w-q>3+X}9kwl>)t z1h}4clHk}pIo~Wj(g(*=*CW1mIDl}+M;_Hw_#X&lF-?3avuT<{SuT?(4kn45$Z?jI z(Im{WJn?fGrpt2#1pB0x1{?;71>|=O>$4zMJTQpvMQ9{ygo_FcwY$X*zT1xR6|~l> zK4M^E>njbGEWSJ^n6~hOzxy@h%>;#`V5wSG zwK>@yCL2Xe#z_lgSN*Qm&@UKVz*FJF=WE9&{~ricARGe#i}LFO8EVKxZg&a_GxkfT zP1MNt)sD;I@S&_MOZd7U`V6h7fC$Gxw?O*g(jQNjQ5?x-JPpQi63e{IgEWieB+bTg zo~niH#w;U71Yn299?xD%`*I-CyjG7s>7;+9H}>jS$W#6 zsD~0*jt41Brd%2)CX?uz#qEuvx|#+4|IoyOsvn;s zQ+Uwie#&0;n^Hb2iFS$R4Gkg3Ni>b(v0scvWl;LEoW{|#$?r}@Vsz&waQHOAOw9D3 zx`EGNkYOXq%4@NqteqJ8aDk;7;II%C-rRAhir>X%yBJYx8~O0oE(S!7_rv3A7oO1#5pvaQ(E?)%N&&o5^0uNHsLFF!42 zA1>z?SE{yZwn|hn$*@`cJ$t&*%+oT9HNN!NX zm2QHt$dU!4`k9N2kMm{*P`8(W%!mU`_wLnr83b>|;V>O85aglVc49B;UaL@~Y+Rr6U-? zDzFouAL%quky2Z!qy}2yCtB%H#YqnQBMzg#Cm89Rhdg0;BX)EwTD%WdcS0|0VP9j% z85S>dmcYhiP6dt&-~`S+S8(WKhj=g<8UA z;Tf!95_k5g5TD{r)@37brI z1024yU=OOC`z#HggB%|jutSswWiU|Q1a7K;9)`8Q-D$n{rh{QPp7Py&_;iz~k3h8c zt1J%e&B*H)9arClT5RoIBp3F%+nPuX6RnsG#~FCZigj01zFBhHW(T5%frD7312`HP z)~4j16+m_vfX;t+@zJMlg>ntg#4U=wWG`-C8Z-IcoQ%Vl#~UTY1ko}$$Yjz@g))3+ znxQTPUtxF7yP6b=z@*jb^+!&9dJu#BgEu`&Ac3oRDh>;?xH%IKd&CtRS5}2VNkcFBMfl2g zUdGDCO5pKyU~uot%{zDOV@aH`bG}kI6O~B@;f2u_UI&SV#0<|1WyB(!y>VAYUP5Ws zsM2YZJVHw&*xS!jU;&YSiHyU9;k1Sb61BD+Z)4CGi|rBs z3G)!0`50p5U7F0$ETMiA#Uv<^Mo2zkBZegZL+}0?G?~x*DCT<*mj>8nh$O^DS^NV4 z0RR8&U0HM6MiPFee+A-7S)@qF1bFL6N>SvjwqzgLlF2t)9-Dz3Wp_c*eW$b_&hJkgtAL0JI7t zG5y9crS$$&6vOZ??J$}wI3>5uOS5bpyoLTH>B+rCk4ur(2|AV?Gt?b4>^vNj7UM|Y ziBYymJTounaPB9QKZE7CM{W-&c{U9`TGj8X$lmrZ*H=GXjNnVR_I-7{f`PON%FeGf z)wj-jkXyMBghC`V+7#PIX!ip2K~7F)8d~t|8)4L%RfE3 zqs&@lsDn`b-{xWXr1;wXj(f4?IZ9(h>7H1JI9TN03LCl6`8Av=bzTENv0!kPOy8Xq zuDKeDe6z&S-PM0CcNCl5cis@g)n-HN0$gWy4O;raqcyvi`Yvw%HGDO?W1E7`q%&ZW z7q^#}stbh+wfl!v)mS6YPGf8f@R3==8b&J-1MN|9lUd~}X#r7a~5p;f~@{B39rmR}oy#kE1YQpJDAQ6Jo z$C1o?7cdN=xfj|ua-6mpnSeGyCVVBi$V_6?c#gPWjlabTVNx^-k{EZQROP5KzGQgG z0KhWnm+RXbtLo23>K)(pD49)6KqkD!!dsHuQCS++ueUd^Mz@#eKU;tD^PAhNSC=x( z*eq1Xoeyt@|9*KxnnwKp*W0Vt=a34{NG!B$o?EWyjMCuMyUU+thGa50D3gNr-*SOr zLsCK&W{dHuc9Nq+-GJEo0q>34d}owtw2bhvjI2!SxsGnVF?uzwO50mwis5;AHGF-3 zEftaKKcLbw)Csz{5k{+b?-?0XAyAGn%sHO=abdTk*q+07MjL0n7{1dskQQyF%+`0Z zEJ7keZ35FF?-UZj$W*29Rer|eLMwv8Ez1qdCiz$(XZ~@1i}%uWpYwTm{(z2FAyEkkBX0n%i5XTWNjjl!OT!@M$d>2!u`@XC zINL1Gx48JR?>S1Ss7!ATh3O8dD7G!fjAHxh!P$Wzo(Orf*W&2zVl;%!)5Yc8-OcUY z=w^65tXaO`c@3Ja@ucTZCayQ}rjvG4>hE>i9j<>I!z{3=JB^m4C?}PCXh{H?_vss8KXe3O=zIEs*b-iz%hV$iQ$|;*x^eRs?;3 zHo;bc${~F|6Q%uW=Hpfu^;0l(nJcb>M6;DEA`VBDJrvO^k?&3Gx=cJHKENiZfEq{9 z2h=Khiy%d?T4?+0m$jo(&w`lfAfY|OT&s*WhQFaTLt+fVD=RpdIaG;5YZ$TeW#W-H zh!Pn%;KY5_Y6;>sNbs11mLw=}O$<2;-;-POlgws0G5v(4a7HVFzT)}Mn!-{u_9h=x zX@b&}%0_06PU>r3cNP6H{IHm%a6Q1|A9-mLKTzY*erRjVje`FIHUvq6og(PQ2J6t( z!AMR)B7}aGa(`uGo{7-|F<6`#~x)V2Yz7x7YIe9p7vF-_Xpz63yIc z-YdK>!mn0hiZ+&0ULMN@@x{&XMeQ*`Gpt7e&G^f;U73dK=*aIi1AoxzcL#rmwoBlX z`(!cAkZff39^`91APLMDQ3N(L)61eb^EVhMrb3Xy0IHlm|6u*+dLRv2I z;5L=qrd~)Z-naV^ax5G=#feKcL07aIPTQ(?I`HFc^>y62>9Y!(K6}rm&wkjZFS9Uk ztk@^@F!((k(fUrBWDJSNpIDEm4odv)aI(~ou?B6o)ZMf~u2B$bvju-e-^nvn;-6&i z!Z|v{2aC!3*s4+m2fu{}4NPp=m{y`-p%3~TPf(=8FC3cjD&mxtCZBHYHS(V%7)8fgAe4Qh$4bB)`QPL?|9i3a7@e~IV_*TCiQJ=7vw`N5_)ixbN_P&cwdi*gqqiLytA{(1+y}9&)!a z&B?Y=kx4Fo`ka52`~B-jV{bH^&*A!V>6a48&C_Z z3${~SG?0Rfu6cep0Xa5n}pa$(3v=ge*wZ6^5fODyLD5 zBx#(&b{z_X$}o8Y=D()$a4kTW_@yQ(O2fAN@cOL(UpxB%a~Mz(ak1n9f|z+xuo@y1q9Oq*gTYG$Vb(<{BWH@CR$Rc z9S04gOZEDk(_&S!4&^d@#{$xnP$P~esEHFEaR0PQkX+1!q~GP{k{Y^R$z%(>%uA>; zRxD>iM3WGA4n*1v$>~;HNl=vpCq(pi71e$;M$WSsvjf#hN;tD3HA6B`Q{gKAj4gbq z^%Z%Z+r?D5X;v>~w5wmraW#|4M1`zSo7nLd6&QwE1y7*pBup20m#aeskIO_LU>4ID zL=*-%SkKg082 zb^f+>U*lBux+aJR)7U12x+()-?>QLMA9`i#QSUox<#N+&HV2L~7<+E3)$Dcqj@xYa zx}N9x-Bz#L8}}W*({5?y@;{@{BTuF`-iKhmwod>1i5^OUdf$Lxd+Dt$2adtr<97cT z9t5e^QTpV&)e_;!6U%;s=x+AMl{dHKswSxd#z}yk%_~$z(S>G9yq?S`H8s|z`RF}J zK2)h;RuI1nNdS02hrcNozSf`6<3gF)kiZT^CA?nh*bZ|BhhfllAV?P2X;jehCIQso zbDPju5ugGV?H;UFPSI5);wX|R3#d7^sCmfBKt|L+F-Npm&hUOariCuzhzLM%E(+pf zE9CwM00960v|ame6gLq5Is6sdLr4j5S9^EuT?0bU>j9|(q+F|3f@q9eU%+JhvvceC?{^_VRv*WP4ih|3L#E{eQ^5 z52>qzpeWv3`1-4lkQ=h~!6}Ll7`wRlw?E?S5VI(7g(`}Rb?V)ssLdsyDdo6FIXvC+ zut~=?rX9HZ`=M!GH93fUOAgRD^;O*s(hoW{C)BYrus^e=wzb4ldR{N)sQ2vOZ5|w8 zA?hX&*5&s;MZGd)Dn)znnzT@Xm=(g_%>s{`0<)%o*B(|3m)lURD4xIibzB_3nY@|& zyr15WBw*%kbh0=()6w(s7@$s{AS7d`tBb|y?$i*)DjM{lW&qhS619WI1n_P@3cT{e zFKNX5V^?VtF?HQ&Yyem*B@Iu?T*KIBytJk)d1y`WR65`$lRTHY{WYJaq}cFfSmNN2qm>DUX%qUvb}o4(QED(I4mcNE0r zJclC#WFjpPhJ^`yv!D{=8GArqU(bDygT%B$z1UVc+7bNwra%U2RI>z8CD$xNyQ6%+ z82vPgjxM4{r+>~ybO`ta8eY$Cb`BDkFbb95!BM4tyLQJDY39iXz;!oh07 z7qkx0rjd4U@89bYM~Ixuyuu?lZp$2RZY6**6*pQLSqea;%$ckUl{E$3_0)nMc|8AH zpWFAatUOwTXHORMi}T9jwT)Fz0#yBwqX7Viqvn^026;rX!PoUXMtE&<8L$%4QBTOkpiQC z%1XN4aPAyU@z3gs4S?9EMmt{3hF{OWcx}||x7%p<>DE}Wq#t3Eu-ys6LNZ0eySXgZ*xkMu`Ev#1 zyLEPJ2lm62U9}t3)mie7JEoalbx|h`^e@~b@z*24=AFEJc6c=L4M3;hV)FapFC3&b zV&8Rg-+^FudFK-TzcW905ZyVuq9wZoQQN+OBzmXy?-yFI!`N2ZNhVcVN|<@pq4$F1S=NODnJ%pZjqRwmC0cZk7Ry=v zgbs5@b$Pa?vVoPJ9h=8fpK3Cp363A~N z60RNShKhk;V_j;LE;T@E3_xqr6jsYyo9$S@M+WQOzck+N!t<>GZFPmD;MN67rmHU- z#r8~B=krD9+BN8P+5o#NJQ$2%Vv!RX=sL@~eNhcs4~*AOHZb7cY66g+*uFG$NcYzP z{r%iiSpHxT;tc97bXTk~F1Ad<_b@Eg%2g$kEXi4{Qj3;VnW!BH758kP+yrD zxunspo4#YkW@5uR!?V;vuP30Sav>ZmjZ!-}r?*tH>O!$41FajNrzWs&&=2o;;G*yR z2Q+vwV|@7P+3VuR$(T+-n}q3$r*9?{@?lh%S%H-oFcJy^5Y)xUpSLYOK6*NxMm?K+ zv(Vd^|M6D+2LJ&7|BB_(CQXwuSQD)A2XcKLXn+yL;as2%gs|+BTAY|?3@qxDs=!?t zAfvb>EeAAVqm)~m2%>UQGK&j93}B}cR5&Z8q(QhT;4x;U)RHvgRG?0ni5Z#c8R-Q@ z#UQy7ut8-N5HbZqfyL5`p&TO!4K}hEm^C0abgs}N5q#Jl*!!~NyKX^3mB4Y0OE)&ePCz$@l~t#mGJ zoN~tCwL-|2`8bBS`3Lz1LsW1Y8bB|FF$1rr1Crpw8(`~hkV-ZeH=hvDG^&D)je?4em$+c5ZD0xv(G`HINtmP&(Ck`k zWWPZadin&88z%yj8Ie0GG0nuk&J0sMI0b^w0tAwV;OpAKlM-C8HLZx1 zli-uObHOWw5p^wS?SHO5=t7VT&@l#}1-YO`PYC&yF~|^VR>lAT00960tX)fM+dvS$ z=U1pbIl&eC&`K+V51}>1;Iaz?tL6Hhd)=u@A8Pqava!Jg$t*+eEyElp;v5ID}Rt4h^XO_geGIs*86 zmvD=!u9WI>Yh~R?FpI0Qkp{dB-6a(VNnR5lM*86}&D+B>GQd?Y?Zn0EAJ#f^@Fu@#{XNY!}R82k?e84A3xm(y1W zY&bDqQIeKBA2vH~BLcF1CxcpscO*hY;`$T{+<5B>SAp{L3fn_>r|Sn4wC}NJ7tLKj zkm&k*TB>PxZwL=Az9yJ+%3dEjOdde%eSq{yOuZ-=yR62jg#G%$t-J-|io?3E<73O&9(!&V;-&M1Gfqxt@ zcz(CM=b*>`=2gj7witO=t7EUD#tGtJ7ve3EBQ-kr zRzj_9nyR$R<2aFZri`e%bZjMz*Rdrq{*EDGQ$pFMkGCl88+GOn00030|EwL$Qrj@_ zY`(%XJ#gSrN3o4VZXIZcX@_)pOndX#j?83;Lxuz>{rc`pejz0p=n2KFRx4>GtycT+ z-nCq|FO?&2>nb^Dfz-TVTTQLrUTHE%rcAmy=C0+b=di1i$|QS5s|2pvN8!rch9CmaF z{Ff9MjdnjsPT}x_`*Yt<@KpuFF0XgLb4Rwnt4#MWUfTN1>dkT|59+smLuAN~7@=P9= z<*ru(7wRoH16MV=Ab>Qf;D!KyBDo=m78QZ^*c1)!=%}ek)7$Iw##1Q{@ln0Lx%L}K z*C5EmValmw*dL`y3!0KPA6vn~*z-KH&3kSFG4RvcugTRJ`QpQ27Kf-AsFejw4(hWh zR_6JQ5cG~}e#f|zZXS|!VF{Ak*pNKK45vsk6olljsM=m>km2UWEYKtB#U#RScNwa| zfb5Kc9|=GCE!%`NmG=%nfu%MM{N373({w@6^$C`W0{jDt9C4xp{Y3e40Tv1Zd5b~B zF3!xY3-3MqEC1nTAv8+OJ5%$nuK5j)jOE*^cli0Zsaf;DW1k6RC=PKtr!BVFI8$h^ zW7KL+?r{EBXnH71ril!`nWk&BCdVvM(2YYfFChO;VN}~x0~RyYyW_D=cs{>3fwk7= z$C$89KpL)qYjVj1_LmR!i_a6|G4}D%fCh`j+B6RBthnt_jpSNc8qd48$BC(ZCt_bdSB)W6IY4`KvJ{-RHG(BY;9yH~YjA2JG_ zK=Mi^7P8Ils&-dIA!uKAO{%}t#r|=VFsimtMAziK#&t(iNSekD6fGbT_7*nqMrQLL zpXQh$o4q@6EMCYlTl9A-@ekq{H*xsT+q!+fM->h@$R`yK_sy&#Zk(eHWJUpVTZ_z6 zwX#>GNRzXo71+dups*tl`&?GQnAITKAVYFpI9@-eFmH(DOIF-dG~teZ$AX|T2&x7_ z7oso_MF+z0?+1zLVz5%v1+kLTTSo}OYlujaEoSqiTB7<$^#!yrrbW0abg^=yXg6HB z8g{URwfU;oe7kiAo;D4Iiv|ld-4TWOKL7v#|Nrb=ZFAb#75?n}3Qaqc2{k4NA%x<|PQ5lwn0n(Kn@zXv>@Y$v zHeCXYz=^ZF{qMccIp^wL31MU6w%g8rF-Azb@8|tI$EI}WCzo#qAm*Ur7DZs9{&STu zR^++I33Se*B)U4;jN7ca{*X*|WD)u@$9#;K^>34^sIFU&!LbFcU}G)5l)XO{Lv^-s z(*J)B>b84LH&lz{DpuOwvP%EUT=dJ?=nj1JVMgi{ob(A;=`Or<2WI*kH~rOc(|S_= zTzSHi#a)Vc0SBH>=+Bk>Vykp~BuX}`g$JsQUab*&(Ll-a-Fi*h8 zXplC+@ap!$MgQeMBkcJ5hOOeitWjencUY$B*vKu1Sco= z>eGVjJuoy5nd7g9Z>|P!-j`sa5N7y_YU~m||9rhf+8oC8;0w)O`8MO zo>1wLRXR&!C9Mi0z^$*m&T$=}2%b?|h}>zm+#<_X>H4^G=bHH_esW%@?HV_1M^L-d zjlf8vNeCBXzn%J>AnT^xB*=ou?f3d==yzh@@RpyV$zrBB>bvOrvtljswKZ2?{}|;T zHj{c0_JB-H{}rN?H6m?;Vk@$?dh{ zhF&LRngR!6o?at!3&)(`M2Uu0TF}6U26XI(lc9B{IyX-zO+4VxGd@L3^wIK^6bhXC z)eWC|_G=-wn%#r&D2~^&)fg=_DA1?e3k{D->0C;U5%b|5sE4@yN@g)yp^g(M z;cCH%gj1lFphcvKM@f>~^%<>BQHSn%qtd?lWff0176#Wi`CVV6{&J0bphW8w>BTi5 z3sW^$=}Y#T6D3x3@+D@is3D20eoF7rzmzLX64u`Bd@js(?u^c_&_`1CjE}UbW`JDI z4VbhY0V6F=Pi46sRIA=oMak{<$blyZCr>JB@nd7u;eoU8uPEk8{1-x4A z2``|a)r_NH5%D{-phF2=PYq|D%z*02)qb!Qxq|1g*q)0Cnx`Zx04+Sz z@ViAuyJ`V8n^lwaV=ApJ^0$_fmU*hjWX7{?uEZD4*qO^^zF6i{92pKM7%M3WP#NRp zO_CFe6z~T)<<#tQ5~g^sYcx;n9rmOzGVNuD+kB1SAC3T!jf@KIx)(fURIq)RmA4Sj z7zd1y5I2KsSrQXzuSh}D$kC`eS}Un0se+Udse5V};vQdi-<$Ye$LsV^lB46f-UKPe zUeFDCu{-H!?S40i1F!cm)~3PNY_;OHVkSx8`~4lTHoF8=*!?1`&Hp|`rt>rqnS!*b z*xgP{64^795CDlsv5Q|h#HIuj5%;homE?l#q|8$~sT(U%MeU>{n1pedRZ9m}9xTNw z>5GKw*bTA0@DUQIW0iTm5NVO@t%%+EgZk41-0=+S6{jTHiSZPi6*bZr><0&2U*OV} zuS<6z4CrF4D316$VMJ$mpl|cVnrbGXj$XtQC=`bvf{~F}P$~<>KVQ$7ck>@Z`(M-v z90Ya5!r@<1U8#-ZsF+JLy_0YxV=vmV9gDhB(jBHd=+kKq`oR}Ww**&V9GsmwhHTTY zXP2h?*yJ?}o*4@Uu_6o*!*7>`YJEGGvGOdhYUdO;?K-RC3o&Uwh-bS^SURM9myN<#W=zn8;!?D`YYymPAl(iGQxuJ*bYP1$8dAA0>lat82OpL4j$N&Oc7` z#hh>_980ZJlM~Yx73@{@{o}C&*8|n|u-j*ym4ak(Qot&7?mteAnwv(EbV_N;`0d$I zMWmG{BE>ywXTki=Vaqj(h(c2Y7Z`DmEwC6$t9?x&ut#6v3y&cP_@oCx)1w6It)0?v zG9U#QXeB<}d7-yX6KLeCv{63S+;C;VKnrqOw|`pjxHLP5+h>RH&K?;3;eBmV|Ky&Z ziy9dZQS+>pn(s-^51rBq7UAlOXA1@p_MQ^=fOtVuj>=c&winOSyJqcaY0|JwBYTp@ z!~0_EYlG?!tr%HoUMxuK!W;$>meL(bR3X?w8&ZfvQ>_Eu}s${V|dlpLv(VFZFp zX4Gr%S(!E!&EJ?^lRwYS$xg&8<>I^vys8EpX_(AKsCAz*g z$Y@)XdP_1R$%-vkMr69Ca;#MCR%3meA5jb^S$_l)P6P8{e!WpBTRTGiCg9ptv1@L7HazI->stOLZiX9Hq#i2N=ZMzx6 z@4@1EDF%8}j89e)v(yHqC7)i47pvvi^0WH+??>(rEeei7j@y=9 z-(ab>O+hpK@rXIqlm{su^m+6Zpizsg7L8iX_n6wXBG4Q?f~#(s%AGl}o=jL&&PMNx zO4%qHw>(-ej*wX8%om>up%qiuHZ%BIwvNbqU2?PVhs+o!XBA|lrWzY8tO#}@s2yan zyiIjMG_{k>|rr+T9nb^9*1A@ z3X4)4XwxWYbBm14V($|PhWxSA3JgdnlJp>Se5y;f2Vsoz;A)o*M&pyS zv&-?x<(sP}mJgMk)kkwvJW~C@KaK6Wt=w_+6(3M`TdCn39H=w%r;E$e!P)riukTL2 z8J=1OltuxlSpa4}mMZNjch{th-a8b+zQ3q+9YAvj5IJfe*gouI?D{fPOE@z`q+zsU90TFgpEud@>r3z7>ziSdm7# zK=1^URC|MMyuSbF?9(OzEiMNC&BfVw=YtI)sBvb2LSMYBu!5HNmzv)_W_Q226}y7bpw-A^k_-rXAqXgfDT06=S<`;XXsNk02hO)xfJfs=FWgBm`GxuRK-nId;M>TRK|0!q1GS*3xUP5H#= zuC;W~DH+d7txFRW#!#c)nN|;XZgs=6#3U-7Mbi&siYZ(P0HZZ0Vi7As4D$3E0UNoP z2S~+3@I#HYN{4{aX`aR}4Q!PaAGZ0UY=AI!{f-}Yyk4v2#_1%Cy^hs0iRs;!B(x!qx;NgjeFaxv{es|`>Mstsk2#GtZ?u>%69)|t@>43s~)|0B})}8 z-Vg|=a6YAp$yGr)kTnG~fq|0)l8`Zqy(RC{elaW`HC2gmr$0sG>gg5BHEyRzLZtfa zGtWxz)R~@hP(1APs6)(BY5``A;EUlDo z3krFb)W}ZSIK~FJUeX3|Qo}FH0u(50OIqBymS@?EU10xx_uP?si<~CinlBDT@{T-8 z$0Pahj$SBUN#@lmjieAt(LQDiUx%uZ5Ww2i2&nOJmmvPWff9e`S}(#LWG5$GY3_3z z3HyMFF`k}%%@}%jCMG+dpy*I0=@Ei0F{$rn;wmK<7=~X@oMUP`2;TWchFSEu@i&qj z*p{kl{ZYKU9RC^c$>C&gmN{q`ht276b8=L7T|Yc&9yP+F;x_4C5_u(kFPmT0W75sX z^s3@l7Cd~Np!T!EJpc*cv#nnn5@eKi@qc6fA7Gexpx_Et2RH4HzA(7aYX4{7pqm)y7^vGITDuh z#er2oly`_*mFHeoO3%o{WX}y;Gxo)#jKR$UiZ5%dPp(P&1_vo)Y4~*iWeMlP2 z_B<>?Dm9uke0wpk^h@3&VY)lpp;DObY*hQ$n?!oelhTv}=uZ8Vk^ zQOd+lz^p_z+{X~R0TXe4$(Xh%HbRuM`}!RB0yD&ISYQ->SCiwfn=1&Zyh&tKO*Jdp|g%=^y?UwZuiX zWl~Qh4ts`y+*!uHuy4aVg^(1of=~imV`6gck!YZZs1?vwN>kd@X z^DyZ|y`pk{k-GGYa=7oaGD|vLxPDs9Lg_ps(8f)cdrV}lM&(;_QBccgBraRTe({s zb2d8lSrhB*HJ>~AeB}y3@}VJ_J62ByNw_^`efIKjcCQLe8FX>hS-D?sT(bX*aoIv^ z?`5nOv0WEiTex$(98v>Fr-yoBk&kMRIgc05Hj7vI$k{msj-CSIMDSMnAT@{1!G>jY z&|`Q^b2YqY|E9|yFNZ%IU+xr5l3smiKPc6qGk>Hq6>HRPOslh-#ukwXsl2*b5u-6& zn?^mi?dxDub;DhQY$0^gg_*wC+i-+oeZ+ReBKw+;fs;n!SrpixYCcjk6${d{zZ#HV z4alzsgd{41)%4jD`7=w22PZ45$?|=&&^8RKm@v=et*myduA{|q zc?1(PnG>2KM%Ie71scb8v~mEet$S#qvhRAmvjFId?-#$o??$~{0r`FI+QCR@0=CC_m`0wL zWN9v(6caJ_V$~2YEh|V_;%VqZoG@P;B` zXn*a~H-qc5(|B-vaTOomoLwD@PQAH$4Hn9wBBpwUB&a9zLuN1lc#3cTCCPn+QGTS| z?jDVH_i3@3t9vSuZPf65+`;;rOkbveu>wEr`$-;}X4vmLX=vqEvV+~*8GSd4k5wk9 zM5pwat|zPU96b#{lUZurk^oeS8Nl~w*qpjhu%jq2zMN!0qBE^l3uXVlnB))z{^O*0 zfKS7(4=?4gWc-D6yU5sSA>`a8PuTa_#lwzo`Gtp$Zz6?N%g)Yj;;1}j-jK9cmc^Ro~hhI+Pbg+IarOx1^W z@d?U_DPSgLlJCCJ4K_Id86`eHy(t;55{EFJt!a0mMnkl#C}%rv>1OdB+9dc;sQ)I<0EX_2OvzJgDifO{tvDa;UT{At~AD zt@^fX|FX15C7Bvq1Ddu;C)kvbiUQTE3aXZeQf4K#6?#JBaT3!USy^Za&DpkEWmX%J zn)qrffG!dkm@MG~!J@5xyBPT@kk?$o2vAFyn&`u>bcd!QV>`y5Lz{8zp0F$+wWs6B zY{<%-l~NBf$X0D!2%y`zx&7o+1&OymMfHG^)UwL%9&7CGNmvV7_7%=RMWx&Vl?F#A zJk(P0uk)rnR2JWX^df9{zwwNA9P7MpmuwD`dUtkv7yop2bMfkD%zQ5dL_HR?%DvB9 zHNJV-$Lf7SCEVWQ4LV1#dU*<~H^jZ3hhoLP{e6vQYo*+d7c%qA*B; zBX{`@FnENXkseeQ+d=DQ?}4`CbI)-@H;-&Par&9-xsIRsqdc{F<|k3$r2QxZXoNqQ zDAcBOY5tKDZ6pev!0vpRD)jU+z8OL|U3_~+?~9vN*(8=e%{-oD8ZpzeDpveGB3}Mu zrM#axn&@Lr_>wX_K%y6x*%d)s0~gy0(6Vi!yKcfJqODjJAedhC-fcuO!G?hNDx@-Z zo$~lX%|kU;HiWtptfMg;_%A6-n@nvE;_muRMH7lr4~V#fq#W}T2MIi&c{UshEWe4;p)jBho$31I>CXpsq=vFz^Q0?=~S-W%C#rz;1-$>4BDk1 zu!w4Y=FhP|#poAXT{!B(RTrMR@YO|t{rN@=@iYM>C_&RRY*zp8H2%Ad{~i(1Ga_yp zqa-UQMtQwA=EfkubXhf7e-P|Pw+y<~I&X&dX5U?;K6R=s@F5=*ON|}D(9N8fIKH?Y z4vtS$qO&Nps5$74}Q~?b!z@Y|l2-2SJ!Xay( z^?+3gJ3dj0CYt~Fu}H02=xzSicrlOPL$Lp|X1UpV3a|`V z0t~3%*>`Bg3Qf0jHp%Zhr@ze9`yRlSbAMtl2s=QMm zt+o?66ucL?|K(w;W;?13hJG0skq-S8X2jy~P?ze`6^xVGOlwnP{{sL3|Nrb=>u(x4 z5dWP16;@B`g+M6pu%W3$%cjYRLIm_4s-o4xE*B&M5s$W9mH++bVSBy1hS0}J_knyM zupWE;9M6o$zY)h%6Xi27FgnZzZt%QeP+(qIKyN zy-pWHk_qf$6x7I7!xuN#uFSX{W{*?{#ls#ZG05X|nv#L4!=N-S7egnXFO7!2oiRLSs*)A2L|Rvax_SkLe&UWpg@{UcG`Hbgf2aF>Zd zFnM`WRJn@_Lx0t%mtSFZ$Gc|F<()l}i&_>WF)w#_4lfK94+Yc{59ENW>yGQaaWA_) zm+=~UZoB)I?gZ~5h)TtJ<9nd=)G~m&=pBRf&^tLl(+O$;)WcD^R6aWkFpi90Dpc$K zaGYKMmI9*LZ%LGa$j>MaxjdQ0$^K0E>(x9mUr#XLVrcg|S>r(f2u%L;v%f){JVmXdXr#V14jkoP)zt3T42$CG;8V&ArTrPQkV0f^= zTls%`YfRzm+ck$H`Z{wAG)C3&~q_^5)9H&As zs;|kcr$>t4(4bgTt=W!{{v%ZXHcyiTTA?d&`kEd!wr5z+-~*2V6S?&Btn9dkSwhsp z3pQS5vH!B!hON$z_NJngv89z;YI32glE{;KLsmys`j(<}v`{o|92YVX2ufleh~w74 zyK45YG7?ImfLQriN17^rd?}{h_q*Hc|MmX5^(VcWe;J^5DSE`UQq=D{AGoqe{|oue zj*~gmN>JdJxEfwvSXR6Ngc+g!=t&Q6yJ-(#Yl)`5UXaN2%+09N#XYF`EkI2XI1|FL zR*SV-P%90;4XCM7BhYjFr$r~yvb-^Y#;cnzi@$RQMz=x1!+AoRCAErqU$--$&|`19 z-9dlQYu-RZZ=Pu^6ha8W-8--O5S9R}D6g22m6pV;h;kZ`uwbJzWezigey$FAMh_bW z31pUld2&Wh`c0aL)MxBjGFvK+l3%PQ_@E&JdXRCbTB#?7!07y+C$tXdbI^Jhpc+BV z@=4t;nYvSU-66WZh!ym-eiNt9sNmdj#7WxdY;A~vP9_4Ba6q0KYt@yr0{1a#hj=5y zCQSzm9B73ivpVue=QWpN#_U&_dg3VY{!69*hDIHG)jff&Bv!j)IOx?%_H8{fwYe(j% zq8M?D%r!YCk$~J-9_P$z;fOrBPT5InjRaUAMe9&AyvPLR2`2QzIHf z9AQ_UUPiJ845&vkV0wGMH4vUav|h~7_edC~E2(wMiw8oj+;{C>7k7Z=W=VKn(DDpf z-~^(FS`trRW8gR7VUZ9c%U62)wmgt7L$Fk7BbWBCAMbLx>i+L`K<&|%vP-nP%~nP? zgp@=A{8pmQ4|kDKbu=~NsX{iUPni^}@XP86l6d#-V^rM9$UvZ0Q~N0{HjSnoNgvcR zcW4qeljzObc>obD8@6z07NfcnUu{WyUl|M>$0=2vTE%*0aBJ}<*o?-S8Q}RHZG5;v z=(FH$t_z2Ifrop6hkJof+zX^5lR4pT6&ri81>~>89f|w0hSE5!_$9}wkG_R9;0sLV zKz{#OX{+n=mAgE&1}`vlFTE?b*>Zb*!_V5PB`7b-DxBOn7{1ytixt z`?LSDU#ySoXLZNlbByDxzg#@9{sZeju>Sx2N_f)G{Rs>TzC3O~?ZOVy*bDk1?r{y- zaXYa{1TM`(wXBAR4goiT&#_TAdlwrqe>0b_rMt^z}OQRnNuYm(ivWXbT|BG zqU9@XgynAyV~o8t<)E>6xgB9b&x;MTI&|i5{;RIoS1}pM%`4P z!YYPOL`gQ4_5J-O3c}8gl?Kv!qGpB~m#$aJGdpsXmIkqB%7)VEw%oQ0`wUKnwPs&z z5a}YT{^U<5fxNo?zyzTFDRo6mR}ms~+YB!V`ppt5I-7F{ThAZS1(;xhfwrfc9GfsI z41``OGtB7jL5Z-Xxf5U+PW&mUPLBj?AI(AK#sD3DI+Y-L40|0RL@WCmh08U9C0!Da zSgtgX@>1G=P_AGH>-&4y8#t~!Isz}_xXY871VWaD#Ss00C}caFbeE4NhKlq~!-RZI z^#e!r^%xg?GTRMzpKQ7Xjy_4UuY6D)`(de23x>M^Nw>bnlod)!R?x79$!TkIrWee2 z5#B*>WCzjVAUYgGhuxwBpBQ>*eMKjn=D_vZE$<4Fq}zcdN#f1WHm^cwr?wUz7wIP| zp_WBETDw$FbN$9ZJ*CqO2G^zt%rVyrHuu^bT39&IZXWt}(!cDT-%r9Y5XYbOub6LY z+_Gh`A8IgBh#^5j!1rap2#b;>WWj&m-u2pzu0s>|=3aoX(r)dp{jPV%=f{*Jv7VB6 zxl*@8rIX#ZebK%ap7`;xNZ8=gEl!f_=Ki&e1~oKd10wPS%y8C8Rqag83Q0=9j@ zn`BN3CG3R0rmbHHH$c!>S1p=KWQc+^tkd6MoJeQ$ss%tX8+FTUu|>4N~7vQf7kB|_HssYXpjF^Z`i35 zWMMq^{IhyP-$ox|<88j$3`%2A8iUgK?@D8dfTS*^VJX4_K|_BL6F8-5m4tFc?384Q zpL%xg2A1V|+sqE*Aj$MHLajkFnQ8=tjRL}JJf$z<2nt8ui1lW5#3ykIiR>z2+}>S? zuvK2NnHj<}I0!zCQ!leJK@bzUsk#6Z0wpJTon}hXKo?0YGQ1s#GZ0$_5dgW3$NIu2 zw8X->cq21m!}ARQ0RR8&UF&b-L=gW>{|ci!kw%Rzd;Ja+i7N#K>8{nK0wGZqdu_Mo z(l}=)g-Un)?aa)sA4wc1=>;U9pW^tjyB_b(YiE8#L&D@-92V8&0|tzH)eCqtni`7m zEFTADp>oG}T*C@nP4j%qO_JCO?RIgx)G zikKZB&p<1^6u|G|*}UtseyT*4=5-0PV<)B)+uYR+-Hmalhpm*nX64yg+;R}?Pv@>gH1{y!rgSP}a_4)ByVB?1m z>jae{b{|&&ZA74O1JVW|ZW^#Q9l$g!=Dr_!++rb15+g8}iGVVR<*-2a4L$Hf7adcp zz%<JR6C0}Qj)1U_GBWGT;eH@3z6v};YX>S{7oZy^81UcYm)r+ z+40p|u+^>y%~LDJWJ>qBlZlxlprf1qim>jaT& zN0HIt72CpkH*YljZ}{#meo%GQbn9lV%dtr(UFN|PS?g0>ZgPvZ@~CMV3qlrp0e5(p zF}P(Kb@<+%=h0Tjz!PUzr?27D=3HrvI-qca(jSF^Z--`VBs>Zu&$cYvw3y|%u@&k( zvXVWGQ7qO%#;ApuuQnK?Y|R)IfRMijITrLDDj5(rPbm&B2g80QoMRe7+O`6XRpt(& zw6-9_A?#=qPEVa?0vN7@x2ju!J`g-9$D4<);|}XlrMJ@zfu5BNo@|T@EEBX$dpN!g zc?3n)JDlNW*fAJbSkr(r-?YQfcT8J%Ldy+IH#8$7ahd1atj%!Sf<#%NPimS0vd4CP zFc0@fqQr6_nA-_Igzhe356W*4{}FRohy0!TD4-32VD&kwTpwfpu1X=eS@;{FST5D6 z&x*lI%*ab;N^8A(^#y_Y!4-oNYO#wjy;U(e0ZXc5mMnQw$#aDJ9~3=#q_)qK;c3;} zT2rw6w)QnpS|`QQ5U?FNij)0E(b54f{R#v0<*@*?6#NfKR6{)*2GiZZGtEfnmT$XW z9LBEhupo|2$I(5*j3c{V_HWX6U`!~N*(`fdzM9S+4AanC-B7@~-@rXEgUlf_s)c`| z+vUQ)1z!6w1O=1acrlKrm@V=&TNId@OOC*RT|c{a29 z^|E=jxW)OwTxL78ua-{dIS`YhzZ|-_!63F=qbNwksx9oKyrQI&b1R1GOjVeL5A1@<25Dt{CeKlm#M# zszT6rSh{g4J~u@i&C%6}D1HQ90#uFC3VOPCyonHBD1W;BWpaqYjOHSkOaL=I%6PI6 z3xeq?Q|^OD0w4%vL9prKKE(Nu0G*PAKu1M&vWf_@@-d4FegQe^VQ|j zGBd@TB-Fu{Nm+jv1VCS2A~3&ZdG;U_0VKEHW2x*DH47P9U$7%#D7T%)2El9KT0d;%OV%{f>|na zOfV@#9X_x{;KL%Q!}#px&E?yRv-9!z;_dk6?BdOL{X;{1|F`hZ)q@g8kQ$`$H5QHP z5T(?TkYdOb*JORM6-u2RMh4wfW7kiXYl#_7;@f_dXj)|3pyBA2w_^9UJS;P?)-QB4SM73ltAMlmWLFWK7yHz}d2y%`I4%M6xH15MK!3m4EKTC~$}uSGpmdWe zDv^~@)fO7&DKZ(AsAklMjI`2nLXn!!Kxw5Ty1}aN6)@w~6{o&p*N0C1s9T@)>O-Ge zsmG!>#?=^@!Rm%kjkeXhcLguhd8V=jFDydItM4`&Pg;mU+J2>RY#&LYy*x&BM-^*T zm41r;0BG57Xy?^~=8-g($c$oCxxr+fh~4?k@lU0RR8wU3+iaI1>Lm_bGG+cGqrfub#G)v_;c4+2*cE7O}J4+qMuW ziAt0zvQLVWrhEDBH!~zcFP-&k_>b#N=I2u5}sr!k1>U!%G8x)2qI}L3&Iq5YrL;i z1Q$e2@TFQ6{A|<(S0s`p_7NTlBbCsca(dELf}H7g&ZY-$r>}KtOsOM^uOiVwc~ITE zvfiG|0wBGc2T4x4FHClfS|SNm&JmUh(^FL~9m+ge$FtkM_K(BK@1Wfo{y$m9e9~bH zpm-|a=g{V{U1pS1{>!Qnp$rzRv{|+jTiw@wBs$P1juw0o<0-!2C9+CL#MDO5j%UDa z(8^q$@}w2R4n{}QWb<(PLUl{cTBA5RGI&An+gqs!OO#z1dActMT&HlQeG`u67cul8 zQNsTX7QjU|XK3JxG)m>SarDq=p#Fd1z%A`DLVr?_f+9|EE^T0c$;hnEUommR6v1ks zW7P6xgTFDCMJXO6#Z0WF%lW`+2quktO2={o=DJ}NdU(1%)I&WUTi!Yyt64`=JZau< z16-~MB|^|5R$t=+YY>&)uRtf=q?~;ls`6QyqtW(d&gXMPRgT1$XW<=e4+WW?`qc7% z39WZNr!v()#L(QU z=OxEtUtpK*HS?2~8Q_~~%dz5v(~~3r<>9FeL1`wZZ%sPimP}MG`EAX{Ea319)VN-) zBk*kjywoyrW5Yzx>$>#xsW#fJm0U^I-e|-kQ_X;i2?3y2@5Y)$_+=RDn>@LuSs@PM zvZ7*-CgQdfd(`cg{dv^W!~pa*_N!Tq8n`7ZRJHb6bK|e8y)px^+`BSw=$BBdGUR`* zjQQ3V4;7Vxg=U!x_0B##Ejm_zYB>z{Zp(|;PX8y`c=y3i|EDoXl|uI|Q)~_906dN3 zKrG>>YavwdjNylG~fT_#mVt+{sC;#K4=xco=taGC-40# zZbYqZjcM|Y?Gu$exQW~C>uY<%jBTOa=L@VS-S9*vK(pjE>X8ndISGcjoxAf&1XxgA!u7-!8li1OW z@s4inn6`2f8_G${(|AYQXE|t-pw%S>2K86$&;qGUI5L5@?XX@I=Z{QNgqHVUaZaJu z0xyncN+qiyX?Am;ZhoS?!b1cV7JfXL+CjXQ!az`KmM0l-eyMiI1{Olh4S2{F5-dzO zM}?wsjX8M9+j~n4hLCdSbLgow>SO-13NIhr_skfNOB zU(8YphfxQ{%9}Vd?#g2Z;Gvbf{y$+mU#Qr0Jnn z1Zr5r6-w5pYDX&=b&9aBd3FvokStpkR4P`PiBO#pgP~7FfhSAmvg9EH&3Heg{Cl`F z43>}R?=f>R9hq9fUxFrRID~&`{spX19!m9|NJC!&EVNUsK_Do!^(QUM zucHN)tWaaHbuV6jFED8eUV}+XBZ-~%9bh~^n?zqpRm_g9AT%v|WN<6?;t_~b+%?Bz z!|_}@V0vV72Xh&Jja2mp*eOa?hOQY7#@<=u6|t(YJbee)6c510*me?h|md41v+sTYnK<5$h((>nM~oanN*GLW)#;1qn|0Shs+;I-;EKarHGP( z4%#4xs>(B$;$66_$yjLkS&NIyIU**JPez2`rYzuTMcmoTSbA3^rME`BT|;1V!bW8% zl;wFMke{)Q#~|rwFVZBwM&C)h-1Gt@(OIFL{Pc2`aS-VqhjgJvhm}H;YaRpbUMDZs&n2)T;3`4gma;dm| zr1#HP{0jaCnB&Z_hLcKIf7@+k=5s;uQQRoq+wHt;DgDh{NT6Lxy9{JRE|L<6j zj7r`L)AKml`XP7v9x#c^i!J%eKMV`_In4R$1(*+8?EE7600s0u78)3&58uE{5O2Lm z&M(m0LSv`IjUe2z`+E0>+^~D}d>B4?V(ci}Ejo*!aLNb3@YT+|?mP&MAFK@cTT95s zZAHkj;aYrTj>F;5G)*>&xM#4>5VBcK3n8125FtGxq*o>6WO@pJ4<@9jc0D1*{Z>NS zijeY^OF~vIXad9vBY;s7gc=!{Z_xyLg-!;+q;Bv%HAW;TR!EyEjH(daB#Wt4p^+eV z!!ZnOkn{7T5Jn>CafbN;W#+_otlD~?D!x%YDq;gzF z=E1hc)1IGkF=o21V@ECvopG#39JFM?<~w4jCv>bG<2=M0WN0Kg#AFLp>%=fSy63*{^w#Z7 zd(j1Kq&cS6_=Dl@#5CTL;f~_aVVE6Y6r0dJhcknX9n-V| z+Xi`3AIDbYZjNqUMzjuxf#sOYGspTvqFV(rpX4TA9ozap6M(6GzmQ20eThp?JAyS@ zX*Z+bhZJ3YDBd)Bu_4kDN9pH!Xe(K3TCXeWhNfY~dJqD2ttik#FOK2{b=%7ea<|_T z(CuS9PJ|ya-wZ;F%Kp?+LSVLam==*AEaKrjPi_cI1-|hcO<=w4u6-zk$&xMR%jZx{ zSkK0~KhC4UQ@DY=u_r;_#L4B^t(say(+qykvRjr%MXB4hD?sdehPnd(2&z_gj!EbL zt=>cR`7uUc_d!cR5n*5|;5xeO-?9(9^>L%G9h^<~fA@bqJ^XENx-T(!L5L(cIAf%; z*RLN|slHCGm30$YmKrf=Y?P9NUfDKeiRr7;{k@m|WPb|clh&O_eO1N>uI>wO{E`@? zJ4vPa;RC;|-uC+N`3vac$@6`9m7GV^r@m(OmzS=48a9L~p&sWT`zIL}m$1WioW|2d zCSfEa(e?iV00960>|I-L+cp$_&VGfEheEEcMt4iuiebpQp;)>M35IP50zsmr)|+pz z>_kP^|K4*UY0B4Z+1~OH#1bh|Iy@xL<>NUkgaz@z1f{L-6w_pfCRll2kve}@Cutbe zVS))G;%Ml(UYy3e#j~v@x}w=uF)Z3Cb6?LEe|eoN2H|o+yZ-IB?9O6w#M5F$S!_=#ZGw4c?wsFcz z>MWMr_ek%d?o545swUeS3TUn{6W><~tD|Ny5hCXS@2WhiUHj(kkH6krd(1eL*}7Tw z4&-oZx!XN>)K)G(9YiV%7GL%GNsRWcgbl>EtrnF6sKUdrvS*}(;s;Cc=zEOk#e#q# z1Xxz9_k6xfA49UocQ-$QoFQ+UIh)(=0O$s)F^FfqfhDQIl{-47y>3Km!7MZ~0PiUF zR?8wdY#?#A8^_3OhAgg0wDYb1oMEbLxcHYTt@H`-G)anK?W3;h1w*&=YCOA`)P7RB zejOHJ6_+B6wb@~ZmU&FcG(!`T6(YjWgr0xyx+)q(phFX)S(Gi)XCP;ZGo&YaJ;y~Z zo$VPJ*QZ$8WPB1(S|K{e!Eu3HH!)eafkuc$HJRP>(p`h*QY2np240ln9EXjyMq2?} zMKJ%>JuEnAGC&tQnu92pk!cK|d+e|qDn!r4$}hu@>KXDj`x{%SJP387x!n>C!WiMD}2eOBbOYkr-aaI!u8eZHE{Ufui>L4}Ao&zSXl4|s#g@({>4aj36hn8^y_aIHe=aI= zOUW65X*@t*g1gqYe2y6Ht__I!K-{6p8d#WSp#plZmuR36QS&vdUzg9r% zzFFOX#f!PFgAW)b@R}PXDhyXu=a?@8qn1pqn|Hq;n=UItG?5YW0b^)RkzHp6dx58z zZ)Ao3Q>j?-`E%_&MY1wv1p4$9+McLO6sOGEudS=>`unS&FaNOqhMyOgS8slQbMdu$ zzAgzPg~0r5I^(U&vQO9Z?sUKnNpL^R)w+}jW`3(rO6$|F;>uT{kg!CRvG%9(F;&|h zLp_5-kUP{sy+B@g0bF3vvDef2-a)&Ns0pCWqN0?782B9bM`Oi7*CL$?z>4$LOUeT? zsv7qE%Sf{@jR_$CTP1Bk7R+)fZ9yv^8{SACRK&^t2@(KAw5gcPDFgQ@v<)N*deQ-j ztrxJsY&5Lh{SFM~Cfidyq|JLOO5&3k-q~V!$LcUUb@NZS z*V*LWu2oQXb@p?s)8ST4oMYUo{PjlEEX}R@&gPn} z$Z9Uryw;OR>BFcjVXQGMnQgK!Fzy3(gz%r{*I!+()WPK2sBsywa9+8uw z6YQ68oZSf_OZWs8g7mFV=9>f8c&;B}hDfzRaOtg4>F$3Z2Ytl>nozk(82Nw_DuZNL z)O8$`!Y_rufWU5==ROFM2q!H?R0kqWBB6!KcR4U9jQm9o?>+r6v%Z-$V$(%#h8DUK zOUp;=*m)S9N9mRrIiEdLi@Auy+i`Vwj?NnE;)l0nm%qHW8dMY|CX7VNyqQo~37A8T z@@YkZZ}_xsR4FE)DizKF=20~%#-RUKpc+$9FT%7*oGNyS&3^#^0RR8YU3+gExe@=n z`4mK8^ki78>`VJ_9*E<|A%*UIu+vLXTr2F;-n+G=?%J{4_QQ7`B$vCAY~@m*H5^CU z;8=77sJd3pq5-U#R^Z({4~bvC1D+j5J6wd^w<0jrY_6Mt5$YZ@s{>`nw+x6^EN;6 zBjflDe_UI=$;8>osmQA0t$HU`*;^y2EV}n3@iKip4L#HS9G@M@nZa}LZ=x$<<|Z2F zz~(5j{C7jDf>J@npH3BZsWMo{H>WDIVXExF3Dy%P_8_|rNgN}|-KO`M(YmgSb*~)q z)kei8Ubx;B=ylhU!`k%fexkdUjyRP2#0dtpH>78cyKhhq-W{qQqKAj_i&H{+0ln^J z^c|)OkVxn$cicE=RAo{{iptGI<_Xv?d6A|PlFA)h&U6~OCSj%tr&t{PO2WF5;$g#H z$e<`}MUguKc7ibFm5~G^=hXd;Gq(I_)HwSlnQj*ev?zcqRb)yI$DTVR(+!Iw5tRbQ zZNX%9uElq3xltGfK&5-J;pLK?DFcol}U_)m%tla;!GARs^%xx#lCC|&$R zCQ9s#`|iMg@S=AnwQgq;2-_8IBtov~O<6Zo;n+;B+vigqk(+U!E%7+;2V5z2%WOyX zn(s3e%;5CAOP$#ES{X&$=iz!8iQQ|6XEx+^y&*6jb(JDjB^HacO9cI(xt6^%sk;Wb z!v?)D>2)$nlY;mayhXcNk(_7ElzP-`zq2lS8)RrGdN6$`GEcE>IHo{)oUtF7M4ikL z8{%LnJXk}VmVM2Nz&2Uo+D6}&cs3=xxIZFe7+-cgHHmzqi-GU1C&ElIhFaNp<6eKc z(SRvH$J|J3=-&e~scutFNdukvqPUX$1Ew1kp1p%G05dfQe3Jv-u)jQ<1&Mmm_N(UU zR%DUzTu~PAv{#T@e0NN8wJ+Tyw{@%QTLCCoP;Zbz;vi?R08qL6Qf4;b+srxBW8R0bQdJHIqq{1(6$i zu^T^+u5rmi# z^5mPIZ}07iRE&-&F2gL!od{!eWMvY>WxT~p{1cfCE|j+?B$>gGiY`bE{_msQ%s$O$ zM;}gSmw!Gx`}mg;SqRMWFCAtair0AcF5xlcGMlyrBoQrN*)ck@XGs3z&*!s?)9>e( zM?aq`>qSy?P{+AE{&{|OarDFK{PN>pPjU5l&GzCj8(1#%~cht2X)@@o@!E>15$onM^(K{lt} zr8PzksZ6Y1#}Qg#d3o)(O{dt*2y2ZKY<%LOlIMv7&-0{V(N5yhHTC3teta~W%^`nP z1JdW3Sa%KeVm#*3XBV6MPS&$-`sq5B$XxpEIM|S>=rgf4vVMxV4-zj|ckT7d zP0w-c#oZfJF71u!Rxfoc>+M`P=-%(rzRqBnG)`u<7|Kn}7BA}5rvR1O$=tvJwIvDt z+;eg}EXz2HiZHU1EK1yI9DCXCHWfZ8GTKi}4?(YVw;`C(4?Oy-Ah1A6CLRqQP7ubB z;7oMS>U2x=XNhy*_~OkRA=`8GI@(^V49Gb%o|`Bq&??*ayL6%8qvy2C_^co6h?6bO_uNDFw3F9}itXUO}M9@6sHF-j!CGwWy z+H0gLhcv7B5Qt9&`8-Khl^W6B-qAg1rHqBK)j8C{*f7iW(K%#npz@(BAG=#04|%}v z4WFor@KD&3K}mSDkG0sCx3~2%x+fV{1HoyVD)L-K4Qw|5^~f|lTcjHhYn zdXATtuW6U>z-aRQ%q^p`^rrDN2;4aH^AyJP^ZI9}b514! z+A8^J8W%h0pAPAt&Nu3x|4ZFb{P%Q63Fr=^zpYJHh_eNDw5w&4>-Nqqm%KPfZY^dK? z)ox4OkTWq`xY(}A8b=GkznYMr3^1vlDI^~hB6@f? zcN5&rR#-O|jT?xBr2^3cO4S*?G-eDApz?AoE z=5cd;BPYZ#CysmQ*h(w4l~#&21b98VY;Imj)IDF$EsA?s6ws&kE!}(=*I;JMV@-RF z*I$jy0@oxa?QZ%wfkHBKj1|mSL7jn+4I44w&K+HoaAr~|pmG?nn1~YX(&+87)V|}$ zi6s?qLzd#Az$Xc*k)YB_Lw!>AlErPiPt_#L>s$u`X@DQJ8cRF})^JSfsUkx`)(BE$u)r{-&BB9U} zG9v^gQ$%TAWl8au^o*LuhUOf1s!z!mx#T0gQYhj?Rth6`Rdpdf1tCY2wV%HDk|6C? zv%=udYpQ7RkbnY#Kyd{#9Bars)`2|*5)1^P=tmzu$^*E2(0D4wLH|}Xi=q}16-vl^ z^vb*d$smSQo$Oqr3y$+kQ70J9#dFDGAFA=-xiaV)ItJja%OmylvSvtqve21y302g# z$F^B=YzK{;*W96pgpb2CG`zy<0z-}5CrC`Np4yUor8f^P?O{S=a@pW2GpG>`V;^KH(zCflPGQ8 zN-|$YU6ah1)0!AUnV^*p)}f*yl#mJ8Dq#Qt>bYOg=ov-7=gNSc+u$^(#uZ|VT9C~9 zg^banS~a0qM^}t`A8SkHUUt2ls>K&jxUu}b_t?LCf2ZDUweu|8EbGlD=fx-@9e|Gp z8Y;f|pfZSAE(|7YP6Xqru8q1B8`yV`&Lspz$3Ml=!exP`8K*ZX5%~MQNyyizL^jLDlWlY& zO+%=LAx4kU=M+p9Dv|cPM+X(sxkz3$WE{_7 z;70=|yE3?=oJ3hDI{cs6!hO*sWL_iPsx8E;Tg0nTP_a#!?xXb%+CA~aXLc0iD8+&2 z*WH5hm0nSlap1+ao7?5oFM}v6%PjQEFizvJ^z*=(`e``aM;jwQHNMELR}clT;ff=_ zm`vO_9SmS`i3YN8lJN=`u0NK85gWsbxgm~ROsX&fmw1Sw79RDwNVv8HQm zVXukiHFDFo0->~xKXJpZ|AeJ+bMSnewh3q&*9_^VR?G{ZK=BKWYtX3!V4s4^QFva4 zi6T`ehg#f69fe}KmoJ?dEM$Nj!=2>zx8L~dg>l*+700960B08gz znK=pPO-;0b!&fic_JB1CUJOf(IV%Ktgp0 zHp{@#2TO4n)`FtU)Bt=^swuEZZ2>PfLB#=PQ2;L~pcm&ss(Oq96n-x=_A(S&r;t*N zVy%XV4tEp_(aj{K^h9+zdPqTfV@SeaO{iTY*x)D9IV$Kvu;cB_OcE`O6DzYLyI&6)b0|7R!FA_Lm0f>%^W;21EMS;ITNV|tP2@xh5F12aTS~@%rMA3a-h_t z0ot#wn`#YOUlN~@Qe>;51!mi-s8mCRR8{r0YONK(l5jy~E&W<+NNJUu4eTr{=z{J$ zcW}{!3aV%XM22|y`vGIf1{hw+$+qg?44@9=fO9;EkL>2;WN1mC4!bJ=s1nj{1FOZE zuuwGsOD}ZQ$Y}{hF#rGn|NoR-QES^U5PsjU5P{4#Q%o|_EDj`4+QIrzHs~G)B2gSx z7D|Xx+MnP1?j&1QT+*3>W1pnnoj%*AlkS8p%-$9r$-5O*&+l?2aR6tD#y-ou7m|tV(OMrRAL#0p%Z9N`tW5O`EM)pL=UNZLg$+f{-xw8O0 zB9y%QLY}p`Glp*U=V|CNHB@;75UmhgR1_hS6-)iMK^yW%7HC`#D35fgRbVd&+U6hc zY3yT7#(3&`dfqz%D-GT{Ts6f`&4vLDD4sV6{zP7VPTy`|Jm$nbwe`2&@0Y)i&vg-Z zs;v*FxY`XH&cEd9JE8*?44K)OAu}UOtNJKp8ko|ktTyi7pKrpmYj#Z&E4$=kRKFDQ{>E$^UXKg$M%E_`-W%LUK?iz-S~2US4@WbmK#_BLdjVX4fGu~fObIx!FYnMTdh zYd32)8YeG2shxIhg>~oD-M~oMz}nXhSizk>4Bo!J1I)C0Q2URKyLN9zKM&78j&6S( zUEaX;`u*VZ{=WUk_^l|Cntfp%n1E?*&zvBQ2VGGVANuBmNhL93$Np(yNRcZ-a?n8K zUDxoQwrOp2=Hu<~-Tr2Wi24U}4JnVO1lPbJ`27BI@S$lDnn8VT8m0?2U7woo?Ut-9 zJn{QRmC>86Jw|U)x6q4y%7h9vb{oGV4MH!Ul6B(6s*E*9uiFBJ{r6BG{;USwBMa@P zaULdKB)z0i%8z{M1c96T+Lfsngt2t;F#2zxdy>BE_oe>`-Gf9`-=DTmNE;x4HR-oL z#G8!)q=cvhH*ehN76E`zCFY1gnqdsc5%#g}jGd|t_-E4)ZFYVV_7nzz4%NU0o^6^u zXWhYK|2T7H(-{stfz3J1=^8i8d#2uD?({egqR>^!lX(>6I!=>9D?f9ztG&oggBaF# z7Wj`y#}7X%+MW+xT)2_SlQ>gF{F<|(fD&fGC4SXekvV$YIfi(uy80Z6tIz&d=S%0W zKVN#bf}P3PJ}=r|ulUw;EAcJoR^soRTQy+QFb)Iwlkh)Ea;cPzaxa!RtsE7`X&huh zo@~LUuNFQ-0PLa;s(2sVH|I}?J0rXakV_4+0P1sBiT&lmI<0tL>a2& z8aaL1F-i0C!D`FhY1TX+Jex8Z2bcMHbw0IDpO43B3RqN_ z8)a!0%Meso;>KYngCzA12*}x1^g=|=wh$e|P$r)+;miv=WVYRq2+N&^YrQgg1kOwz zg%{!lIJENR=z?uf2EMhy7+b+_HunMqziJl@5zR9thE)GPnUIH zz*N0o-~lmbq|IhHQB6!A)O*(@sJ$6{9E)4eC1$P0GWKC+V@x1cg~lybW}`UGJ;Tta z4~8DE+1C9ce&Tjmbsu4=BZhX?fWeuo%VKa%?w$3bb0a}>=|@mJB;NG}HzV_DooZy< z&L0I%GRrj%;z9PFECQM3iHbu{ws|vGXAe(MgrWlXESehDS?B0pVr@_tj=;lcN89(fnkHIe8X(zgp%9T%#Ao1UrmM| zN4Hnk~)l1w~T)@maI#MttzcauvX3o8A z$u|%U{tql|YOypX0!SjmcKaQOnF&g($#`&sEX))54ul<4G@BkBt(@Mu52ZLAXY)~v zA5n|{Jc5S1+3{rG}tzUmTA)lHeC{xm?bs8K1ViMH6rX!wkZ>psaM* z&(qPFpk0sgjg&2~uo$o5eo9{26CUj2G;cnRL5`|>ExdEX6bOBQRfyXi?qDX>h#Vs2D_s+4TD9VQt z7ij}uS+16Q%+Aj2&VJwS=xk4O?e=SE<2kreq}HJNqeVE)*?D=h%o16YVp?0RqDJbP zDHu7H=~-#&#;zI00XUo>?5^*{ur7KQm_Nq0F!DdH-Bub+*VDukkrRie{3+TEgSPqC z52&~HcdEBLvitkOy)VCZuR3g3)M5L%;ssw*hwB;=F%yegZ>Y#Z@`EYZiL_kKW_M2=WVac_dw52j`)6Q1?7|ZQ_fF%FsqBLqZZ|)8|YOd^V@)rED)9kKi%D60Catqt6Hr3&NQiEf_Qk5=0cd~(<-_oXYf zSjbc^@X}aLEZkQ&aX7CsE7$5(wXVy{26PWc-PU18`kAT^L!*=OrAu@L&nT*5)b3Oe zbX!4*Ij6;DW!ZsoFTXOn&3$B-rsdj>2fmgtQ!@ce#y28I$P|{8ByfcftBLD4uA@Lu z-b%tN28AQ1css1JAIydv!}H>k%7ualpii;{{P+9{l;>YymwyhCQCX!O@<9#~Fs*#~ ze;+s{mO?s_08=1HMc|u8q10n97!j2w$r&AMLw)|H?nh3EXDX3RnlKV3|HCqO5=@C&W_I!=nSXP*%HK0 zU5A8J+TJ5%=y_IjI=+y(VD+I=rJyFW6axrAlF81*zj+3r>P!}z0^SAdr=-6V`LTK2g5Qdn#H7vr0-)iZ#`XH$jl_p)Db!mTr&7}tc)@sZd_3%p#-q;b z)81HXYeob=&W|8{*x0E20j^}KfTQv7_p{f7({aCZ*4wRVk-gnFgVEmh(wJ{AjrpcD z`jLb$&~qS-cI?HjbQ~ktUK;c7lg7L*jTViVRU5FpIyO5n+B*xQg&@n?^9yi7N4?9@ z7z~8rdFQBCh-(4MhvNB;rIz6NP;`%KGCCgPNL0l1rwXZHAr-YY;~j-ctMzm$@s>AB zYwhX(PhJaSCW(W{4HCz)L=q=)XgjtS8+KsCcsQ6wi62NCEZ`>_GbXxkrm+bvm*-4M z)#M8}$uw^ko91fODsPb^ZUW>8uS4VtDA*D`G`-iagp;F3TO7QnttdWle{PCz+=p*i zA>%6@cTUv#36e*Gk3$4+?44Chq1)vp3m~00<8}<68)plxyse_~E#W0&$~6kO^(sih z30De6fDIZHJp}Na5HJKJ?8AiG=hmu_0uB|xu$981XmGq)#xQF5xZ5A{@pxHy5hZ}v zvKe(^x_->?zKBAgNP#vK)Pw=hK0LeVciweQPG9kE@JDV!Q!DL5%%!}=Tq4gr&R4v$ zM8=-tam|T2W}4rq7^7y{$fma2zw8dqIwyT)j=aYKzyp)XZ1%Y%R$-AS2ArC~R3*v) zq=TtzimFmzDwVFobCFL|Wcn*?vM(~6s*{c;EGW1?z*$!nD^1aoq%q_&*F;8BL8i># zSR%@lUCamzP;Qnh#>iE@?lZrR!o_5kYlC09Gdw!cevK(%ZDu`UK1D$g8EIfi>3it3 zI_R)EzF{UZa#O>AsRCJ$%N`C7dq93CbeUFl5m4wUm|B8hReu&bscHc4C@g zB5FGY^-uCh)>C=aw_5=&`zp{}v9Rb^-NRTB+^LokkP*9l(BKBSRyZ{%8tiXs^DRB) zgsHqH@R{3kmanURDh@SGoAW==!?y^>qD#G1#rRPH=T71o7=Hpc- z-31vT>(CU#s1RGEOeS6$)@C4aZGL%PZm?wtS)?~!az)G4Y*j5%GV99&gM-XKq!*bY z!Y&kA@LB*cs1O`=Xc!0I}jf&X}?#BhG+X3sWGgM`(shlD|aXq^#W@o3o z=n5%qNa^;DI~S)TI;=T)1NBqLGbzPu@Fd{l9jSlPS;eqI*;A#w{DD$dwpLNfX6>{; zUOfFDx|AET0pH_73QOr&PgL>|M#2|I-TqI6VY3#M7>vM_X9UXf`7$c(7%Ju zB6j=M4_&$@--XBsKihpD8sbgcxV_$gwHqOZ0r1(esq0Y-m-AH~CSH^(&&%8(@xYk@ zhbqe>k)u0UL}4z|G-;WK>ox8|mF#P|F7MbYX^uaq4?cImO1Dwn-$6A}R2MMrABphD zOSYmqs?UrFIdYz=dRl=01j06W&=9b_`{tZo)jD&q1cx3J^YQr?#>h4Gnj=?qupJ-D zZa0gmd!oB`1Kz%#FPIsek)MexyScKUXfSd=mCz8Eer>ZBri@!wH}?B3U7I}%WP{X@ z-XHS3+O$Y6_J$0pjx~@AnPMZ_S#9a#Oo=mN=V>qJV*#&P6DaU2H;#QVaPS(wFPsCWPm#)#mc2?!hq^s~q_5%Fk5a3Cl+5Wlr3^`GG7 zv)|Lpw;_Z04queR;dg|9$S^^kJA8(Ofp5($rrAP*cT_FXA)H!^#A zG4dIK{iVof8f(s6^7QbZrb=l*bV!~o*H>9XTMY*fv_RDGsDh|vBlmBhN>`Z!ucgAR zLtM*P;=xkhTBgzeT7|4{$ji^z$(z%YcT2?Dz<_C$9^ma*zI{D=ZTVFP8?QIE@q97q za10wZ+MdEP3ZSw(WqOA>HBH>rQ*34rt|L(E zHbZkwYaDPn-yAQNC$r1tm#4=Um-AD$kLRE-MkkYV$K`0-H&#(^%#P^WxsnX z>DG%27;4h;#SV(U$C+JpiXI0_7M`DadFV%Zp1DONxys!j^`aUP;Fw%U@in`QY08%dj%*9p5}(o8{GgdX*3N-< zpfbZrM5aH;o0T#WbVeL5p6cAFE99irc|v7-A!%w@k(6!f_0XA{g-&~YC^BrWE_xCF z!S%X(BWOjT)&^JpN|WcMBh7k~H_Mb=?i~!#B~|7&b#N_=(5&kgHNMu{*+T7k9JD8- zBmU+PS+X^#uT;&7Cfvozz#`;aR@V}A$vOMyszgBRtM$+H;qg;D#^aEA;wfJhTu33k z)GK%>l;?Uf@+42HbiKP0buN3E>4%T*$F-~6J+82%UjTz z@2UP09q-$QOKcX3<#NJ)`GvLLHctiof&*!FhqOhD%h~M1{DQ3$<{~_B2Ok*xI*PCh zUkyr}Zi}3sUXVDpm(u2*3C|jA4mh_iL_I!_L3I`$c)YQUWtIvr2IU=q zx2l4|S05SrAVD^%Xu&u~f^0w73Vqfqc)fN*2_u(3LaQSXZu$*D_x|O5*D^uttqO`N zNK$o21);FsE@+&zg`%6f*^+rYCXio>t568Lt1HwK=s_sdaAep&arAzOY-^%ZbZIC0 zxWsbN(DvNI*^zGsA870;b(qq$N_o>1qaSFvRWQ6C%J4p-kX_&3SDT~5L(mJ?b&8tj zkgo5vyep?5*c^cuJ*_q}T}{8PBdteNb3MP{=TN zJ{W2PAn<}CUx3OhyyE}C(60@K;577GFai|+dxuV=tPeeEBY>N|cFjXlBw+JgP&El$6!L2QJC*hpwae9zH%yR*~dFPTMfP6i<8PiPaV@t3W>vXD)r zpSEzx5Nykn>Y z5W`3bU5(Y~<~ZqFwQU*Tw!uxq0B^%U;oAt2TxR&q3f;%lb-jJBIXPO+h`udy9$NtW z+R@B8>GMH#?*CEhoO6iHM37`~3&HC9k;+sQrvU_HUam4X;$H4$VhrJ0qrx3WC144J z%cFFJI;RW}9{kpg?>|KcvtOlyt;Y7-*3GkeOK{!PWWbpdeU$k2M=Eix5Y^4p5PSAm zfVY3NK|-#IFex&n947&%F^m)LtEbiV6GHkr`iTa#f&~#k%wFO@y@CaoVriNzF)Irk zVudkllNY+T!4k4QM0iM6#TFOyx9`9D$BgaIF6L(+zM8O4zAeAi06g6c|M>QI-L8b( zH$7kOeTtd$o9idk3P!x1qg&lRz-I`=E8FRj*=Y2S#cefD2Sq`;7upLDfnpGMuV?uw zJJBpVd8_w9AQ8q~qkC#ImO-KG9^Zq@X~o;=bfJa)v%m>yY+mP7a1Ndwe}?tY?rLbd zD)mUcnRGg{Jod^8(kQyQ7s`l-iR1Vxbc>7!a)76MNK*fG9cuMI00030 z|D0XT3d0}_zV|6guVbZZ{C$AE#!#!ftaNmRz5ZfbS=rhRc2Xo!)Gv}R5Hr~B9$pgdX7#DXbiHqi|smlPW6Kxc4#Y89J8n@4!Mh5f0;{e>yLfX zMnLwJSycuG4uD=v#5+LhLL^rjk6tmtMJp*&DtfT-<;Z-d?f=T!U&kj?G9GeYVxTdM zW-zfgFx_u<@c*F6a~fPDg!2L^nA8D?2H=tj+zD70xC4e3vWKQ=;qP$T6Um<)(*OcA zr%>0CfpbBid2ZwB2><~9|IA%&ciK7<{=EGa-t5`E&;;W5m$tWCme7{F3ep6=z|1~9TDYc$e~X6Bi#Rjp2_t;K}d+IEHAn%+0h zDEsjYK-kJ6Z%@WQA@i~r%X$FiRpcV`c&Fe1$~ zjTuP9vrh=;Bq9N$RZNxsLPI%60e#_OOPRQ`WbGETuR=v2@s`pIx||71E1qd%Td)UY zWQ(1U)PW}@GNBuJXb}XIL`IOdTZ;IXnY5;b@>DC2SQTE#hZ=SY44ZOuUq4})N?&8x zrxB?HH6_t8;4%uI!p|6MzWQi0gb9(>Y!Kf)QwO~z0N#lML-%TpbW!^fXU4Ls3P-AH z;3lZ9?q*bWV&64wBLbx2B7use8el51<18xj=ZPT6Li}q zP^vLTxJX77%&eEMb~}nv9=M*xE#l%s#%~TM#r5?A3U$3Dq2WX0nWZGz4im%m0~M%*~;@WyWxzNKJ8?=fT?hp z&!`$0&n#WyMVaN2FotFTqd;80<9WUD0SKt@+Z&MsPdkG}CQIn{L6-1|aN3^Y)%k}? z#oYGD&o!QrVF@d^Db3l2YEjmCfM7-qVEQFWY66k2N!V|A$Th2t`1bLr9-ApU%ZGd_ z9X2wVwXIA|DUce`FZ6x?{O#$*xz;(k)ZTZ7!_LY1<@1v5r9(I;K1H1x9&i>-7E84I zU=_!`VfQWE1KRbVe}0J%^16S1(gP*!_32RSXfS2Y``wE{XQ-WB49`wS2--K|T#dLG z+fAchjyNuA6sgJhf?_J=I9vkFW%xM7E=uerh7f%)Eq{=#6l_wW7_Lr4Se;W`Xc5O& zm~mey)&KVPR>`TrVpP}s@TELO!q^xE5e+NOByWFsS-%F{IbX1~i-L9OB5|bf^v4A| zuB!}8@TiKX5CIZ|JN1iz$G1MGp*qd(m7iew<+HR4iu)LL^G;|IyUykGan*46z z{{^1dQr>dP6A0Ut20JSHmEtOjQLYQj3A)|}QUWiFQNKj?M5Z+1iY*uIyWyn$(qI(3|kKmHZ6f(LTk(KA<;#k|$zqo9#46NQ(#?bfb zwS!*tWS?3t^Hz%ve8YaLEtAl)G<5H{GGJ91YmL1tW3LI63B!{i-u--Y@m!b1bDfGe z)GtlkZfA5C7P!e_`M^cCu?G`nuik0I(F4Kj*V$ep*PHSie7Q23pik@dt4Sg=de^3o ze5xjNMS6Uo-$Ys9g(ja@IGaef2a2l;i4C+y@8tBjcU<{LNLi$1$SdDPwH0{N{`Ykn z6M^AR75wE#%!U7a&MeEdjF_28tHo`Fp{O%leK6#8V5ibdED9aouz7Bohq6?jvS=xNI7<1o zN^eS#rMJ1(Kbo&}5pN9_rL#nBH)Bol$b_RhwaoV71}0iU&-1y6=#*GLC>3uJp*JuX&~q-S#9W(JEv?a(c*8xhPr*Js=_ zc;vfo00V0JZv9AkM2Cv4JWa`Wp`4xDrsp39V)u|#%=I+!Oe5hg$exzZm=);U^OBT< zVrlE1?(x*|Y__XZyfSa@m5kR)s#6k!rEYAoz-_mK#AAW(S>}#G?CUk&FE6i`rVw`W z%yy(>cDTv~pwl$yLWYU#6*FTZ6LQfGLo9?g3Mlw=FszW1d;E+%!*7iaxACP*e7hp zBV3T91npMzwLPYs8yy z3Jxg>XMa_AC4?D()=tqdI?Sk_E-!n-;ps5!kHVu~cOc@h=|#`6cBcv#s4(C)bSga% z$Y#>bbUeQ*T@Y2wz&(9}0a)wNp!fTR{-FG_a#Q2-a&&%q*3+KCD8fvdmaMYYy-mH5 z=M9+YTA75VvwV>Y96TAdOIjMyq$Fr5=ga)oHPQ-=OW?w)`LGIsLMAU^I}|Xb+Ym)( zA7SE+K%XY$kqE#3NbqaoGLL~6V9& ztXiNBj(T;ZI8ZJIG~~Bj5lrSTuPE6Tf!%qbBm~0z0Rcf!bsSODYROR=LEqj^>T`hz zKF#Oz3?m=aJW#sP-(;Wf&f3~fcUf%ziT3yJ@QR!B82ydddL~ZUNQ51|>mf&EXgsPSS?qcw3!ZaE(k-HP3qf1C_Uqr( z&7{uraWY+Eo{KR$$KoOiAMxz3z3!z|HnrOU9!EDPGxk~R*ly~3fytAAJBe$+)@%f+ zo%-BL?}{pSE$5ZB9I@XW;1J-AXa~!=N0xK%k(Tox^&tB5Sg)l$9VUk)yb9iwC;nmt zL<}3Rym)cGynWy8ob4R`5ee=6aE!7!sUBiptw@yH3#qUVhYP?npmXfPKt`!;$D4)8 zdn#L%Bkw6ltEP`4B>jc2i1`%~cc5NN-z0;SIY!a(6_%cp-s!s@tf1jLLu-sPRI68DpKyPl-*8GkP-_dg zBK<-apH&y7<)TTi=hziGK-ry&v=lr@Mo~)fs~%w>t7CiZHZv_NNK?yBe}Im%wjBs5 zOYTZZEdIZc67TzIw4}!F5RjydJ_T3zH-!_TpNc{jxQa4jiajvXt|k;_foK& zFW5v$LF`|7wMM~;eq|Vt;Y4ogSP2V!n>pO&mS?9i2j$-L%rtPlG_exTDusFYs1YDe^zz#~SWYwh8ITMu4O`7Ct)r7h@GNBCcRsgDde7BR@VD8E^!j zlxRsNNSxh#q71FX1O3ry3-z1UZ)Yt_bSQ&Ixk0T_NI_RvfxtxNo9@V2x1d;w_bnJggeuFsGa-RGR?ju>IZ{r1Q%ZRe)&!mWqH{Y&*4O8%#2 zxd4#L!@wP|f2msn@2j5oa46nE<)?#wjyf50)+8zXK~kJwSzxv!Qy|>I8GD$geY(XP zc*?Z4`OFyk^b{lOj=uTt19Smw(aXAmPLxHi#YoX`bcyYDT~ZE5p?Lb!obENxixO-xREflG;du5&9;LAq_g)cshgEj-x#TUF6D&VJCz4q|Br` z0)=&CNrUjOjrTO2O*_{SeuPCxZRDCtleht7C%)Lk+K%P5;fqA<3I|2d>O~1_k{$G= z(46FI*2E*Npgt7fn8mJd_d4{CY{7ho|}c3kK!bE z1qkRpW$~E!Z=3JWxd3-G|I`Iz4?pBxT~FIE6n)>Xi1M;lYO*$ILW}k=R6v`Ah6F=< z*aLDJmqscrs*48u^}FX@J8=SRd`Nqlgaj#x?OxwpAKS<0YRL7kg(E|ebG5mOeHj(a zLRUAEhS5MQSk)9Gey_MXZuxR}@iTxJ1Uy9gtp+&AezOtDn84Zw2imHu>BDg2L!1Lhw%c{IH z{VvOoe&mQc-U@wpBMUleg+9G^i+>GU>g;$%Lu5Xv{RJZfQ;g_6`?==h?@S0iVP!eq zRAx`ZcG8YI*EoFcmhMG{#%np4C*1=;_9m3Zw(Qk^av8&Z7{qZLgpljJr#7uYO1A2D z%~LWIoqs;PI5~uFoK`fZi)tw#Doi`CNh=*&iY2|?)j{a$p{nf;6qS!#F4jAn%vIiW z@~wfbeaJAk07^4U)&P{R=-ER0!>b>?&Y?$2tB}6aKtYgv9(*Q>3Si(h0zxdpzTB+9 zkwd?-%Y;k-n^!bYh0+*SA?+Om|BkshXMG|BW{ zrn2EeO&7Tu&z~_}tEXsjoXwLgRpWG;JYxlW!YkO5|9u4;5ZpQmkEqt2+G8UYw^;*A z?C=moxaPfaJ^aO}xk1WtJjwG3b-gOn*P!NcIs$5zUp{IUaNutni;gfBz%F;9JW}fx z@s$uBge|uF1?|coGy|bQ9%o#;SkjRnEyyMg15dU2M3VP)t6afK2F|p|-HR&adO?srcTpt%6YtLLx zhE`I7R-Ou7wV z)do0);%xypjN8yNi-(asCBJv$tN*7XB{3NWK{V^7iR)mk%FAIJo;YnroOVEeus5956!+r(Cewt1ds93NB}$BXAUoiAUF z#%0$^;;SMUIZ`A`-HJ|vre!Ly@g~KXO%P&<6|klRPVtGo=UkQYYyrHl%y; zhO4Jksha^eO0$j$-ow8%Kdslbd$Nu{4y$?2%bM5ev&!a*8l@>Km<{`aj%Iav&2zr+ zB407hvTma69v34r(EfR3h1uge+i5y^US>J5K4ptETY!UUUL7Ck_@!^du55#*x^iEW z^ah%Dg22}?7?mda(U?rXg0&9sK3snp*P2O<4t}8(-sr(5dhKow)4_EgZihrbL4pIH z0wt&n8o`w^n&zJxRYhfm6htxew>ajL$i@A_RPoPK~_{2a$)dhObt!E zQw(hfTVxQqQ*0S0zWx03(1sM*Hp>0_yd6ZLZY=w8YBz*mOI<|^!LCC$Z4BHDu z<%%To{5q4_r+rDAYC1D%1a_X8zTVPr011j<$Pm z7p>vV*s3Y7j4C}U>6?E(=AV!G>wL@!#kF73F?nsRLA<F^fCM9a- z7n=)C$-fG`z=9l!q;iHL*xt>w&v#LWMF}P=kXB>Y&&ghVg>ewH{v)^ z{S~S;%D6RWOeV)NLmw!BuV~7S=hQ&p=`Kys>aFrg7Ue~m>R9Hgmc%|nb0p~DLN%%G zy}nv3mEBYLIe-VxYBB>)H_GO$3TavEaaD^P*x&|AG}1RYr$tC49^749Z`(E$e($f~ zJPc_uThoQ4q^uYg6n!YLY+2G}eF)G{6q$JO4VLA#|9_da~;e1y)D(}=GPHcC;a_)Vd;-auMH|Av+f=W2&q z{T(KBNKjl~2Sd*go5(Ob6!Ud#_GEAT+H^aktBvX<#uG&Hmkxx5(==mR)0A^n4cfSP3ektX%DwYPRBp^qR@|Xgr~;r z4*PjGSb%)EyMpaK&dBSVKmLAy%iav#%)=iY3_S?4-p)fct=!*zGO>v&@bfiWA7ahV zh@}z+Dkvla_kO)@dXL|BxjCfg3v}pTlE-zkfKG0zixY}2UfO@#=7f?{jY2q~V6$3( zx#-^X+AyYJKuTSE33VMo)??8Vgs_8SU>vWl)-b{lG2}pSoYD#B?7x_qQ1BIjv~UM5-9)X~nCo%rh-24eJ)3z6!2*0xQ^|^i-d) z93r=VIyj}t|4XRMdPY?0~ zoOkwIO@^bSyKE;2mc>7N!*6Y{d9gxkRnSCgDtRnrMP&{@cr8_>3#!v9&v*}^u2G9; za{U#QAM*Ae^UKiBS^jW16zy;x{61fUNJ+vj)1=2Gw2e^b)6UV>W}T82<$^^C>!we4 z&6o~QQNTl`t332;*ypM9y;@z+1OZtR^(HK4#siymd$foua?tRV!im6&+CTcaIp^zzV!Dfp`+`{-cpbbC>#6g<0?t$C&qud>=AaVbCqmr@c;Lt>!y-CS&MnPD#p>oqKK?LftXULQ3N`<-6PH5$Wz$u+!IikKo_`diuIJbV8Gp zMLa!6#MAvEW+v!5lS)OAq=_gvs7dvI?44h0+b|HozlzCTVz#)FPL?c2DI4pKUa5jn#8%Eazw@$c$iZX3eQYWa|9D}C?2&7R++waY4WcGYf{3z^v+aAq&x+1D2a_T8nn zy=`x}tGc%J?&E$sfA{`lonQD2!t}Jxvolk1{s)@+=ZT3^>uSY1y?$$dM(h6e z)BFxdo!gXd>YuR9FRX?nKXEyMxADVcgvq|BZ*@vc+ZG}_?Hfw+N-!xGiN0~5GVT=z z;&v-3wuh{-D>htT)>k)|pFhlfu9uzbWUFvxO*!36CKG2sXW*$hNGrSEG@9M~kX?R@ zX5#L(Zz%jKyE<^GJ&!W!t=m@Vc6s)HPHNuzvu zHO!Zy)9?-W*a6>=8l|--qHT^Ty#%EF8GyFo$TUvCML`?Xa^N~NPDI-rTXYGHuxOF6 zXpxAa#UYz{wirk`0vA(8$LM0p$rxS?Kt}m$AsCv#n21EoYgVn&F$bjm9}5a2#jz5o zC?sGc7bW6}_hE*##xef}00960>|IH2<1i3>(Fi1)>uUmTf&&C{5Ce0V*AJz(9Khx( z13vlUL!y!rRk6Fsrr9|Jb^ruy0SNUGT#3-|qG=l!9V1v4r)`9G^84w3&hE?pivui| zF#E2##<&c@G-&R=xbd&fV=G)Zs zo-xlegMK5Q4AY-7;c`dWExFY0J!L%m;RU?Kw+?+?N__<&9+TVa#NGfPS_okk}jONyOx_*PeGh-NG zoyEB3BkD3}!f`r)2jOy6wS}5g7Hq_8Y@wiSTPWBww(xON)=@bWw^$Imw)&f$nI^9d zap_7P56NLP6*S>!7ttR8eaqq6L-*(JNLVOh_Ef+FvCQ-Jlr+C~zzIqSJJORqckiD5 z>^a<)6y%l@WR7s`P_fwMeEEv;`&R8HDtqDO)?I@?WNAEFgt2?>uN&Sth)2Nc2~_UK zA6t1~ownTn_Pi|XQE!X@{&Q;6Gga?>2zgD6#JD16ce%-1rJ!cxTGEUmFe({wW7-~# zYGoYKkA_FR4bQc+Bp9-N{22*q71UnM=3Y5UsFTw~E!WB73evf@S-X3qPi6&)=7ylT zA@#LRSy}7kFIwyDs77)6^jhcd8ygw;71Zu)g7!)WMN(R0cIJ|(G{qU^e{}HIkQ@IL z-3+B~{;zNBG{E{P&oww{Jp`ipG%3d!^O4EUDb3?O8w{WFE)^#&(3rIR2LJ&7|1uo- zISex*<}l3g%wbrNa)UAS?q(9A7>_nsY?~Sx876`*j|0ZGd9rabu;-9Qre$TJ4 zR8{IU6~#`7ooX*_MW?<@6Li{RWG4u;5qXLXQg1pLw$P*Q7$mX~?vgWbk zBj@|n>6uwR9e~enU^8S$W(aV^mi_{|aqUk7=-9T|>kX(achx?T@BtfT#r9S`E?AEuE6l%Kn9`ctup931#ORotz;Xfv$3vBQRF(`(?>_q?I>K zd+}Ci5$9>EpIDm}S_>gnMH8u~nVCpIE6L1x!WY z@~N2JeJ5Ayup~@yPCvaRJVl+#)$(8-GOes)ua~{m9I`6b7Cudo$Kv5Qgu43Ll9C z)*1uGQVvZCYEwm3rQ{k#yS52bCMMXHl0JR+pP4l)6pKX3p%)N%y&BK#EMw&PegU)$ z`z?V65>Nq3+JwJ2{7J)Lfwj(sr2uqr@zetFU3<#6gXj#_J=07Yo#@O}=(lv}#Fjc7 zsf@6}4Fx2<^nXaf9X2e0|ZMta|h!y_Rl*k5ZQ-=302#Ss?~^wcWu`$ z4v6J!r1uXk*dTp^;_w7DSv&CgV^QSNN(~^@_r;v6s42UW%LM+ z^Z3_-UgvrOgfbu+ckI3dYIA1_Pe2w&O8v6@moYQy3gGSt$Bew@SB>kJH` zRLJxWjB<{hDWFo%P3A{w%czzGBCF)Ta`Vb;N!k=Mq-3I6DKV{fdRat+1*xD<66DUL{^J1nWl`Au~ zFPWaJSfxoaP3LNrrD-~um?#-1r_uTcoW8wpg;=>Vk(r)G>&H|z$Lhmq{ZC`v2mcrA zUeNnVbjOnCGn zONI1UNz^}!W9)y!Dhe@ykMT}?Mvzo4xqz{^i2_jjeYM0E!?2EAU@ET8S^m2CcD=m6 zxxKi(THIr(!tEl6EC{3Q0S;044*&rF|KweJPvTe<|64xAovJfsZ3*S2=sF1t=#WJ) z;ykkBd1ZREXcY<=)wB4-Jpupc zL2nhXsg@ZqOS<<0^jRP80ex$2(Q03ddaZH&Duv&UH53ksJVH88WeO*l1dK5Vk# zr~uqj_$JeU$z#+&F+7>4!NB{wVn1t$WB4_uhA^Q4W|Flz9HWg&cVZt~MJOwIN zp&PUC2I}!zh={O=!9;p;HoceHU@_Fb8&R^YqxI=Mh#f`11hprA${q|;_H-<4-GNv%r zLc9aRy`3|hCPXTv`>p56Zxc{wdU8N7y*_P_81;HE5whte=lVTe1vyaFR#h_~tG0oA zLc`>Bb@-Y-=z)hvg>E;KDHYsq&hv8K(KeuueQtvLSf8OE-3S``&zp_kKzLgVpLyK&#bpC@sm58o*{Pe9=M`=@E3I>+@cC8c!utCWjRGmsijPVT@>ZR0bHp6tmO~Ui-JC$B3asQ7u|{Iw_$B~bT5KCwDH+l zhE~vJqpC96k-LIVj0#Jwj#HR+m>SI0{s50S4~E_)8fzGke~5aCxE8e^sWuGIZqcox zwi-<$7NC|o!Dl#p2lKpR9eV(>(g*Y023#8V?K>Y179KAi8nbA5{pca1eqcRsW}*8E zrgry@V>_474X6znz!37{MIsMsYX;W(N+;w7064=GxGOy#0D?+1wlA+67mYva@~nL& zVc8PIwc0Z{4bUsp16!-o>C`X4cDs@i%~9A(e&R;H5*Ie-*2Nf?T0delX@;3wF+p=A zJS2xYw$z7H%2u8}osv~-1Ih?SS41R|I%0(6FuDj{HDiFQ=I_&lOWC@11z#cRu z;=!FeCF{^hBRmNr5GE{Nx?ot&$3Afw`xCzQM|Ub$Zp^7iF|t+UL}CsSLp@At_L0;z zO;zeeS@#qiT?HVfaQl%^`N}}HnHw@qDL=g--ai%2&E#fgDC`Z3JS@sBE$Xc>WH2+qnwFX0rqvkKDfET;wMG9Oe~{i{5{dxlGAetnjYVc_&24IV=?&C(91ge9m$TFs*WqlTSW7E!vnm*wz9~ zH*cmW8}U0Y%0SA4r6c3>6Em6-r_}Kg%NK^43y@Xt7%r;O0wL0>G$WyG8!cHfk&P{s zQb8t@NsAlivgNfKEi@xllM=T|uN|XR?QA#>w0JrQo+TtH%XeOP;>9`inxogewX*}m zQ(`uFTcDdodM%}Quq=GGym7zS7&~6xFFrR}%`!s%_%2SdHCF{ae@Fk^=m&WuN`;9- zr>(G%xU+~{d63VR5-=zJfE94+k{N&=f$#1#9UlzJhX&^CY+cFSU0ib75{75c=sCRZ z@pT@rJA7Th>l$3YhSlIU>#oNAG1!2Zdc*UKjhSZE{&7;|E%tD2{|CDNe`704_&ueA zd@c$6CEQ9Z-f9nbp4meJ*Z83nb5HsrBl^Ui~$EhI`K8KvD5X=~Q_dLVKuyJ9D2fLB3;LY|u(HfiW zN)60{4xY-XN%$Dw?s)k7c$q<}{4e|ax54rLWzKlQC`lM;0TU1={J|jT&p=3-Gp~yu zF_f67;y%D9fa!FE?ZJ+zT*W5893I44fLKZFEnB`2;%-9KEy&95>7V6iEsdWXDzsf+ zq2-S$fnEfwV*+$>400960 zqIY;2AlDGYrDb>pf!W`H3=9x#%2U+Vf!Ru+u>-5V6fxC78bbrw76J{BsTfpP7$|Yl zu@OXe8)(3qK$M0PX#s@2#WQ?LYa$2m^C6)n81P%O0-&%Sr_H=bZg8TJ1Gq+ktY$*WXe&UzAabv`X}78t0KYQ8!P2v;&&&CX0* zJ5vItrB*RBZkh3mnTZ2te8X&caHbA;6-c7@1tB}dYGGiNMM6&p$p9*%=kg{ikPu`6 zy`YN zx1HNrvT~sg(zTlG53SbPn6{hb*y(1FqYzTJTn&?&>P{H-*Bzvz!{wacHr=iL!yPWa zpo6pq9i%nxAU(aljBouP^Z4@n#{%t6n{I#b#qL2ZZ-yL>9w!}*|9LZHd2`bmC4?E} zpqg>g+UP-do#sQU+Rn7*Zs_>^^f}Ft-vIys|Nqq8OK!q25C-6@_ym?c9zW(Z2q#X3 z)E3mx1-EZ()SAY5pel9g8d&|FiL>DUGJwoEkZWl zbf5qGWCfOx&JrUxDvG!{VhnLyMf4QTyW!>bbbLNE7Y0S~YW)1|=->PEE*-+yu~2-Y zIlVJ!Ty5|;BgdSF;DpmY-0LfC2_D;23S!-SjHG8{l!aGz%~2691gSNZzd8)7Vn58E z#)%NGHAB1p^3t=CU-*6uP>GtbamI`}m)?MB$y!ktHa4ly$LODoV(jOg9LBHqUVuj* z%1!v{Mfiy(h# zJi)F+T@;3oqXrUn>CnuDMs&h7jc@m8YSW>V_00960vIO4{X=zM$4#l{`gK9a{h|(NtW;t+|fg&yd)zdRe1yaCj zmDt1aX>%FqXjx3FJ3tZle(LENnI)Q~m|B`78V&3npv2~D&^e=6qua#D7=PoKP=w=& zaR2}S0RR8&o$GJgHW0u+H-Ck&4rsH)il_%gde3y-qrkcr?TQWShCmO>2@*?&B(Kee z{qMUwQkEk>!C%*sw zk)E6YS6qIegC5%lc(%|^5VQ>8JOfGZ55QB>w;}1?+Lc@2`rer<=lpA@-PspzXUpoe zZ6$oi4Q0l{{o!^B0$mBVTnj)Vmbd!TlJr(;#@>s58;s7D%W2!82iDwAoK0bN+hKHa z8rtU02l~}%8?ee2P-)we$taXcNw!N^WVQV=qjz z|EZC;<2?@Md5^cFM)DifNWL*OlKJGc;DG=*Gc7-`<{G~PJt^HBOxt#FG^gHlNo(_g z)lps@Fw@mt0V7*TBp4tO1i}qv?C%a3**`=d`YYR@FkJ3}IJa(sc;DDOTexSp3n_QU zg=|@nwwC=K zyqxB=I!9WL96Ef+0=+nA;D}~%PO~L?s^aMg_je&=+@#c-n%BhPdj05E>%J?(ApE^u z&+;>_c^RegfH9j5xSb_lU~8ctTTiS}QMYlwJ$>@S(8?$E)d}V}Ky=!`+@o3<1GoKN zA8U+)+#pJSPUV}cBDvfo&SGBl^Rb06oHZ|C7gJp#-{2n52-~bCh?8u$KORQ}{39aY zL<7erkOed{dKuBzpes?H4w1!Gn!Gv@heXOU7&@K*5LYRIj+V%dj7t?=(vI~Ov*3B1 zw~VF1Q2PZdo;x|VXb)oF(~t2I?~dCPgM}ZJ(RgT`!1ESmeL^dsPDc6kgfwzs{^Me( zL85AG_^zT@M;mBW8JMqnJ%TqlK(O%NJ$}^e6Ag~Wv@Ql|@g~12A_7Lvw7A{gy#?02 zdhvsycAnSuq#B-_v`TMhDup6~SHgXm?V=o==mO5WwF4Kf5#z2>6$0D7v>sj~9N=~S z`y38+Nwu26Jny8u<(eR+8ZRMw9 zECx;NC46I)DI+C(pLt2o**Y!xIZ2zB(1fDDoWCE~kQ&?O&tsu@%3vJ2iQ|r)WL(gA;I9FhuR6Vp#Q{ojPVgv0} znwDqN{0yaW1JAnHy1cwdQz*4_>v?ev1$P<2Lscg1D_sz8ARKk3x0z8M7cp})o-kU= zD$+EP;DK_VDG4Vsk=*wZ(QRhT-uCE8f=fwWZ#Sr!Oq#|Dvl5OCJwxbZr!q@AU!oV1 z>Xu_6n3@VCSus!hqsV-bB|L_E25?scYD({AvEw#l2a|YL*%3;-UN#+%pE|{dV6lmadh#3%{e+qNc=F*LOFH_jg9qpvm zw1rFm00030|9oA+Zi6rkz3(f0+$6NNT5p^XTH8sCO^mAQu|P5+QBsA0#NW?$5=K?6 z90Rs-WS(OS`907~1&;2suBJwS`_F5-sC$WLv#NYq3l3;JMhuI#Z<^~szEw{Vy$qIw zsOuFWss~8s3it4bwR1sqz!Gl1Zi^$azKlkF*9ZXdlTCOVBLsYD`9rA)HoB*J0dpD_ zoo(p>aK=E(yfoT&EVt<%Vn|d$#n3asfrHDd8zd#kO6RPEFzTM$rkI*l=THR{PncL} z!)kCNl^kgi--t?QB03c2+|7+Af;g*T%Ofco`0R^Dl`Nj9QcyLB7<{4CuEvB~j4b(| z%OMCX!iBXzO#IO+Z_()tD1|&?wTE7K@?`}3c65YQPV(-4{JC9u7RMStR!hu-KF>(6 zWZwj=2%m<-TfY0)=MbewI7C?%rTH!=09_;{7#?cPR4< z00960tesm+!$1&)|H?jAii*!Mg(xWmLRxYW`m`)HV8JE@BTk5y z!GwDlt3J1bc+ZOt8)|cnpD&KR&$jIjHs_9}(8K3Ho0S8#8l<1;8(~4c>v5)YE7AAf zWBWLcHq8DCz(AU}9|RF_5>${u@e@*MVnHKkKpN*enlqTS zcs%YpH}tT#dWYQ-b^U|ePKz)R+8|I6b)}}Td0L3so9d3^=H={5Uz zZ9*4Vz#4SGG7`SMghwv(?xl2_lQJBQwIS>PL|wsgbb*uc^n_A3znP4w;;^yBt}(@3 zMIUMz#?yb&Ft=@bAD|R;U)e5JtDa9!CLfO8H}lY7(W+LDss=a0egh?EzQ<>W)|Z9} zWv#2g^8a1fTADb(zU#LD&djp`rrv$8nX07>{TlvkuNx)UfcZ0k!QN-DcevX4!$RCz zjJ7K)#3$*&Rx)pMBn$Sx5WAQi{zpR8Oy?Dmhu;(G!0(nSwd^v(p<04j;VYengCb3N z2^O^+%Gb?hiCLUSVK~n{kz`!uNu;8fgE0%k82{nPQ(lsZB>HO}+;^wr0X`c9Vc?4c z_V#u@#{)8qbG|I@(1?O~%4^Bw@~S$QrNS^cf{26RcZcm}w-+o3;wWgvqK?Y~9f@^1 zRqHi0GB%jn)pFZktZ#(B!Qv@~Am!yCONpkgj&k@9yvso_%A!${c#;QPh%Am{!ACI< z0}*9jB;-g*kwxCRcll`iX$q_nKg>ILu}Ha>`B{utsd32@KUZrnOH*;pH|Zr}MUcp-^Yf2-LYQiySb=0Y0dfImqS34m-6}DU60bI+3PI-j)mC9i>7}l;e)R zy1-BbY4f^H9H*O0Nqm#mvMQ+S)*@mXOLdXT?+rjpVitNqA6-vMdycK>Nz%-;w!!?W zLKb*5nJA6rNE<&=d>EKeR+LC+h}AXmDNs@E`Gx+AY@I`2{vp?RRKLG#$|Nrb=TW{Mo6n@@*1&0-_oyLwRQ8%~VLyfF3 zmbF8g4cJ3rP?Y4kOJvtdh7`sA`_4JMM7P#my6t5&y>oCU&-XnX+qP|OY}>Y-jq!?Y z+qSu}ZDXU2Z97lC@6Ye4shL0K_T0WzT~pnC`<`>a1IJ3K688?Xuf31ci^X3fFh%R; z4cD%o#|BAmE1pGKVw{*^sZbPFhFc;CD%?uJas_SFF((NXG-gvV>y8roIxv|;9A}s0 z^!}lFDyXPep5f@bH>r92z1%gPxbZo``N(*H(~jDx?%)Iiv} z;nroDn-GDj9n`bkx(8+;31L<7o>(oHTUoRz+9Eo$hU`EnyKBHMW6la1!O2q5x~$MvKa6qtWm5F!={aj^ zZ}VA7{+m^B*)pb8t=q0!&9fteP&Ju>$19TF_hZ@1co2RqM4wF$EHD|re?6lq3@vu4 zgLz9{ez)$&&Cs^8p}(3YB?1jX0Int|q$QZu$(jgV*c<*XM&~)H&RBM3&;29_ z$|3n|5O16s$qxxLff=zvlJ1c5K}p^)fx^J1)nn<0v4YXuuBTra-SlBbDSk2=yMgl^ zj?sEbM^NR*Kj+m{Actbbf@4Qwz!0batQuY@vxXUlSwI>(Ibxx{YPf!-oP`$8upJbN zxmHFQah`n14f6omc(;(_oNKD9^7M8Q^Ce%ULPO{ylwKh51nTiaW)mdoJ2>|o{%vhH zpYvV)=8>1?QcPS=Y(U_f1BKC>Tu;`Vsr$b<{Gbou9CIVoD!UXT2dop0bD%Ra6&yI~ z7%G}!on!X_o_eaf?cKK#_TLkG^tgOj1*Zb@+(u3nmyfr%Jl=$N8qRNG2*=zbxZCbo z-G5VB_XE}~95f(DWMxYy|?!F@|#p_D}mLkdyW$%wLB6zYz(y_e!#=F?&78s3Yf)0QKpf= z{8@nRp}5WihCeq-tRMs5;Y&X7^}qQwT#mhr*!1r=sig9YdwJD^p^j8-^fev$O6dD$ z>f+(QcMrqhhJR%svG6sQS^y6g@mK%ab`Qi1%x4n z<`%%w@)-~naFZ`gSuUeQa%Dz^BwA#JQwU8`+3Xa--_#`Sh^)dFgu6~_KJ9obq{aU$ zfccr|ZGOUZ||-$mhPd0k-T}hN{hT1ia*0 z?iTJAQx{Wd_DN3({;FRJPV5wq7WF7NRZ=>Oc)sq#Qbj~SBTe1Z3n_!)N4S*bY)~>K z2P#tCd)mUUpp!~Ed4`HR=!x*bT@`Gj8IiT;yz*d-0@_WH=FmB_3--%~hDA4qP|Xs0^Z><+UuKCKE*e(fuo)7V(B+2HHSsEC}`1AX%666>6%kq5GeZcNxH=es0=K? z$hDWn_qR=%f*tnG`68j^l$jAC;sj;Wy?_59++$$z`$b5ypTNXNryFX6O-ifHo6J&! zX%kC5ab{A&_M3X}E8SUaQL!(tAIA8AK8O?AeG=FnXZ?VlrAE6uz{_;5?laeo^}zmc z|9BAU(~F?z0p0pJMtX4;86b}Jw0xIoD4HTUQ{qsmoZnAXMdWj;|CleO5F%0e%T{w9 zr4oRPwPln;Yiy4k^p@J9)Lh+G1@#LtwMvetM5>;D^8;cd$|fA}yocq1dOg70_MwSa z^!F~O5B4G-02f=%tN})S6;D56;9t}|HE0`pst9Xn z&lgBK_LKP2?-k3Nf&G>{GES#Hg(Fve7RIN9Q&3C{uz7Ufnijwg*p+PNZ0YAJ5Qcpq zUDpp5erYn141w}D5KgnhU`D(VFYJP1X#vvJlG=1afrd`KElh|enA?kUv7cW7tU+|D zbrWH8x*piJ*v^w+R9-<>zU430^hBz0E;o2e*#JK}$Ejg9*YPS`^RjUjB#0Vb@K!8` zhjPp78W8;$f^0&L`}cq#A*oC$(+u$opdx4xlhqIs ztNH^$nf38eOD~uipV*0-2s@Q#f)0A5eQlolVyC?dtTk?6pS@^qUPx5v&e%Vk+!s6i zMxRV`2+In&f1=c>C&4khZL;%I3~o?LEi z#q7APT@4Lir)k%XtQR}E0f2o9`t-@-Cgtx7J!DnWr+{i~44ItvN2%oC zLN?itmwG}Tvpph41AZOh=->1W7DVbb6Jr0iriWc@S^g&fBnAMv@Z`E4fK8-^3;HW6 z)eedHilRuJj*?^n3(d;t@kY|3Duz_0q}n`&iM7txIF^@InUc2OY+H6a&8G7Vlui^Q~1`YVufa%&*X;i;HV{jHu7 z&*3>rW@JQ{I+>?7SeW&Orc?d;`ViZ~xS$i;>I}Z|0A+OGA4nr|30M$W3W>%Dn4_g} zvb^1c8=ekJr6bUHE2Yd3{`dP<|36;%TEAg&K}G5U-NZzXH7VTX1|3W((lr{KW?(7;8J!k}a3|x{ zlOKHSMZaEz6G}6{f$XY)&)lMi%gv)&$mqaAKNHijf1e5AgH!r5S10%r3g9-r&jtr6 zv@3>#77O&Ft47R|QSu{{l~eVxZ0E{3eWZh3DHy7Mhkk)uT8kVij%J!!Mv!fcb8*`#5B2Y5WnR9g)L~5EyHdiHbMO~OxBVQ>kHSXEdyZOqG ze&>HKB-sHV-*t_C4jemfIs;Z9$I%bIh@^RlAX2N)&5Z(G_s@SybhXjTNjaYBV{9e4 ziGu2wm_P&m9w1@8{bHJdK3T(pfsx!Sh>Bdi)8B;#lg~%4O8!ARcANHu_(mLFF8_Kz zJrHfzn#*B=%xHkPBiuuT_KOrjO6O)ytxg<+QBPCVZK*8Igq4Aq12W(dmcVF4NR4~5 z!toB_@I$h>-YAyFLRyFkX7ca3W)H(q&!dvB*?tn#cz>bLsu7gQ;2bHO8y)WoPRtcB znnPc=0S}nP^zPC17Y=t%_#=KWCW_hOCX|*Qj6^}whYtRszy}>cB@sk~oTfILTciFe znjto1oWv-5G04Zz1^k!FFKw)pTryCuqqhv<@)%5s4hNMAm(p z;|!wnJ^a^FG;LTT%rfjgQXv!O&Yasx=310rggHN}&1@QNaIb_X(!Z77 z@V{2d9&Nh7m0LG_!DJe$HKYsff8?p{gSBTok7HVxO4$=vdeN{VF-=10S5i0Wo*?so zbY^rgGIX96@*ljEc0mV#EOE+w>ZS(R?lxl=IxK&L=q$?F{B)Qvg9p0gnTjGdMbQ21 zmC*($^Qju_a0SE6rkM^BwyhaT;g1oQtgveW0=6t$_x*3~Vn|WHfX1h-RIzXk8@YD- z$>+W%8~3Vgo}LK0?-;)d?du%8g44WxzQs;*ocp@XdJQlPo zAY9fQj}~blmnb_VRjoIUN$@9Oo-p9S{`KENqEYktC`z)Y(Dn$;;G<4 zwZqg7Gnt*(`tz3|U&$Kxwv@*A%mhpIP3rBDTnIopaDr}SFO?*%lHEeH?u3*?oq6Uo zjpy;kQeRRpG68K^hKwdq{-gBNi6Yd~ zB~3|;i66Sgriv(u>|)EVM==MJ99h0z_gr4MvGuZhI|WhsA7OI7RF3)JKN>Gae_uTY z&EXH3#bXKyOzw4Qh=RVPLISYETs@XFLO!YDxq1!<4zQT(+z&=2x&<@vAo=ji6vUMh z_%1VN)jigC>7-%l*Nra6xMV$2y6}5i$#LH{Rc-#3EVZL@GD!KtljY?ff_akkN;=p-uV=$iD*u9^{u&#d`V(@v&&$6C7gwY z`9+1*0gV=)o8cR|LWhH!kWSov$IVR)RMYY0N$3*<8{vTU7=-%fVT$#hj4EmRTcd<+ zUp<1EorMl3-Tu;ARCyez%BKqI!3+VekM22sRl365(5lDPrqww84Gmb!0Y1#nUvfI2 zRD0EwLK(Q^ao%xqdaXmA`pfKv97i%=} zB!RD2J+4*w^uT(^-M*R|dFMxC_ppy`7k+O0+(cbExnr3BW?{Mn`2yk)8-k(6lm>4Hfl!=($Apz`-iw0-{Y zsFihtIofwJ55`Niw?-fvc+>}mC8ih%;{`cu9d+f=1-VQ(Y23e9hhjZZ7)U)u8WcH| zCvb@jZD{ic+R8u4O2jH~eiMiAcA7{=c2#9ou;8bmY9fQRDb>iIpAoNkN{WVb@SZYe zYR=uLY^i}gk=h1&A{5@ruJO@H08a~UYpc}R8Z8R$gzXs@{BsHP*mW6>JoSl*HpXXZHve6$8rGZZZi1sTaMZ zX8M~4J%h{NqucdRs-y@NRv77!@c#M;c55i=;2nzt2Ciu_ZQkguv{egO=xexy!rpwO zgl{QE1vLnZ&nF%Tx&#?AbSd&kpf}{F)1C&c%&HW+GytO^H-`WLgTm&3JWI9S9zP*d za;of6A){@5JjR?d6Ck=lZ8yfInl~><1pWhbA&9C5?P_A#Tt~8Pshq&UeQ=vVOp9NQ zK&vdWk~bXBx5@#jm)2uibUS>0-^7|YC$K~=VIGj6cFUrdKO#?rxhx@s;mQk++!%Y5 zIC03}0pw2%j@$>Q`iHaIF@gxKJEnr=&JP#|CwAtsTNQu=w5n5q_Pn?mlmRAmy_&?m z;%-C81PU@=VMS}xsyaz3^0*En>q%h>9`N{EOXUso|4utVz@a~itwSc3P%QVv+Yku8 zBL85)6XMMTN-a)k#e;x7hD*AX2`y4~0U!iwP#a5eFr27t4i!Q5B!u{c@&6oPk3$@Q z3}7@nlcTF+?NDJtBg7k`p^V8P2UA%(C55w~E{FrS!|q+d)Ndhiy}WtRk)t>AvQQr|#_5ksbhYEed_ z<)72hs;ml8E*{4CIS`OflyWn78>xLf=-&c(za~ntSpDfUCSl0WJ)U&ed8i69MW96^ zLq@phFxT|4{L0qgs)(Czoc@lDrRfO$^|`~Dxrl`XefY_Qy(Q4g`}z^ak#DTWk)`{( zwyI&6NjSQnb$jV53>_+byzo+=BgnibM+M1R2q6?WxzFbY@32aya)0}4%EEb~MZu?F z&SA&ZgOr7%vazL-yzEy!DB!oTeB^;KbCH7CM%y3tZN?*MqbMB8Trx-q8bv>@*Nk-L z_0^(Bfwt5UXPc_%=jRR(i=f|Q6koDc&4WsithOBceIsP|OOm=9ay`0+hzRV&i?2F8 zFK@*({vZ_|rI#MD|7@_TSD=+KDR)_J+doF}BhGx6@ zG&|}e+DiJL4+;lf1*WMtyB3KRzyH77x1Bv+EArRHS7Zz*o3d%{^QV|qWLrZHR!q(x zDO5Bohc%7UoyDALJ}o!@uV*K7NrrK9g~kImJEOk(r!n%hN&LiFUc4EwvnT>7gp(0i zOoW)%xBI&DCu8{>FN%c|XUQ{T%ew+=%qZ^IDqg$$f}Y=uM@yZU&NQvo&YP7nERBzw zTOmnrTWr{q>FwqR_+)ETff)0*Wb>+nop&IDh=f-1{9Q}6oLPt4PlEva18YO~_EJ`f z`u>qJFT7Gi5mYcg&j);Aj&e}F`JhK=IK}$Hf_y_mbTOh0qhy_KF-l1(jiT{aam zCQ(dou-Pq=;gRHOm%3(eI^KUiB(neO*MH}fic2!?d5wM7_y7ia8#fF+@0rlHU^(sB z1mCGdnJ4TMVJi^uLr)C(>pF^zOJ>z!S;QKTRUT^R2sO^6O0UR~>R0N_PEbtY(;K)6gdT zU<>0HvFmYF{vr21^~p&D*xX+)#~?BIyS~&gTW7z%F^~|?a-k+h*F6U*lTTSz&PpQR zr_Yy%-GXGwX<%wGXB5)2QJ8>pTlp3lLZX5j!t#fk?z#;6j1s%}=yx~6J>eT+QOs+a z8dXvqJ{6CtTb@!p|29#ulgL%Vl#VKbo^QE@FQu#i>v`KhnOf5nb@q+OG>g!tOv@Nm znVUUG93I#k5B`gG_b}DSPm#U>msdsHQ9y}1$t^0=t_|$J?9#pj$l}}1FCYnMqhIVa z<7OW&T!{o7Rn%Kcv-t7Cpy=4Yk}RLA*`CFuaA(`S8fH9Z<6tb|+=W|~=+|^?>Gm?D|al3TQgl>Kgo43{XVV}UG1(6EeOM_GPT!`bDwWh zRWmLuDt3j$)ESj4q}CqZ>d>ka*6`648sj>{wYk7P zHNJ8x9#+|7)6>l9>D1?zY09gsoMNg$?cfx6xMz zaS(i3vVYuHIwMAbb}|LR`J0ZKJ!uHVoE&DH1;q||v8gnpUlQ}YDuZ)cK)g|tHHOUx z`OYl7;CwQ+n=2xNw2YPXcKL%g{BcJ1-W#Lgg=ayNSE0pAlmwnt3C@CbSr?|JI;RQN zHG6kl(i^*ik@Vi|peK4DP3et=hE{~WuIT`_Q(`*BG1X$q;R<{!jc>+uZiJ*(7KFSu z8##^R3b1U}dAyvgTy;$z9O?Hs|GOSjiiE8GoD<;ZZ zvM5j?M~%7INV!MAtetmeV4v=uW>O&{lB>$SO)T^%GoPzyK261^r%KpXGveQn(y6QZ zmYRmhK?<>ahlAxneRWe8{dyODRe5D6MNJ1;T;YcGe9}>urm9?0izD9SA%61-3kf~< zt6hsF>>)Gagb70Os4i99v=Tul!XY!`go%9eC>~W@yCT6x)ZLnI@@TCPU@Gn|J?1Vw zAHGB)Bi&{qytc$D{uL--B~L z@6nI9fV*_mLuSYclb^QPRB^9L1ouA%5x`W~T{_|+GvR~@fAXmJkKsQjN8TUT{;$XXh4R0!e;l{}FFG;6RM1^)vdFsM-d}{ISqDdK z_BiH!Cb}{v$-)&46j#DK5|~#&kz; z=iI(Q-kR&{`NwY09*t4=^Jm{J z-_q4tm$wXl`|~>jKHt*8&c|oIj(1&q_mhj%o~xB*{0(c~N0UrLUy~FcsUxN&Z`)?d{o^OeG)0z|Y1 zlhz{Kt#rcE?IoFT!LHyCz5yn7mMKKBWHjG)g>PSS8_!$il@zoXEVe*iaWQvd0pv!3 z_(uE}s;UTp31oRN`XMVrWCC^0vVwd>^$O5aoogmbPs$$MUyoXFXVfe zt3fZ^2s&rPmK;0T(z>J5CS;HCNi4ERMD&Ci+#^bF$R@_g@xPQ~7Z%DJUkaywOILDi zO4-!4Jr6ccjV1n#po+MV{hn}gHMK9qoWbk&#>qFbicSiKMc(LjCfh1D#;DSofx@@} z9FS{vj_}T^4|ZYixq_br&ZkF^BsG_~^tc$Ae|LfMwnTB_&P;;zLq7FGe@kk-S?{8( zOtZ!M5$w}1Awm+O{^JdNKqAZ;hW8Lu>-tf6k+Aw$TCe`fdF#GChS8zA?7yKaA&>D6 zxd8^8yA2i}CC!5PTY(d5RTU{)AHULbNd9CBm2@^p_2>1M>5^BT7GDhw;y(SBmw@rV zA+&lZ#cEutKC7eNNEoi!OIk~0ElnHMcjCud084Z1y#n1A)B-Q^*SAT>=LOfEtlAP& zqhNh*6qvd%tI=K{ze1O~>021MG275kr-s!E4dtVpuoy~}PEMAc|1ZDG^=N!~IpSI`BaMU}| zGaj9WNsCEV3r*a-azAAtB@Z*`XccJ8w)XO)?x6Rmcf|a3H-zOtsGIGDx}HqP7S=Mq z5AOvuVt3LNn&(ZL=Cb*8gXLEmQYZ*^SBz!hqmJ45$kzO28*Wthb3;rsofWaA)W1m2 zdMi%krLdE=(Hr~2lNhH)^U6D=I zSA+G?=Rfm%Ei8iGvggyQJ+vT{jqHnYgJe=-6}gdaiG28Z#c`=1nRrRScU&fQ?oit) zTVQM-#P+t46RpQX!;9&n1cd>TOOFU(siBkrL9WEMOl%VqU6dgPFkTA3L5A>}cGB1Z zS41)!`o})8vOCLGpj$J+RzfHnkMh=${kYd~@TjusFJlji-y_&6|DEL*00|tjqfpl> z!NR~cpjpc`fc+4Ow_qZOmRkzU3DLrf#0B)*-}^v#iCGL}cku1a_)|R_D5soI7q23K z#0B=3vNCrKC$DJmEEndja{(LfbgC#~_Qi2H_{=M)oht|ooqaL^q z`+$NpCzEv*^~#V|FHbIa1hEqe99YkBzx6z0wkcj+hUXO$1>lUK2BkK!&>*hr5?nkX zTb;r|n>Kbo>RkZv0v&1yeD!k{BXW{d1BJa?C7$K+rjdsA6445U=pQ?REA&CI>yPe% zeKYcw37Rl{m=(74B_<=^4}f3_wB}k^g?GGjbdp_w)D*jEJT`8oD5D~sAhEVS_jMi+ zD>#J|G(+kFvyWf?S(`ociThxCu#V(cjL*XGUVs^5LwXCVYb^5Q*pDvbp8Gta2)@p} z_pcLv!Qs=JqPiHJSnz_OTNLQSCbGC>0=l_XBU0S9-DXkcVF%$AQiK1 zjF~7H|7_svI&I-7Ycx}d(Dd^1F43l!YmE_%?CcQ3U_!`cgNZyu?7k!yXHT}3pMmKL z`NP>&Y*|GXRhHE``nCr#hd4=WiS0-7r{SI4iO@g90${$_Ugpy96U`4n%TZ?bV})e< zNdrN-|51%lAUN(?xmMzJd@K4I-a76ev_<>+<^zHx0vQ%Yd*l)2?e+m^9FqrC<@>4p}7*9DV@=UghQ zLM+O=C#7f4Ux8#FyUUt>w~h_ziCBGrAMZae(&!x+1O0W=(xqMVw zdH5@X6|{pP{*Sq>0|m%o#LQUhv(+ougLBu(+&H>AWcl zT+j|!FCl^LXWPJe%LgOba0W<0nqZM#^k#6breU@y;>=7v!eRIDk54j1-y3PtWp>dl za_?5g&zf{71zgf>jfpCE)5WVE`;j!~4d=J<`cbEKfEF+rARs1Zp?pE6VcmMIZxm~G z=UD+9{Bs$H-)}@bq<|e8(IFOVuWYPIxWjX4*-Jn)w>S(GdvNC{T&D+5B@Oj*xmfaROVG_g>-TGM|-P`LHrTL=y0Y~+J;%{cSH9(@CLL*xs1iazF`q_jwUXDi8mg zA6*m2kGKsq*$;ekE|^I|M|}7Qw1OBwJ0;Sz9)lR>)}+JgO%V)05?^D<93(m%`AA86 z9l+oK?)x1CI!dahXa^-%ax4X~PUpL2935fJg;psxPblW=XX?Be(LPxn+@0p{JRctc zb7}(N*n&7|3*0{RNjSc;^LO_u|HFt>mSAHd2nSh0tJz`62F!n$EL$TJs5LSyO)q5( zL@QyYsCp*)s|LRx;euQ7-jj;TxQE5iE_lUXhh2R$0!zIik^e&2doARp9`^QkClY6r zj+HmIKbGn~JO`cnhK{{)-!@3>w~rSB$3|gWrG|CXK(z&IK?5E+1IM-Vv*ol5>1e*SK9rI?eHampkLfg*Xyv2j(5JJSvCNNO4@$nUVIGpBOoVl?*HdkXK zPczm(J17)^)yf~K6q%wAP2a*yPYvq5>ElIo=9Unv_j|WjVBRD5uS>uF@*(Oc_zQjY zvN5XF`S6Ptr|;i?>(rn-gE~4jq$a})&yHe+-hV-M?QcaM`@yn*SsG>XQnOd1!0~^z zeQTmGroO3O@Aa+n+~5{EWzEVL9FTr4Abjv!Q56O*WWs2`V0M~TdX)oy2&QiP?=O*c z{J`9o`*!YQ2yg7mEtSUmXB-M}Q(=2$8Upt}g~GMg-4QTkh-QrgYA|;#um9c$H9%*` z_#=8wyM5=^S#Mc4No3G1P7NAnVF*6E=97wa+rLmL74S~mso7Mma5)glWX9HQGRSBY z;?}AV4!{ldXlvXfc$LF9rBU35sv+)maPVSfoYAumsB+1{-e><23rN`hC3`PmVSEnU zeQl+eGt?p_KSqY{!YTskI{0=c@&>M1&Mo5rbj>Z}QvX|2R_kJ4;s-4(31Qi*?KLHK zy*bi|syEF7-j9;esF;G?Tj^x7-wNlB!pP8c0`enI-Z#fj9~ihYep)5Vek%;J1;g^~ zlu0Ew)U!N5kPR}3wCZvt@yJfa=DSpRagBS`Kd&-7{nVQo#KA&EkDP%lE6+42)!!(0 z=*T_juN7Cd`#S})>C5n5sIxF`gN?+&0`IGtW7C}QcG1#8X3PGU8G>T4EZmZG_F?7O zU^Kd+nnFXD@(Wsqi=6Jt7rQ_5$fj{q#hIB*m9CW~o8|xPGYn_m><|^q4nr;*$2p>-a8ifeGx{s; ztmQ<}*PQ{i>O}1CJcB__N=?MFULrYGYGfjmc%&;U=LXPix;gYr1a_>_%NYwyO3kVw znP7E(F(;7ez%L5${nKMr?*qDe=RhxN0UEHrbqXXkX}?FN6GdMwkC9O>u7#hkK0%iH zQir7eEcyXoEUzSXpGlY7T8JH!1PQ0fCFsG#7!Ns=bgpwN^3$sMyw{i{*Kpj{(^5G3GdtCorx$k#Nq9gshxB484tLzE`DNHzLCrl8XtW+Dbw7PCy+h*~+m#)-xYK9K}nssk!ZIYu{hgXLWkD+Zxk#1VU zq-}&WEKAcOwyvu>3QRBes-u)}6)+?Fkg1O+6ZWsy~bI+q>3;IkxCgl619ugQ1S4}J)Ta%b20^2G(h{le!X8LDs z)xZlyVc%*Yx|T;3*cG3C>7!oyl*P?>?@yGad7s4_&d35AbrBQ z?T(r5&j53E%o%fah^?>zb(z{>hT-IK(;EG86WsUT*vnBz6!1+%T`O3Fwgg(`jmQqY zjGyIoUx>Of`bVpDc?(5(`@g1ag1bCp9xS+FH_+@bzCStoL<~_gRKk&$xwK3Y`J7s2bu8 zaD`OU3!F|Y3~h17jN=`-Hf1t%wT#`wwJ#-`*HQlKUe(iP2$ZkYKE=b@=x7G?*3C-H`xiY+4>+{8x)(- z=>rHWe1MkfPSCg^O-;szU@dul%c4}91*M+ApUn-S+FHS<;NIl?*EoMtY%h2X4@zl1oGh>I5|mf0q&5^6@bR~~<<*{5lW|^<5IDv^ zV$qxcCu5E~Ui6%z?RCf{*vk=j0d4pTmT$Rmvp+pngx2WpDkEtP<$&``7 zV-NIjH{-)ceV-{h zw*LD~9j&YeT#2k8hs^F43Rz_Em%F^H29t4K3XoL`Z;2S8ywDx9dnUr2*FU^ko_O0# zoQ`JXhez-`W|s$w$m|Wv80!jNf1L!b-w#(8L4L@b?G5a;RLk){N^UGR4qX{lj^fneuRV0?PzY1;l z2GH;H7Qw}kOj;@L2*LnNMbohkE+YEoQNSqjfE!wy5eIbKe8#aUaHTpH5s@rLpDX96y(}okTu9fY*Be)=`&KI>7)?B5WAt zk=M=snt0}$D`qVtx!oNbr(>;G)rNY9b)T#fja9Ws9u<;(-BIA_qj~|fS%v5Asgf5&QXfQ(*|mNW`u&Homu&q^RlGpr zr|lqs;mSLhsRnI?`S1UTGo$rneh(5Mbw^_AHCv;C*E8egZ!mP$*qTVB#^aYvfAR=0 z#V(asJ^N$J5_t>rvf^jtn51u9gX*oKXPtmj>yjCccfwyR-xhz}lmO3wBOl61N8|+2rHQVTSKq}nvk0VYly-$B}r8%7cLr?saaDpW~NM2AD8vO*_+r|(=uj% zr;8M~@SaN_3=ci1qmWFs2FUGEMQpi}k1`|^j7F`?h_ut7;;k3%{bmVlF(kDF*Ae>7 z_S_roH(!2*VIJ`;scOGuw}c6EQzb-BxM3O8j{f=Ih`H!Z{@&n5+IpsiV~fIqj|wj) z=n+(ZrtE-H9Q(6S>3T*a?VRNMNgj4Eg*~ywc06@M&Tk%CD_WY>fZN9|dxx~7r}zDS zIQb-gfUw{}?N6EUfH*0e{T^0B7VAtqZ9Z(vuY86!TcThWVW65>p8-%Kr2|z9hhB8_ z{3^*bHYP3I?}(XGf`2f`H62~N`?6f{+bPp!Yidt!6Th>#a2W%^pW$F*M9@s?Lqrk`%xzVF=&6Q9GZkxbKMj#bcEV4j~4HLjbbc-fI6eNR_ z46Y?J9vzS8G}aw@dal5a=72H1d2yAhip3?H zb?bGjbsKKW4wa=db*(KLy_(tTbYA{I=2@$=GVkG-R4)rQKz9pT499do{e<^?3Sl&lIW52Z~Yc~4YooK9_C~-bCgG>^+($l z=?za()eXZw=fV3g#T`J`K-~QKFy=%`^*wPhKiF* zELZ4G7saEnW9Nu)nYkJR^Opo z1Hr4JlXv+&L`-Nn2ANJ7w3O9NNVX{?Y)NEayoVxaEMtKl#nmkr=7PJp?8;j`_JKT) z;R(6-q)cHa(l!Xw6v;(Ld@0Z-)htrEQcW6Q_YbZX9d5o*<=v)l-v|FiR2tT%R>^VL(t4^DfX}QJ)YJeSe7E z3k(u7sed#49@zc$Qvkp2gH4Q0bXw4H^g5qH)XM7OaoE8wpmGfpSwe67U3RG*!>2oW zS$OgIPp<6*sYmWu^=-|fZ zpvn(kw(MqDzPjs$fmp`AjeI+?J%%vekcH@O1q@eJ{(|2zoHC@Wl~R6W;IF&A5=Ku2 zLIQT7hf)r+I=1qCq1?!txn$Ts7JI&jGX?s{6XLkk6;52(_{F?2tiuc#G^0maC7bkY zqGpr!x-hG#b)=Y@_d#0b-Y0tlXk*`LQI)Xc_mT-aCqFzAR7GznSGJ}NWyK(XX> zWR(^wv0U&2Nw8J5oL1i_ULmVa>aCU7OgKIETCeZvsZHMt)t{a}mQ8NxcIES99oYK| zv2%RDWF^!=g)R!b8HsZ+0Cp2xWmYiYE=dO{u{c8)NO6PwR!eY3t1d}nY?fr!8Z!Q+ zF_}CGh-AESCq<{dL{tsDvOTU0SSxv5=eGj=`yR`TWN{VZQZ->zw}Bj1n~QZf#-u)o(V;s0a|QLTboF4jG{MsLla*NXQV0nU zDi|XBww77s{9^xN|3aY3<^or?=GauHW<1CaX$diIngu0f8X<5jU%8XWx$W=6>9g>T z!Di89;bd{ukn&7KN(WRihGKs-fR{#SanF}2cA_wPXrdY@sCffu;(qcmXOkr8aCq1_ z608h?y6gwAihKG~<4uM%8=?lU?!Cj{AU)zD)sGI^NNS1+DCxx59#cGL5m5owi%^u? zELE`` z^o@@2B^Oybm_Wjq?oe>X&Q*g}r;IKA0zK6tZ!UFA&U)XkX3uv#>Ygxxc!GzD789j`pt$*rzD*vgHr zJXGoRFEX=+o`7v zDB7~@YBhgn((B)Evq=!wqNs1H_EzaEKiuTJ+VpT}3*>9|d&m}fJuTIlOzq|Vy&U?N zPig+^h3wV6-Z#Z4+pe0`q-0gLZLj567W2>ygI1~<=DKOr_h+xhjMd$)YO8M2O}0ts zn(S3on(hAJpUF(e!LuTZjukXIR%Fq!H?b0UaQ@3sS(91c+8xnaWqXj@?nU}F6zSJc zps(Q#&2YXJ{O55^&FCJGWyoFMo!59`z6H zEBo8&!3;$u3_-WB`A?N?H<-Stx8lz^9O4X%;Y9(97QXb$6=5?2I7#~6q8fb=V_ALwAQlI%-EQBhVlMP7e_#-k zbX^kV05AW{$)srcbIfF%d|7v-}z(@nfVY#TE1%*U6{~sdf#r!lZ zVsK*l4EXW%ynlIp8xj#n|9g0XUyyNRuJY~C{)6p!;FnK)@*;LXavK61A7*e{jd!pa z_qRJRCkdEq-Pv*jTyOlTy>8}1wGlz57Xw($ImcLpZ~S`&GplfdaF|nNinAU`r<|17 z20u^INlRh%TFmIj6HaZOOccA}b>s{DJq)zZUyLfZolowZ_YEQ?TYm}BwAYaDy&c_P zUzpJx8|sp7K%MzEDocM%AI+wduver#Ey0{(eFH~Z?9FD{2XhqY1MCr*7n;--GJlO{d9x1oyv`Ll~V15-Q|4=+Wyo`~{9~$f0 zA(qiyxV!K&!uhU&Gt7zYfjl-bZJBI69-j}eMSsFL&gO_&GyE-|o8yaX?$&Lm6jz00960 zlwD14+b|40XTKuAQlLZQpu^As9k9bXpu6nWA22wMk{Wem1B`*@-=*?}mQ)Gkp9iwP0GHkYUgW(XRwt%Z2{m}Fry1o2odMvJJ{JI7~(I@d&7@m0(eq(of&i>7cdd_OswHs$QU-deQw<^-4&X~_D zZNr?G6N}U`PWs;zTzgtqN+W%*4xDDnBt$=e-EZJ^8Jf=p?C1H(R1~|#CuqDzo_B^T zmh+(-NgHs{;F^{RCzl{*O2F^6lg@JNc}}<;hdS;h#FX(FFP|WNJOr+CxDdn%^c6AF zZzW7P4lsoj-yxq1gy>#v4Wt;cZ=bc3POPz}MOyf-O*r<8qwVM)4PBd@sg!<^-EE|L zC(*WP>)oEIYunI7te%*NyKbs&hSBcwJRZ=TE}QCq1d)y0z&II1LFb=&s`n$b;PlqZ zXh~v7)us!{O9o2S-i{Hs^IOUMixF)mws1Cfks1qN2s2GBxVX$T32^0lg!%9LzrX%G zRIvc88USatwOl0@YC7(lN48EsQuy3|z^e*r$E<5~FTeWw{l>S2#GjP)FcV^emyUjq zLN#n(zHn0UnNJaQQ#6;?ze)j<(OlPv$~sgd=GhE>T>QL{<)+l5zygFc(U8N{PBvOU zxXlcoADBAvPjSgB00030|GXVtkJ~o#IsO#{+J|-hDao?z-AjROnzRe-rGc|)FTeqY zEYoWvUdboP+4ze5_u~vdL{gOP-L#j7tVIrouk>&dLDC#b zFm`MY1S1GIwspjZT&jYLP0H5!e6xc%W7^HU@|z1MN-Xt#^i)k0ZUH8+4+t9*m3i)kP!~rs$di@Hc`3&Cm9?U+x#rM58{CyEPZrJm6k3aY{?0O@% z97J9>z~j@WG{UB|2+-k*ie&DsRV>mSs{>9BD$ND#|9e zVDf6I?^$H#kOr3_@yq;Y&&A>JFvb-w&XL7O*Jl()KK%)(kT?}bf&7L zLQNbrbWX%+f|Z2D^xJQ)%CjpQ}IS{ zB@(K8U3GI;#Z)4COeLbnRO;z5l`771-w-#2S9;C`a!3U`T(8U@e zTX%9QO{U?h927m#wAnPxF-=>{iEhYem_arQ;ErRYU9l655q3vWbb;*D$wJe>H|a8> zX_6x<9GopIQObZ&kW&7vFGWp#$rqGj4NqqzaY+Uue?U{*brSzaGFZ~j128CW^RxaG z786#;#MJJ3N-9*gSqCbawYq^ZzIvRetVGz`O2XU7s*Q(vr{hHH$N}6YZHyX}@+AIf zve1Th8J@|-_WO%`pY~v}Erll6J-{J>TyMo8HR2WPQKgIY9_T|K-frL*01ASKi)_j@ zG~$0Dgpr3QPi&-jkfm1bsv$ymX{t-lbX4U4u=`>I7!9)6l{c#z1!dS$>{ly%bm=7- z5|8*KAR`izF^R|o-g#n)9`Ss5d4Z|i@Z95=coFd?#G5KSlW)X>3P2ckr)>S7j>Qq{ zDN7yWWrCyjJWp#}>j}XGVFcL3rfi!)((ZZIMXEJCERhwo^81Ul4So>P6iJ>D{{;aH zdyN4Ld*2kWu;XZ9lhLMXjN5Wk&vrD_JakqS3c+2q-(9}$zEF2^n8fIN0JoNfc|;3jlMe3Z^#6rxnQ!9a1|W zk({aFbXsV;;ZC0B$Q2Qb^;YqI3tp`MJ=78xn{=6GkM`RS4Pfp}L~I<4u^(?UFvGPT zF;oBxp{2OGkNfkA3r&X9zCLdX^J^zBQf$VqXZR-HR$qa}p;npD_&PuALR^f(>>WmcM z`m6zj)~D9>di4!K$m@XOz8sSz?KCylRiy10@zriaVX!$g+&*yu_0pIn)Mk3>m@&$T zPUl+3fS5WpJ)SoR^g8(~P`^U;Yuw~9SQR%u1M@R9KgW`u z9H-QI%_E=ae=eMrsExi5@&=a4)tEs(V}Oc{@Cd3qZ_>+XC3UE z?yM6?@9VJxq9bHa;Avr&&!iCDnndGSY8&Vx9S3>*!diL{mp{!g+boHhKYe8S9;0Au0Aby=auU!#QcZBO z^yoNs?5t=Ym5E8>lZnaxg%kvvDox|GzP#aw* z+{v1PQvjn=0O4tXlWld4Wh2b7KGjF-D9|}`n9uuovAMKm0ZZ#`Q4pijF!4NaU-gFG zi2JXixCYD21zhwW9v0bF9XzgbD(~%H@a&jpTOL|q!0w9OCaPjzTlqI70qdyQ2xNYaz~wxCUlVurxUsilI7H&(AXPJ zr_pLU9eQ3!qbM3KmT~YbchtM}o$}V{XUpl}A(Umk0x?-QK5l;-p-DvHRivdz+aR+h0eICB)mo+Clt z5N9yL=dax-*q4lZ3+dG51n80jElHfB0We}o>7yi$^pJW)3M{C&9#KzsYI;?{HL( zSDx?1G@wxeKHL5znR+x?C8KdXU5>-R3*s@IM*h)Gc$kDj{n2I#!_eu*%rRb(L?a?eTS>7+`P_rfP_KPh)EM;{kG=vK6BE=j++4 zUs)NZE8O1PeT0s@xw(7$`u%(I=C>KSChx9icQ>y-++NSfyAQK>zrBCWR=oF=N{VyZ zx~Q%w4i1zL=r2!8wn`L|4jxx896T10Kd1Rm6;fccvYj&l*8T7qk8X%~6OoyXr z8O~O&vfLGygTdqDWB)$g_p|(du;r+V!H=wqKMbIi-^q{^|0vdM{>wSH{?W)f6oX_* zR|Tfy?9-%{CZCWJt9=Phtzvlwt*21cea<$^Rwph6C(L{O50A$sC z4rxs?aqf`|K-+G0nEd<-wFs=D1sB_8mmDk4c}@S<4BeGIp9iD1B_8En&O@B62kU*l z9BhKgc)+xh7$j4{H1N|fa*?7w6Oc@Wp#45wEaJdhG3DA^q)y}F;`B5eDh1vG+9w1P}ojgszO{ft$G3)?c zPG3@yQ->7AkzzGz`eT1+W(?2MtX7!ec%Pg2=P5Vr5=fhQ?T< n~|h_@GBhs=(qc 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 U6dbTJ4cq=>00{q#0|-6`0QLO#vH$=8 literal 0 HcmV?d00001 diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index ffec9972d28..45fceace18b 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -43,9 +43,9 @@ } @ args: let - version = "2.33"; - patchSuffix = "-117"; - sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; + version = "2.34"; + patchSuffix = "-115"; + sha256 = "sha256-RNJqH+ILiFOkj0cOrQHkJ56GmsFJsZXdpORKGV2YGrI="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -62,14 +62,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-117-g55446dd8a2 - $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.34/master && git describe + glibc-2.34-115-gd5d1c95aaf + $ git show --minimal --reverse glibc-2.34.. | gzip -9n --rsyncable - > 2.34-master.patch.gz To compare the archive contents zdiff can be used. - $ zdiff -u 2.33-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz + $ zdiff -u 2.34-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.34-master.patch.gz */ - ./2.33-master.patch.gz + ./2.34-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch index 39312951fcf..2fedf2a7a7d 100644 --- a/pkgs/development/libraries/glibc/nix-locale-archive.patch +++ b/pkgs/development/libraries/glibc/nix-locale-archive.patch @@ -1,7 +1,8 @@ -diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c ---- glibc-2.27-orig/locale/loadarchive.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/loadarchive.c 2018-02-17 22:32:25.680169462 -0500 -@@ -123,6 +123,23 @@ +diff --git a/locale/loadarchive.c b/locale/loadarchive.c +index 512769eaec..171dbb4ad9 100644 +--- a/locale/loadarchive.c ++++ b/locale/loadarchive.c +@@ -123,6 +123,23 @@ calculate_head_size (const struct locarhead *h) return MAX (namehash_end, MAX (string_end, locrectab_end)); } @@ -25,7 +26,7 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c /* Find the locale *NAMEP in the locale archive, and return the internalized data structure for its CATEGORY data. If this locale has -@@ -202,7 +219,7 @@ +@@ -202,7 +219,7 @@ _nl_load_locale_from_archive (int category, const char **namep) archmapped = &headmap; /* The archive has never been opened. */ @@ -34,23 +35,25 @@ diff -Naur glibc-2.27-orig/locale/loadarchive.c glibc-2.27/locale/loadarchive.c if (fd < 0) /* Cannot open the archive, for whatever reason. */ return NULL; -@@ -397,8 +414,7 @@ +@@ -397,8 +414,7 @@ _nl_load_locale_from_archive (int category, const char **namep) if (fd == -1) { - struct stat64 st; + struct __stat64_t64 st; - fd = __open_nocancel (archfname, - O_RDONLY|O_LARGEFILE|O_CLOEXEC); -+ fd = open_locale_archive (); ++ fd = open_locale_archive(); if (fd == -1) /* Cannot open the archive, for whatever reason. */ return NULL; -diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/locale.c ---- glibc-2.27-orig/locale/programs/locale.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/programs/locale.c 2018-02-17 22:36:39.726293213 -0500 -@@ -633,6 +633,24 @@ +diff --git a/locale/programs/locale.c b/locale/programs/locale.c +index ca0a95be99..e484783402 100644 +--- a/locale/programs/locale.c ++++ b/locale/programs/locale.c +@@ -633,6 +633,24 @@ nameentcmp (const void *a, const void *b) + } - static int ++static int +open_locale_archive (void) +{ + int fd = -1; @@ -68,11 +71,10 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l +} + + -+static int + static int write_archive_locales (void **all_datap, char *linebuf) { - struct stat64 st; -@@ -644,7 +662,7 @@ +@@ -645,7 +663,7 @@ write_archive_locales (void **all_datap, char *linebuf) int fd, ret = 0; uint32_t cnt; @@ -81,10 +83,11 @@ diff -Naur glibc-2.27-orig/locale/programs/locale.c glibc-2.27/locale/programs/l if (fd < 0) return 0; -diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/programs/locarchive.c ---- glibc-2.27-orig/locale/programs/locarchive.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/locale/programs/locarchive.c 2018-02-17 22:40:51.245293975 -0500 -@@ -117,6 +117,22 @@ +diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c +index f38e835c52..779a3199fc 100644 +--- a/locale/programs/locarchive.c ++++ b/locale/programs/locarchive.c +@@ -117,6 +117,22 @@ prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags, } @@ -107,7 +110,7 @@ diff -Naur glibc-2.27-orig/locale/programs/locarchive.c glibc-2.27/locale/progra static void create_archive (const char *archivefname, struct locarhandle *ah) { -@@ -578,7 +594,7 @@ +@@ -578,7 +594,7 @@ open_archive (struct locarhandle *ah, bool readonly) while (1) { /* Open the archive. We must have exclusive write access. */ From 7459a4021cb33d71598f0cbf8c798f9168638d3f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 22 Aug 2021 19:39:47 +0200 Subject: [PATCH 046/685] stdenv-bootstrap: force using new libc from stage2 This fix is needed to work around linker-errors such as undefined reference to `__libc_csu_fini' which I got in almost every derivation which is part of stage2. The reasoning behind this is that the startup-code was simplified[1] and thus `__libc_csu_fini` doesn't exist anymore. A workable solution is to use a newer libc which properly links in stage3. And actually this seems expected given the rationale for stage3: # Construct a third stdenv identical to the 2nd, except that this # one uses the rebuilt Glibc from stage2. It still uses the recent # binutils and rest of the bootstrap tools, including GCC. So this patch basically overrides the libraries inside `gcc-unwrapped` - which is basically the bootstrap tools and thus also contains the libc used in stage3 - with the shared objects from the freshly built libc from stage2. [1] https://sourceware.org/pipermail/libc-alpha/2021-March/123079.html --- pkgs/stdenv/linux/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d2c28b97ff9..e20ea9e1686 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -230,7 +230,7 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv - gcc-unwrapped coreutils gnugrep + coreutils gnugrep perl gnum4 bison; dejagnu = super.dejagnu.overrideAttrs (a: { doCheck = false; } ); @@ -254,6 +254,19 @@ in ''; }); + gcc-unwrapped = self.stdenvNoCC.mkDerivation { + inherit (prevStage.gcc-unwrapped) name; + dontUnpack = true; + dontBuild = true; + installPhase = '' + mkdir -p $out + cp -ar ${prevStage.gcc-unwrapped}/* $out/ + chmod -R a+w $out/ + cp -a ${getLibc self}/lib/* $out/lib/ + chmod -R a-w $out/ + ''; + }; + # This also contains the full, dynamically linked, final Glibc. binutils = prevStage.binutils.override { # Rewrap the binutils with the new glibc, so both the next From 7bc32b3e5cc623a7b4b0fad900db26258592b9e6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 22 Aug 2021 19:40:56 +0200 Subject: [PATCH 047/685] glibc: symlink `libpthread.so -> libpthread.so.0` (same for `-lrt`) for backwards compatibility Linking via `-lpthread` (or `-pthread`) is not needed anymore since `glibc-2.34` since all the functionality is part of `libc.so.6` and `libpthread.so.6` only exists for backwards-compatibility. However, e.g. `gcc` (`libgomp` to be precise) expects a `libpthread.so` to link against, otherwise the configure script will fail. As already stated in the glibc release-notes itself, it is to expect that a lot more applications will have issues with this, so I decided to re-add `libpthread.so` as well. For `librt.so.1`, the same thing is needed to make sure that Perl still compiles: /nix/store/d6y5r7m93x14bmgn2p75fannz39jz66f-binutils-2.35.1/bin/ld: cannot find -lrt collect2: error: ld returned 1 exit status make[1]: *** [Makefile:490: ../../lib/auto/Time/HiRes/HiRes.so] Error 1 make[1]: Leaving directory '/build/perl-5.34.0/dist/Time-HiRes' --- pkgs/development/libraries/glibc/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index caaacfe4f43..dfe1d2db7d5 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -119,6 +119,14 @@ callPackage ./common.nix { inherit stdenv; } { # Get rid of more unnecessary stuff. rm -rf $out/var $bin/bin/sln + + # Backwards-compatibility to fix e.g. + # "configure: error: Pthreads are required to build libgomp" during `gcc`-build + # because it's not actually needed anymore to link against `pthreads` since + # it's now part of `libc.so.6` itself, but the gcc build breaks if + # this doesn't work. + ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so + ln -sf $out/lib/librt.so.1 $out/lib/librt.so '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. From 49028fb110ffb19e5326879d7ec6245ebd0315d2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 23 Aug 2021 12:12:17 +0200 Subject: [PATCH 048/685] findutils: fix build w/glibc-2.34 This "-D__nonnull\\(params\\)=" leads to a compilation failure in e.g. the configure phase: configure:21131: gcc -c -D__nonnull\(params\)= conftest.c >&5 : warning: ISO C99 requires whitespace after the macro name : error: stray '\' in program : error: expected ',' or ';' before '(' token : error: stray '\' in program According to the commit this isn't even needed on Linux. I confirmed that this is an (expectable) glibc-2.34 thing by checking that * the issue doesn't occur with gcc 10/11 on a recent glibc-2.33 staging. * the issue DOES occur in a docker container with Fedora rawhide (which has glibc 2.34 and gcc 11). --- pkgs/tools/misc/findutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 3746c4b4657..56d710c8545 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/cache" ]; - CFLAGS = [ + CFLAGS = lib.optionals stdenv.isDarwin [ # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 "-D__nonnull\\(params\\)=" From 9fe34ccfbe8e80f6c0c5b2df3625e0e44d2ed070 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Aug 2021 12:38:20 +0200 Subject: [PATCH 049/685] glibc: also create backwards-compat symlinks for libdl and libutil This fixes at least the openssl build. --- pkgs/development/libraries/glibc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index dfe1d2db7d5..a48276f0b9c 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -127,6 +127,8 @@ callPackage ./common.nix { inherit stdenv; } { # this doesn't work. ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so ln -sf $out/lib/librt.so.1 $out/lib/librt.so + ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so + ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. From f363b7c5dfc50b3b3051c333678d22fd318fa89d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 27 Aug 2021 12:13:21 +0200 Subject: [PATCH 050/685] boost1{69,70,72}: fix build w/glibc-2.34 To quote the release-notes[1]: > When _DYNAMIC_STACK_SIZE_SOURCE or _GNU_SOURCE are defined, > PTHREAD_STACK_MIN is no longer constant and is redefined to > sysconf(_SC_THREAD_STACK_MIN). This supports dynamic sized register > sets for modern architectural features like Arm SVE. This basically means that if the above applies, `#if PTHREAD_STACK_MIN > 0` won't compile anymore because `PTHREAD_STACK_MIN` isn't a hard-coded number, but `__sysconf (__SC_THREAD_STACK_MIN_VALUE)`[2]. The issue (for 1.69, 1.70, 1.72 - the other versions seem OK) was reported upstream, but only for Solaris[3], however the corresponding patches[4] seem to work as well for us. Failing Hydra build: https://hydra.nixos.org/build/150926294 [1] https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html [2] See `${pkgs.glibc.dev}/include/bits/pthread_stack_min-dynamic.h` [3] https://github.com/boostorg/thread/issues/283 [4] https://github.com/conan-io/conan-center-index/pull/361 --- pkgs/development/libraries/boost/1.69.nix | 2 ++ pkgs/development/libraries/boost/1.70.nix | 2 ++ pkgs/development/libraries/boost/1.72.nix | 2 ++ .../libraries/boost/pthread-stack-min-fix.patch | 15 +++++++++++++++ 4 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/boost/pthread-stack-min-fix.patch diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix index d934e3267fc..c8846daa64f 100644 --- a/pkgs/development/libraries/boost/1.69.nix +++ b/pkgs/development/libraries/boost/1.69.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_69_0.html sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; }; + + patches = [ ./pthread-stack-min-fix.patch ]; }) diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix index bc70797acda..4d50f41e49c 100644 --- a/pkgs/development/libraries/boost/1.70.nix +++ b/pkgs/development/libraries/boost/1.70.nix @@ -8,4 +8,6 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_70_0.html sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778"; }; + + patches = [ ./pthread-stack-min-fix.patch ]; }) diff --git a/pkgs/development/libraries/boost/1.72.nix b/pkgs/development/libraries/boost/1.72.nix index bb2fccdfaf7..666a3cacb65 100644 --- a/pkgs/development/libraries/boost/1.72.nix +++ b/pkgs/development/libraries/boost/1.72.nix @@ -11,5 +11,7 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_72_0.html sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"; }; + + patches = [ ./pthread-stack-min-fix.patch ]; }) diff --git a/pkgs/development/libraries/boost/pthread-stack-min-fix.patch b/pkgs/development/libraries/boost/pthread-stack-min-fix.patch new file mode 100644 index 00000000000..b6c85f84052 --- /dev/null +++ b/pkgs/development/libraries/boost/pthread-stack-min-fix.patch @@ -0,0 +1,15 @@ +Taken from https://github.com/conan-io/conan-center-index/pull/361/files + +diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp +index aefbeb4..bc9b136 100644 +--- a/boost/thread/pthread/thread_data.hpp ++++ b/boost/thread/pthread/thread_data.hpp +@@ -57,7 +57,7 @@ namespace boost + #else + std::size_t page_size = ::sysconf( _SC_PAGESIZE); + #endif +-#if PTHREAD_STACK_MIN > 0 ++#ifdef PTHREAD_STACK_MIN + if (size Date: Fri, 27 Aug 2021 19:21:16 +0200 Subject: [PATCH 051/685] glibc: revert `/bin/bash` usage Rather than `$BASH`, `glibc` now hardcodes `/bin/bash` as interpreter[1] in several scripts (including `ldd`). This is a problem because relevant programs such as `ldd(1)` won't work properly without this since we set `BASH` to `/bin/sh` to avoid dependencies to the bootstrap tools for `bash` as runtime-dependency (since NixOS doesn't have `/bin/bash`). Considering that this was only done as an "improvement" to their build-system and not because they wanted to use some bashisms here (the variable was always called `BASH` and we still used `/bin/sh` anyways), I'd consider this to be relatively safe. [1] 5188a9d0265cc6f7235a8af1d31ab02e4a24853d --- ...l-usage-of-BASH-or-BASH-in-installed.patch | 131 ++++++++++++++++++ pkgs/development/libraries/glibc/common.nix | 2 + 2 files changed, 133 insertions(+) create mode 100644 pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch diff --git a/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch b/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch new file mode 100644 index 00000000000..45bad2867e9 --- /dev/null +++ b/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch @@ -0,0 +1,131 @@ +From f81744bae4442345ff6f40d80fdb8adaba8b330f Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Fri, 27 Aug 2021 17:19:27 +0200 +Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed + files, and hardcode /bin/bash instead" + +We need the ability to override to use `/bin/sh` here to avoid having +some bootstrap tools in a final build product. + +This reverts commit 5188a9d0265cc6f7235a8af1d31ab02e4a24853d. +--- + debug/Makefile | 5 +++-- + debug/xtrace.sh | 2 +- + elf/Makefile | 4 +++- + elf/ldd.bash.in | 2 +- + elf/sotruss.sh | 2 +- + malloc/Makefile | 5 +++-- + malloc/memusage.sh | 2 +- + timezone/Makefile | 3 ++- + 8 files changed, 15 insertions(+), 10 deletions(-) + +diff --git a/debug/Makefile b/debug/Makefile +index 6893111cbf..3f66666c6c 100644 +--- a/debug/Makefile ++++ b/debug/Makefile +@@ -216,7 +216,8 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o + + $(objpfx)xtrace: xtrace.sh + rm -f $@.new +- sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \ +- -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \ ++ sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ ++ -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \ ++ -e 's|@PKGVERSION@|$(PKGVERSION)|' \ + -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ + && rm -f $@ && mv $@.new $@ && chmod +x $@ +diff --git a/debug/xtrace.sh b/debug/xtrace.sh +index 9697fbe0b4..279fe59ac6 100755 +--- a/debug/xtrace.sh ++++ b/debug/xtrace.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#! @BASH@ + # Copyright (C) 1999-2021 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + # Contributed by Ulrich Drepper , 1999. +diff --git a/elf/Makefile b/elf/Makefile +index d05f410592..9264409fdd 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -144,7 +144,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ + $(common-objpfx)libc_nonshared.a + + $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make +- sed -e 's%@VERSION@%$(version)%g' \ ++ sed -e 's%@BASH@%$(BASH)%g' \ ++ -e 's%@VERSION@%$(version)%g' \ + -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \ + -e 's%@PREFIX@%$(prefix)%g' \ + -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ +@@ -659,6 +660,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ + -e 's%@VERSION@%$(version)%g' \ + -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ + -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ ++ -e 's%@BASH@%$(BASH)%g' \ + -e 's%@TEXTDOMAINDIR@%$(localedir)%g' + + ifeq ($(ldd-rewrite-script),no) +diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in +index ba736464ac..57442bc3f2 100644 +--- a/elf/ldd.bash.in ++++ b/elf/ldd.bash.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#! @BASH@ + # Copyright (C) 1996-2021 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + +diff --git a/elf/sotruss.sh b/elf/sotruss.sh +index 003cf4d825..fd4da80244 100755 +--- a/elf/sotruss.sh ++++ b/elf/sotruss.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#! @BASH@ + # Copyright (C) 2011-2021 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + +diff --git a/malloc/Makefile b/malloc/Makefile +index 9b70831d38..90ecadff6c 100644 +--- a/malloc/Makefile ++++ b/malloc/Makefile +@@ -271,8 +271,9 @@ $(objpfx)mtrace: mtrace.pl + + $(objpfx)memusage: memusage.sh + rm -f $@.new +- sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \ +- -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \ ++ sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ ++ -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \ ++ -e 's|@PKGVERSION@|$(PKGVERSION)|' \ + -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ + && rm -f $@ && mv $@.new $@ && chmod +x $@ + +diff --git a/malloc/memusage.sh b/malloc/memusage.sh +index 0645f09911..c1cd4e23b7 100755 +--- a/malloc/memusage.sh ++++ b/malloc/memusage.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#! @BASH@ + # Copyright (C) 1999-2021 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + # Contributed by Ulrich Drepper , 1999. +diff --git a/timezone/Makefile b/timezone/Makefile +index c624a189b3..395abfeebd 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -123,7 +123,8 @@ $(testdata)/XT%: testdata/XT% + cp $< $@ + + $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make +- sed -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ ++ sed -e 's|/bin/bash|$(BASH)|' \ ++ -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ + -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ + -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ + -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ +-- +2.31.1 + diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 45fceace18b..599a7f2a130 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -125,6 +125,8 @@ stdenv.mkDerivation ({ /* https://github.com/NixOS/nixpkgs/pull/137601 */ ./nix-nss-open-files.patch + + ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; From 2357e828f5dc9fca7dc9df0e62f210c79f948649 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 23 Sep 2021 23:37:00 +0200 Subject: [PATCH 052/685] gdb: fix build w/glibc-2.34 This is a problem that seems to be related to the most recent `gdb` update in staging from 10.2 to 11.1[1] where `gdb` started to fail during build with the following message: checking for stdlib.h... In file included from /nix/store/vf96x4h90fm7bwf5zvfx8zb82fm1p21j-glibc-2.34-5-dev/include/signal.h:328, from ../../gnulib/import/signal.h:52, from targ-map.c:7: targ-map.c:412:17: error: initializer element is not constant 412 | { "SIGSTKSZ", SIGSTKSZ, TARGET_SIGSTKSZ }, | ^~~~~~~~ targ-map.c:412:17: note: (near initialization for 'cb_init_signal_map[18].host_val') Since I couldn't find any patches in the upstream repo or for other repos - according to Repology we seem to be the only distro trying to ship `gdb-11` with `glibc-2.34` - so I found the culprit while bisecting `gdb` which seems to be commit `a0e674c1`[2]. It seems as if the entire `sim/`-subtree is now built by default if `--enable-targets=all` is set (which we do for cross debugging). However it also generates a file called `targ-map.c` referencing `SIGSTKSZ` assuming that it's const, although this is not the case anymore with `glibc-2.34`[3]. Since I don't really understand, what precisely is going on in there and there are no patches available I decided to switch back to the 10.2 behavior here and disable the feature by specifying `--disable-sim` as configure flag. Failing Hydra build: https://hydra.nixos.org/build/153893135 [1] 43b96f66ef7a69602b74f9bced64573c11a1df05 [2] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=a0e674c1ce2c877426f8a861c5294c535c5d49e6 [3] see https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html --- pkgs/development/tools/misc/gdb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 5bb5bc0652f..91947a024d7 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { "--disable-shared" "--enable-static" "--with-system-zlib" "--with-system-readline" + "--disable-sim" "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" From 3aa6c49ab4a6b094ab6f125303b674bb99985f35 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 8 Sep 2021 19:23:41 +0200 Subject: [PATCH 053/685] libressl: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/151984996 --- .../libraries/libressl/default.nix | 4 + .../libressl/fix-build-with-glibc.patch | 92 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 pkgs/development/libraries/libressl/fix-build-with-glibc.patch diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 7a2718c0153..4de1d7e7d15 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -89,6 +89,10 @@ in { libressl_3_2 = generic { version = "3.2.7"; sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw"; + patches = [ + # See https://github.com/libressl-portable/portable/issues/653 for context. + ./fix-build-with-glibc.patch + ]; }; libressl_3_4 = generic { version = "3.4.2"; diff --git a/pkgs/development/libraries/libressl/fix-build-with-glibc.patch b/pkgs/development/libraries/libressl/fix-build-with-glibc.patch new file mode 100644 index 00000000000..db482bcb35d --- /dev/null +++ b/pkgs/development/libraries/libressl/fix-build-with-glibc.patch @@ -0,0 +1,92 @@ +diff --git a/tests/explicit_bzero.c b/tests/explicit_bzero.c +index 34c60baa8a..9c0e917829 100644 +--- a/tests/explicit_bzero.c ++++ b/tests/explicit_bzero.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: explicit_bzero.c,v 1.6 2014/07/11 01:10:35 matthew Exp $ */ ++/* $OpenBSD: explicit_bzero.c,v 1.7 2021/03/27 11:17:58 bcook Exp $ */ + /* + * Copyright (c) 2014 Google Inc. + * +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -36,19 +37,33 @@ enum { + SECRETBYTES = SECRETCOUNT * sizeof(secret) + }; + +-static char altstack[SIGSTKSZ + SECRETBYTES]; ++/* ++ * As of glibc 2.34, when _GNU_SOURCE is defined, SIGSTKSZ is no longer ++ * constant on Linux. SIGSTKSZ is redefined to sysconf (_SC_SIGSTKSZ). ++ */ ++static char *altstack; ++#define ALTSTACK_SIZE (SIGSTKSZ + SECRETBYTES) + + static void + setup_stack(void) + { ++ altstack = calloc(1, ALTSTACK_SIZE); ++ ASSERT_NE(NULL, altstack); ++ + const stack_t sigstk = { + .ss_sp = altstack, +- .ss_size = sizeof(altstack), ++ .ss_size = ALTSTACK_SIZE + }; + + ASSERT_EQ(0, sigaltstack(&sigstk, NULL)); + } + ++static void ++cleanup_stack(void) ++{ ++ free(altstack); ++} ++ + static void + assert_on_stack(void) + { +@@ -129,7 +144,7 @@ test_without_bzero() + char buf[SECRETBYTES]; + assert_on_stack(); + populate_secret(buf, sizeof(buf)); +- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf)); ++ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); + ASSERT_NE(NULL, res); + return (res); + } +@@ -140,7 +155,7 @@ test_with_bzero() + char buf[SECRETBYTES]; + assert_on_stack(); + populate_secret(buf, sizeof(buf)); +- char *res = memmem(altstack, sizeof(altstack), buf, sizeof(buf)); ++ char *res = memmem(altstack, ALTSTACK_SIZE, buf, sizeof(buf)); + ASSERT_NE(NULL, res); + explicit_bzero(buf, sizeof(buf)); + return (res); +@@ -183,15 +198,17 @@ main() + * on the stack. This sanity checks that call_on_stack() and + * populate_secret() work as intended. + */ +- memset(altstack, 0, sizeof(altstack)); ++ memset(altstack, 0, ALTSTACK_SIZE); + call_on_stack(do_test_without_bzero); + + /* + * Now test with a call to explicit_bzero() and check that we + * *don't* find any instances of the secret data. + */ +- memset(altstack, 0, sizeof(altstack)); ++ memset(altstack, 0, ALTSTACK_SIZE); + call_on_stack(do_test_with_bzero); + ++ cleanup_stack(); ++ + return (0); + } From 8631ba18eee7fe48dc17244fa8b6425b3d84201e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 16 Sep 2021 23:04:56 +0200 Subject: [PATCH 054/685] fuse: fix build w/glibc-2.34 `closefrom` is now a part of `glibc-2.34`[1]: > * The function closefrom has been added. It closes all file descriptors > greater than or equal to a given integer. This function is a GNU extension, > although it is also present in other systems. Failing Hydra build: https://hydra.nixos.org/build/152456339 [1] https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html --- pkgs/os-specific/linux/fuse/common.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 5adb1b5355a..88035cf60c8 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -31,7 +31,13 @@ in stdenv.mkDerivation rec { }) ++ (if isFuse3 then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ] - else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]); + else [ + ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch?id=8a970396fca7aca2d5a761b8e7a8242f1eef14c9"; + sha256 = "sha256-ELYBW/wxRcSMssv7ejCObrpsJHtOPJcGq33B9yHQII4="; + }) + ]); nativeBuildInputs = if isFuse3 then [ meson ninja pkg-config ] From 486f248ce46043cd4c76e60012c83a14f310784e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 16 Sep 2021 23:16:02 +0200 Subject: [PATCH 055/685] catch: fix build w/glibc-2.34 The issue was that `SIGSTKSZ` isn't an actual const anymore and thus can't be used to define sizes of static variables such as static char foo[SIGSTKSZ]; since this results in compiler errors such as error: array bound is not an integer constant before ']' token Fedora worked around this by hard-coding the value in `catch`. Since this is mainly a testing-framework and there's no other fix for v1 - we should eventually remove it entirely in favor of v2 anyways - I guess this is a good-enough fix. Failing Hydra build: https://hydra.nixos.org/build/152455108 --- pkgs/development/libraries/catch/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index c89fbd477c9..c4d64a0f478 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { url = "https://github.com/catchorg/Catch2/commit/bb6d08323f23a39eb65dd86671e68f4f5d3f2d6c.patch"; sha256 = "1vhbzx84nrhhf9zlbl6h5zmg3r5w5v833ihlswsysb9wp2i4isc5"; }) + + # Fix glibc-2.34 build + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/catch1/raw/23276476148a657e7a45ade547f858cbf965a33a/f/catch1-sigstksz.patch"; + sha256 = "sha256-XSsI3iDEZCUSbozlYWC0y/LZ7qr/5zwACpn1jHKD0yU="; + }) ]; doCheck = true; From f81f59dfce012b9835980e2865e1c107fca009c8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Sep 2021 22:25:19 +0200 Subject: [PATCH 056/685] autofs: fix build w/glibc-2.34 This build was also broken by a libc const that isn't a number anymore and thus can't be used at places where a constant value is needed: automount.c:86:37: error: initializer element is not constant Failing Hydra build: https://hydra.nixos.org/build/153253104 --- pkgs/os-specific/linux/autofs/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 7b29f5a0e5c..5e552301fe4 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs -, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: +, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto +, fetchpatch +}: stdenv.mkDerivation rec { version = "5.1.6"; @@ -10,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx"; }; + patches = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/autofs/raw/cc745af5e42396d540d5b3b92fae486e232bf6bd/f/autofs-5.1.7-use-default-stack-size-for-threads.patch"; + sha256 = "sha256-6ETDFbW7EhHR03xFWF+6OJBgn9NX3WW3bGhTNGodaOc="; + excludes = [ "CHANGELOG" ]; + }) + ]; + preConfigure = '' configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH" export sssldir="${sssd}/lib/sssd/modules" From b9078e581b20e613dfd3a36a262d2da31c74ce81 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 18 Sep 2021 19:42:06 +0200 Subject: [PATCH 057/685] qt515.qtwebengine: fix build w/glibc-2.34 Derived from Fedora 35: https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/d122c011631137b79455850c363676c655cf9e09?branch=rawhide Failing Hydra build: https://hydra.nixos.org/build/153232768 --- pkgs/development/libraries/qt-5/5.15/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5943a80a701..74b92dda1df 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -56,7 +56,13 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = lib.optionals stdenv.isDarwin [ + qtwebengine = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch"; + sha256 = "sha256-1zS7nvbe5ZVuW/wSNOUBc2Qz0aB483Kfnz1JbzKEI+M="; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ]; From 0caf7e5f0c53b2a3c7320e376eda97e1b29baa68 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 18 Sep 2021 19:49:29 +0200 Subject: [PATCH 058/685] qt514.qtwebengine: fix build w/glibc-2.34 Same problem here as with QT 5.15. Failing Hydra build: https://hydra.nixos.org/build/153224604 --- pkgs/development/libraries/qt-5/5.14/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 65ce74dac02..5a3bf205fbc 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -96,6 +96,12 @@ let stripLen = 1; extraPrefix = "src/3rdparty/"; }) + + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/4cef673b2dd01ce85ce7a841cf352104bbe79668/f/qtwebengine-everywhere-5.15.2-SIGSTKSZ.patch"; + sha256 = "sha256-2D0/FL4PBL4p6ccd6JoDAGqNtLs2aeE1OdM+PJItock="; + }) ] ++ lib.optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ (fetchpatch { From 96418eb0e78ccce10d8c9e07457fa0c754cb04e8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 18 Sep 2021 20:09:57 +0200 Subject: [PATCH 059/685] rcs: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/153235059 --- pkgs/applications/version-management/rcs/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index d46a67a8601..6982bd43b26 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Q93+EHJKi4XiRo9kA7YABzcYbwHmDgvWL95p2EIjTMU="; }; + patches = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/rcs/raw/f8e07cd37f4abfb36e37d41852bb8f9e234d3fb1/f/rcs-5.10.0-SIGSTKSZ.patch"; + sha256 = "sha256-mc6Uye9mdEsLBcOnf1m1TUb1BV0ncNU//iKBpLGBjho="; + }) + ]; + ac_cv_path_ED = "${ed}/bin/ed"; DIFF = "${diffutils}/bin/diff"; DIFF3 = "${diffutils}/bin/diff3"; From 48d713574293092544bd7deae2cef1e789f478e1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 21 Sep 2021 11:38:58 +0200 Subject: [PATCH 060/685] emacs: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/153252802 --- pkgs/applications/editors/emacs/27.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix index 436785c34f6..064231b2456 100644 --- a/pkgs/applications/editors/emacs/27.nix +++ b/pkgs/applications/editors/emacs/27.nix @@ -7,5 +7,10 @@ import ./generic.nix (rec { url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082"; sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg="; }) + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/emacs/raw/181aafcdb7ee2fded9fce4cfc448f27edccc927f/f/emacs-glibc-2.34.patch"; + sha256 = "sha256-2o3C/jhZPl2OW/LmVPt/fhdwbS9NOdF9lVEF1Kn9aEk="; + }) ]; }) From 1470227ef41c4b101c77f3f1969d3978678215df Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 Sep 2021 19:23:43 +0200 Subject: [PATCH 061/685] postfix: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/154082134 --- pkgs/servers/mail/postfix/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 08c55f77172..942023b4eaf 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl , coreutils, findutils, gnugrep, gawk, icu, pcre, m4 +, fetchpatch , buildPackages, nixosTests , withLDAP ? true, openldap , withPgSQL ? false, postgresql @@ -46,6 +47,12 @@ in stdenv.mkDerivation rec { ./postfix-3.0-no-warnings.patch ./post-install-script.patch ./relative-symlinks.patch + + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/postfix/raw/2f9d42453e67ebc43f786d98262a249037f80a77/f/postfix-3.6.2-glibc-234-build-fix.patch"; + sha256 = "sha256-xRUL5gaoIt6HagGlhsGwvwrAfYvzMgydsltYMWvl9BI="; + }) ]; postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' From 917b7e5fd2e29346040dc95a39cae17f92eae0dc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 Sep 2021 21:18:53 +0200 Subject: [PATCH 062/685] ocaml: fix build w/glibc-2.34 ChangeLog: https://hydra.nixos.org/build/154122673 --- pkgs/development/compilers/ocaml/4.12.nix | 5 +++++ pkgs/development/compilers/ocaml/generic.nix | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix index 0662e66e0b6..949ca185a3c 100644 --- a/pkgs/development/compilers/ocaml/4.12.nix +++ b/pkgs/development/compilers/ocaml/4.12.nix @@ -3,4 +3,9 @@ import ./generic.nix { minor_version = "12"; patch_version = "0"; sha256 = "1hxy349jfa2vkfgmxf6pvd9w4z5bmcgsg0fxfdabcghyvjw9vvir"; + patches = [ + { url = "https://src.fedoraproject.org/rpms/ocaml/raw/129153b85109944bf0b2922949f77ef8f32b39a1/f/0004-Dynamically-allocate-the-alternate-signal-stack-1026.patch"; + sha256 = "sha256-FdQ1HkMKHU9QvgLPUBvMdPiEa7w7IL3+1F3SLv63Gog="; + } + ]; } diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index ec52e56c1fa..debc3d4272a 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -1,4 +1,4 @@ -{ minor_version, major_version, patch_version +{ minor_version, major_version, patch_version, patches ? [] , ...}@args: let versionNoPatch = "${toString major_version}.${toString minor_version}"; @@ -6,7 +6,7 @@ let safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic); in -{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind +{ lib, stdenv, fetchurl, ncurses, buildEnv, libunwind, fetchpatch , libX11, xorgproto, useX11 ? safeX11 stdenv && !lib.versionAtLeast version "4.09" , aflSupport ? false , flambdaSupport ? false @@ -44,6 +44,8 @@ stdenv.mkDerivation (args // { inherit src; + patches = map fetchpatch patches; + strictDeps = true; prefixKey = "-prefix "; From 8e16dcc4aa268de14fdaa0fac4acf7c7a11df903 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Oct 2021 20:00:54 +0200 Subject: [PATCH 063/685] openjdk11: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/154132196 --- pkgs/development/compilers/openjdk/11.nix | 1 + pkgs/development/compilers/openjdk/16.nix | 1 + .../compilers/openjdk/fix-glibc-2.34.patch | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/fix-glibc-2.34.patch diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 6f4b78286d6..8c45bece9ad 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -40,6 +40,7 @@ let ./currency-date-range-jdk10.patch ./increase-javadoc-heap.patch ./fix-library-path-jdk11.patch + ./fix-glibc-2.34.patch ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk10.patch ]; diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index e6fd12a632b..0a4a8e1de41 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -48,6 +48,7 @@ let url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) + ./fix-glibc-2.34.patch ] ++ lib.optionals (!headless && enableGnome2) [ ./swing-use-gtk-jdk13.patch ]; diff --git a/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch b/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch new file mode 100644 index 00000000000..7bf8b2b1674 --- /dev/null +++ b/pkgs/development/compilers/openjdk/fix-glibc-2.34.patch @@ -0,0 +1,24 @@ +Taken from https://build.opensuse.org/package/view_file/Java:Factory/java-15-openjdk/openjdk-glibc234.patch + +--- openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2021-04-09 11:36:58.000000000 +0200 ++++ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c 2021-08-26 15:42:52.326232581 +0200 +@@ -67,8 +67,17 @@ + longjmp(context, 1); + } + ++static char* altstack = NULL; ++ + void set_signal_handler() { +- static char altstack[SIGSTKSZ]; ++ if (altstack == NULL) { ++ // Dynamically allocated in case SIGSTKSZ is not constant ++ altstack = malloc(SIGSTKSZ); ++ if (altstack == NULL) { ++ fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n"); ++ exit(7); ++ } ++ } + + stack_t ss = { + .ss_size = SIGSTKSZ, + From f97b9951865b659bd0ee3ae6662676ad0efafa4b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Oct 2021 22:29:02 +0200 Subject: [PATCH 064/685] texinfo: fix build w/glibc-2.34 --- pkgs/development/tools/misc/texinfo/6.8.nix | 4 + .../development/tools/misc/texinfo/common.nix | 4 +- .../tools/misc/texinfo/fix-glibc-2.34.patch | 186 ++++++++++++++++++ 3 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch diff --git a/pkgs/development/tools/misc/texinfo/6.8.nix b/pkgs/development/tools/misc/texinfo/6.8.nix index 11435bf329f..992f695bc92 100644 --- a/pkgs/development/tools/misc/texinfo/6.8.nix +++ b/pkgs/development/tools/misc/texinfo/6.8.nix @@ -1,4 +1,8 @@ import ./common.nix { version = "6.8"; sha256 = "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf"; + patches = [ + # glibc 2.34 compat + ./fix-glibc-2.34.patch + ]; } diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index b379df09a4b..e47d3369de9 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -1,4 +1,4 @@ -{ version, sha256 }: +{ version, sha256, patches ? [] }: { lib, stdenv, buildPackages, fetchurl, perl, xz, gettext @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit sha256; }; - patches = optional crossBuildTools ./cross-tools-flags.patch; + patches = patches ++ (optional crossBuildTools ./cross-tools-flags.patch); # ncurses is required to build `makedoc' # this feature is introduced by the ./cross-tools-flags.patch diff --git a/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch b/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch new file mode 100644 index 00000000000..60f2e63b7ce --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/fix-glibc-2.34.patch @@ -0,0 +1,186 @@ + +Patch by Vitezslav Crhonek +Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide + +diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h +--- texinfo-6.8/gnulib/lib/cdefs.h.orig 2021-03-11 19:57:53.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/cdefs.h 2021-07-19 12:26:46.985176475 +0200 +@@ -321,15 +321,15 @@ + + /* The nonnull function attribute marks pointer parameters that + must not be NULL. */ +-#ifndef __attribute_nonnull__ ++#ifndef __nonnull + # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) +-# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) ++# define __nonnull(params) __attribute__ ((__nonnull__ params)) + # else +-# define __attribute_nonnull__(params) ++# define __nonnull(params) + # endif +-#endif +-#ifndef __nonnull +-# define __nonnull(params) __attribute_nonnull__ (params) ++#elif !defined __GLIBC__ ++# undef __nonnull ++# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params) + #endif + + /* If fortification mode, we warn about unused results of certain +diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h +--- texinfo-6.8/gnulib/lib/libc-config.h.orig 2021-03-11 19:57:54.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/libc-config.h 2021-07-19 12:27:58.810590975 +0200 +@@ -33,9 +33,9 @@ + #include + + /* On glibc this includes and and #defines +- _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and +- DragonFlyBSD 5.9 it includes which defines __nonnull. +- Elsewhere it is harmless. */ ++ _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it ++ includes which defines __nonnull. Elsewhere it ++ is harmless. */ + #include + + /* From glibc . */ +diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c +--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-03-11 19:57:54.000000000 +0100 ++++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c 2021-07-19 12:24:46.878419397 +0200 +@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY + + /* Initialize a dynamic array object. This must be called before any + use of the object. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static void + DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list) + { +@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST + } + + /* Deallocate the dynamic array and its elements. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_FREE (struct DYNARRAY_STRUCT *list) + { +@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l + } + + /* Return true if the dynamic array is in an error state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline bool + DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list) + { +@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct + + /* Mark the dynamic array as failed. All elements are deallocated as + a side effect. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static void + DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list) + { +@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA + + /* Return the number of elements which have been added to the dynamic + array. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline size_t + DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list) + { +@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR + + /* Return a pointer to the array element at INDEX. Terminate the + process if INDEX is out of bounds. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index) + { +@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU + /* Return a pointer to the first array element, if any. For a + zero-length array, the pointer can be NULL even though the dynamic + array has not entered the failure state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list) + { +@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S + /* Return a pointer one element past the last array element. For a + zero-length array, the pointer can be NULL even though the dynamic + array has not entered the failure state. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline DYNARRAY_ELEMENT * + DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list) + { +@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S + /* Add ITEM at the end of the array, enlarging it by one element. + Mark *LIST as failed if the dynamic array allocation size cannot be + increased. */ +-__attribute_nonnull__ ((1)) ++__nonnull ((1)) + static inline void + DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item) + { +@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR + /* Allocate a place for a new element in *LIST and return a pointer to + it. The pointer can be NULL if the dynamic array cannot be + enlarged due to a memory allocation failure. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) + static + /* Avoid inlining with the larger initialization code. */ + #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE)) +@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY + existing size, new elements are added (which can be initialized). + Otherwise, the list is truncated, and elements are freed. Return + false on memory allocation failure (and mark *LIST as failed). */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static bool + DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size) + { +@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_ + } + + /* Remove the last element of LIST if it is present. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list) + { +@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA + + /* Remove all elements from the list. The elements are freed, but the + list itself is not. */ +-__attribute_maybe_unused__ __attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __nonnull ((1)) + static void + DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list) + { +@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S + stored in *RESULT if LIST refers to an empty list. On success, the + pointer in *RESULT is heap-allocated and must be deallocated using + free. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1, 2)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2)) + static bool + DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, + DYNARRAY_FINAL_TYPE *result) +@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA + have a sentinel at the end). If LENGTHP is not NULL, the array + length is written to *LENGTHP. *LIST is re-initialized and can be + reused. */ +-__attribute_maybe_unused__ __attribute_warn_unused_result__ +-__attribute_nonnull__ ((1)) ++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1)) + static DYNARRAY_ELEMENT * + DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp) + { From bcf8aeff3c7fbf92d576f89dad6a21913f7eb37a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Oct 2021 13:21:25 +0200 Subject: [PATCH 065/685] ocaml 4.10/4.11: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155189331 Applied a smaller patch from Fedora's fork[1] as it also applies on older versions. That said, these versions seem unmaintained anyways, so we should probably drop them entirely. [1] https://pagure.io/fedora-ocaml/c/dfb5e954a04f59b0456cc4c0ddf3acaf22e0ff07?branch=fedora-35-4.12.0 --- pkgs/development/compilers/ocaml/4.10.nix | 3 ++ pkgs/development/compilers/ocaml/4.11.nix | 3 ++ pkgs/development/compilers/ocaml/generic.nix | 4 +- .../glibc-2.34-for-ocaml-4.10-and-11.patch | 37 +++++++++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix index 78051040b57..48d01a5a8c8 100644 --- a/pkgs/development/compilers/ocaml/4.10.nix +++ b/pkgs/development/compilers/ocaml/4.10.nix @@ -3,4 +3,7 @@ import ./generic.nix { minor_version = "10"; patch_version = "2"; sha256 = "sha256-locUYQeCgtXbAiB32JveJchfteN2YStE+MN9ToTwAOM="; + patches = [ + ./glibc-2.34-for-ocaml-4.10-and-11.patch + ]; } diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index 3e5aefc11f1..6a2e4f61f80 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -3,4 +3,7 @@ import ./generic.nix { minor_version = "11"; patch_version = "2"; sha256 = "1m3wrgkkv3f77wvcymjm0i2srxzmx62y6jln3i0a2px07ng08l9z"; + patches = [ + ./glibc-2.34-for-ocaml-4.10-and-11.patch + ]; } diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index debc3d4272a..cd1bccd1800 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -35,6 +35,8 @@ let x11env = buildEnv { name = "x11env"; paths = [libX11 xorgproto]; }; x11lib = x11env + "/lib"; x11inc = x11env + "/include"; + + fetchpatch' = x: if builtins.isAttrs x then fetchpatch x else x; in stdenv.mkDerivation (args // { @@ -44,7 +46,7 @@ stdenv.mkDerivation (args // { inherit src; - patches = map fetchpatch patches; + patches = map fetchpatch' patches; strictDeps = true; diff --git a/pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch b/pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch new file mode 100644 index 00000000000..4ff9e6fddba --- /dev/null +++ b/pkgs/development/compilers/ocaml/glibc-2.34-for-ocaml-4.10-and-11.patch @@ -0,0 +1,37 @@ +From dfb5e954a04f59b0456cc4c0ddf3acaf22e0ff07 Mon Sep 17 00:00:00 2001 +From: Richard W.M. Jones +Date: Feb 28 2021 20:45:47 +0000 +Subject: Workaround for glibc non-constant SIGSTKSZ + + +https://github.com/ocaml/ocaml/issues/10250 + +Signed-off-by: Richard W.M. Jones + +--- + +diff --git a/runtime/signals_nat.c b/runtime/signals_nat.c +index 8b64ab4..7f0a975 100644 +--- a/runtime/signals_nat.c ++++ b/runtime/signals_nat.c +@@ -181,7 +181,19 @@ DECLARE_SIGNAL_HANDLER(trap_handler) + #error "CONTEXT_SP is required if HAS_STACK_OVERFLOW_DETECTION is defined" + #endif + ++#ifndef __GLIBC__ + static char sig_alt_stack[SIGSTKSZ]; ++#else ++/* glibc 2.34 has non-constant SIGSTKSZ */ ++static char *sig_alt_stack; ++ ++static void allocate_sig_alt_stack(void) __attribute__((constructor)); ++static void ++allocate_sig_alt_stack(void) ++{ ++ sig_alt_stack = malloc(SIGSTKSZ); ++} ++#endif + + /* Code compiled with ocamlopt never accesses more than + EXTRA_STACK bytes below the stack pointer. */ + From f8a7d99e54e0a7cc0a41e89c74e04015aafdc369 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 9 Oct 2021 22:55:55 +0200 Subject: [PATCH 066/685] spdlog: 1.8.5 -> 1.9.2, fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155163350 --- pkgs/development/libraries/spdlog/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index d4e0888ffd2..2857b8776f6 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }: +{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch }: let generic = { version, sha256 }: @@ -13,6 +13,14 @@ let inherit sha256; }; + patches = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://github.com/gabime/spdlog/commit/d54b8e89c058f3cab2b32b3e9a2b49fd171d5895.patch"; + sha256 = "sha256-pb7cREF90GXb5Mbs8xFLQ+eLo6Xum13/xYa8JUgJlbI="; + }) + ]; + nativeBuildInputs = [ cmake ]; # spdlog <1.3 uses a bundled version of fmt propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; From 49a7ee9604b6c4c0a7389baa293b9f57a331ed9c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 9 Oct 2021 23:09:45 +0200 Subject: [PATCH 067/685] seasocks: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155145624 --- pkgs/development/libraries/seasocks/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index fd53db0dcf9..044948a012e 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib, catch2 }: stdenv.mkDerivation rec { pname = "seasocks"; @@ -11,9 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1f9a3mx3yjmr5qry4rc1c7mrx3348iifxm7d8sj8yd41kqnzmfv4"; }; + postPatch = '' + cp ${catch2}/include/catch2/catch.hpp src/test/c/catch/catch2/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python3 ]; + doCheck = true; + meta = with lib; { homepage = "https://github.com/mattgodbolt/seasocks"; description = "Tiny embeddable C++ HTTP and WebSocket server"; From c2050675d6c7f9d2a7aaaa3d3d00c7b4f22753cc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 9 Oct 2021 23:24:31 +0200 Subject: [PATCH 068/685] leatherman: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155215198 --- pkgs/development/libraries/leatherman/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 874c567ed42..05cf84144fe 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; From b770794ce34ad8d1f03a24954123d4c41487286c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 9 Oct 2021 23:37:51 +0200 Subject: [PATCH 069/685] eternal-terminal: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/154077447 --- pkgs/tools/networking/eternal-terminal/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 035a99103fc..0fb559afc99 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -7,6 +7,7 @@ , openssl , protobuf , zlib +, catch2 }: stdenv.mkDerivation rec { @@ -20,6 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-cCZbG0CD5V/FTj1BuVr083EJ+BCgIcKHomNtpJb3lOo="; }; + preBuild = '' + cp ${catch2}/include/catch2/catch.hpp ../external_imported/Catch2/single_include/catch2/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; @@ -42,6 +47,8 @@ stdenv.mkDerivation rec { "-std=c++17" ]; + doCheck = true; + meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; From c905ab58a2fe60e0a34b3c1ed13b28b573267da3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 Oct 2021 14:18:20 +0200 Subject: [PATCH 070/685] trenchbroom: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155141010 --- pkgs/applications/misc/trenchbroom/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index 8a702506060..a49fbf71191 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -21,6 +21,19 @@ stdenv.mkDerivation rec { --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \ --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \ --subst-var-by GIT_DESCRIBE v${version} + + # Tests don't compile because of vendored `catch2` being incompatible with glibc-2.34. + # Also, no need to since we don't even run them. + substituteInPlace lib/CMakeLists.txt \ + --replace "add_subdirectory(Catch2)" "" + substituteInPlace lib/vecmath/CMakeLists.txt \ + --replace "add_subdirectory(test)" "" \ + --replace "add_subdirectory(lib)" "" + substituteInPlace lib/kdl/CMakeLists.txt \ + --replace "add_subdirectory(test)" "" + substituteInPlace common/CMakeLists.txt \ + --replace "add_subdirectory(test)" "" \ + --replace "add_subdirectory(benchmark)" "" ''; nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems ]; From 7c5781615febc475d9b33ae07d2cdf634b50a783 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Oct 2021 14:35:47 +0200 Subject: [PATCH 071/685] trafficserver: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155205200 --- pkgs/servers/http/trafficserver/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 9058a4cbda7..06d640a5bc0 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -13,6 +13,7 @@ , python3 , xz , zlib +, catch2 # recommended dependencies , withHwloc ? true , hwloc @@ -113,6 +114,8 @@ stdenv.mkDerivation rec { tools/check-unused-dependencies substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' + + cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure \ --replace '/usr/include/linux' '${linuxHeaders}/include/linux' From d4593d4dafa3dab28acb76eb0256081077fcc15d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Oct 2021 14:46:46 +0200 Subject: [PATCH 072/685] pdfslicer: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155183850 --- pkgs/applications/misc/pdfslicer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/applications/misc/pdfslicer/default.nix index 31bc4714015..ed20f460a16 100644 --- a/pkgs/applications/misc/pdfslicer/default.nix +++ b/pkgs/applications/misc/pdfslicer/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { sha256 = "0sja0ddd9c8wjjpzk2ag8q1lxpj09adgmhd7wnsylincqnj2jyls"; }; + postPatch = '' + # Don't build tests, vendored catch doesn't build with latest glibc. + substituteInPlace CMakeLists.txt \ + --replace "add_subdirectory (tests)" "" + ''; + nativeBuildInputs = [ cmake gettext From a3f4ff59ae365e1f10b5fa36dd802eb7d7b326f6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Oct 2021 14:56:50 +0200 Subject: [PATCH 073/685] openmw: mark as broken --- pkgs/games/openmw/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index edc8147a2b7..8746d3172ac 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -83,5 +83,10 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar marius851000 ]; platforms = platforms.linux; + + # 2021-10-13, doesn't compile with glibc-2.34, maintainers prefer a fix on glibc's end. + # Can be marked as un-broken as soon as https://gitlab.com/OpenMW/openmw/-/merge_requests/1239 + # is resolved and a patch is appliable here. + broken = true; }; } From dbe99a0172e9316cf5f3a9c6a3935efeecb1b1fc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Oct 2021 18:59:14 +0200 Subject: [PATCH 074/685] ntp: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155170191 Patch derived from linuxfromscratch/openembedded.org[1][2]. [1] https://www.linuxfromscratch.org/blfs/view/svn/basicnet/ntp.html [2] https://patchwork.openembedded.org/patch/180019/ --- pkgs/tools/networking/ntp/default.nix | 5 ++++ .../tools/networking/ntp/glibc-2.34-fix.patch | 28 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/ntp/glibc-2.34-fix.patch diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 92a6005e2a6..d1673a013e9 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; }; + patches = [ + # From https://patchwork.openembedded.org/patch/180019/ + ./glibc-2.34-fix.patch + ]; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/tools/networking/ntp/glibc-2.34-fix.patch b/pkgs/tools/networking/ntp/glibc-2.34-fix.patch new file mode 100644 index 00000000000..256f125a77b --- /dev/null +++ b/pkgs/tools/networking/ntp/glibc-2.34-fix.patch @@ -0,0 +1,28 @@ +From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 31 Jul 2021 10:51:41 -0700 +Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc +In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which +could mean different stack sizes at runtime on different architectures +and it also causes compile failure. Default glibc thread stack size +or 64Kb set by ntp should be good in glibc these days. +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + libntp/work_thread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/libntp/work_thread.c b/libntp/work_thread.c +index 03a5647..3ddd751 100644 +--- a/libntp/work_thread.c ++++ b/libntp/work_thread.c +@@ -41,7 +41,7 @@ + #ifndef THREAD_MINSTACKSIZE + # define THREAD_MINSTACKSIZE (64U * 1024) + #endif +-#ifndef __sun ++#if !defined(__sun) && !defined(__GLIBC__) + #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN + # undef THREAD_MINSTACKSIZE + # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN +-- +2.32.0 From f8fc20df2b7bdae96c8b8abfae13f70437cc80bd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Oct 2021 19:18:49 +0200 Subject: [PATCH 075/685] breakpad: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155160812 Fix derived from Fedora's Chromium fix[1]. [1] https://src.fedoraproject.org/rpms/chromium/blob/c3fea076996d62bff1404d06de5ef3adf93426db/f/chromium-92.0.4515.107-rawhide-gcc-std-max-fix.patch --- pkgs/development/misc/breakpad/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/development/misc/breakpad/default.nix index 7fb2b329667..045e2e8f9a6 100644 --- a/pkgs/development/misc/breakpad/default.nix +++ b/pkgs/development/misc/breakpad/default.nix @@ -20,6 +20,11 @@ in stdenv.mkDerivation { ln -s ${lss} $sourceRoot/src/third_party/lss ''; + postPatch = '' + substituteInPlace src/client/linux/handler/exception_handler.cc \ + --replace "max(16384" "max(static_cast(16384)" + ''; + meta = with lib; { description = "An open-source multi-platform crash reporting system"; homepage = "https://chromium.googlesource.com/breakpad"; From 65f5fdb81823a4875e8c714211ef117d3ededadf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 Oct 2021 19:41:31 +0200 Subject: [PATCH 076/685] arangodb*: fix build w/glibc-2.34 Failing Hydra builds: * https://hydra.nixos.org/build/155187495 (3.3) * https://hydra.nixos.org/build/155161270 (3.4) * https://hydra.nixos.org/build/155154245 (3.5) --- pkgs/servers/nosql/arangodb/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index bf7f7b43960..d9f1892beca 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }: +{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which, catch2, catch }: let common = { version, sha256 }: stdenv.mkDerivation { @@ -26,6 +26,14 @@ let # with nixpkgs, it has no sense to check for a version update substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" "" substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" "" + + ${if (lib.versionOlder version "3.4") then '' + cp ${catch}/include/catch/catch.hpp 3rdParty/catch/catch.hpp + '' else if (lib.versionOlder version "3.5") then '' + cp ${catch2}/include/catch2/catch.hpp 3rdParty/catch/catch.hpp + '' else '' + (cd 3rdParty/boost/1.69.0 && patch -p1 < ${../../../development/libraries/boost/pthread-stack-min-fix.patch}) + ''} ''; cmakeFlags = [ From 84635a6e17a8907b1f28d3efb9d3b98ea61cbe66 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Oct 2021 14:42:44 +0200 Subject: [PATCH 077/685] apitrace: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155150225 --- pkgs/applications/graphics/apitrace/default.nix | 6 ++++++ .../graphics/apitrace/glibc-2.34-compat.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index f842cf6f5c4..756f0da9f34 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { owner = "apitrace"; }; + patches = [ + # glibc 2.34 compat + # derived from https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb + ./glibc-2.34-compat.patch + ]; + # LD_PRELOAD wrappers need to be statically linked to work against all kinds # of games -- so it's fine to use e.g. bundled snappy. buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ]; diff --git a/pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch b/pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch new file mode 100644 index 00000000000..3f8cebe030c --- /dev/null +++ b/pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch @@ -0,0 +1,13 @@ +diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp +index 2eda082..0c0c8ee 100644 +--- a/wrappers/dlsym.cpp ++++ b/wrappers/dlsym.cpp +@@ -34,7 +34,7 @@ + #include "os.hpp" + + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34 + + + #include From 40fc0090fc5442d8dd67423284282548625618a6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Oct 2021 14:46:29 +0200 Subject: [PATCH 078/685] aspcud: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155189149 --- pkgs/tools/misc/aspcud/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index ef1b6a5a4ca..12cc6572abc 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , boost +, catch2 , clasp , cmake , gringo @@ -19,6 +20,10 @@ stdenv.mkDerivation rec { hash = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; }; + postPatch = '' + cp ${catch2}/include/catch2/catch.hpp libcudf/tests/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost clasp gringo re2c ]; @@ -28,6 +33,8 @@ stdenv.mkDerivation rec { "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp" ]; + doCheck = true; + meta = with lib; { description = "Solver for package problems in CUDF format using ASP"; homepage = "https://potassco.org/aspcud/"; From 0bdcc484855b74fc50f2f821e81ee9518550a4cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Oct 2021 15:16:18 +0200 Subject: [PATCH 079/685] conky: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/155171697 --- pkgs/os-specific/linux/conky/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 9bd8890e713..87f5bb052f4 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,7 +1,7 @@ { config, lib, stdenv, fetchFromGitHub, pkg-config, cmake # dependencies -, glib, libXinerama +, glib, libXinerama, catch2 # optional features without extra dependencies , mpdSupport ? true @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { sed -i 's/ Example: .*$//' doc/config_settings.xml substituteInPlace cmake/Conky.cmake --replace "# set(RELEASE true)" "set(RELEASE true)" + + cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp ''; NIX_LDFLAGS = "-lgcc_s"; @@ -133,6 +135,8 @@ stdenv.mkDerivation rec { # src/conky.cc:137:23: fatal error: defconfig.h: No such file or directory enableParallelBuilding = false; + doCheck = true; + meta = with lib; { homepage = "http://conky.sourceforge.net/"; description = "Advanced, highly configurable system monitor based on torsmo"; From 29e14f8a72530d059a1eed65ab2c772cc91e76be Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 17 Oct 2021 19:04:58 +0200 Subject: [PATCH 080/685] polyml*: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/156205993 --- pkgs/development/compilers/polyml/5.6.nix | 10 +++++++++- pkgs/development/compilers/polyml/5.7.nix | 12 ++++++++++-- pkgs/development/compilers/polyml/default.nix | 8 ++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 7858e3f6dc1..4354ce7e2d6 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, autoreconfHook}: +{lib, stdenv, fetchurl, autoreconfHook, fetchpatch }: let version = "5.6"; @@ -12,6 +12,14 @@ stdenv.mkDerivation { substituteInPlace configure.ac --replace stdc++ c++ ''; + patches = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch"; + sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby"; + }) + ]; + buildInputs = lib.optional stdenv.isDarwin autoreconfHook; src = fetchurl { diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index 5ac6990383c..efd3d1bfd40 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi, fetchpatch }: stdenv.mkDerivation rec { pname = "polyml"; @@ -8,7 +8,15 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace stdc++ c++ ''; - patches = [ ./5.7-new-libffi-FFI_SYSV.patch ]; + patches = [ + ./5.7-new-libffi-FFI_SYSV.patch + + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch"; + sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby"; + }) + ]; buildInputs = [ libffi gmp ]; diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 8a283bb6cf9..63506b8f07f 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + patches = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch"; + sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby"; + }) + ]; + configureFlags = [ "--enable-shared" "--with-system-libffi" From da905d4cf918e28f924bab99c6f2a4012d55410d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 28 Oct 2021 18:52:35 +0200 Subject: [PATCH 081/685] nixos/stage-1: fix `modprobe` in initial ramdisk on systems w/glibc-2.34 This effectively fixes the majority of all VM tests which were broken because `/dev/vda` (or any other block device) wasn't mountable: machine # mounting /dev/vda on /... machine # mount: mounting /dev/vda on /mnt-root/ failed: No such device[ 2.820976] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000100 machine # [ 2.821757] CPU: 0 PID: 1 Comm: init Not tainted 5.10.72 #1-NixOS machine # [ 2.821757] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 machine # [ 2.821757] Call Trace: machine # [ 2.821757] dump_stack+0x6b/0x83 machine # [ 2.821757] panic+0x101/0x2c8 machine # [ 2.821757] do_exit.cold+0x14/0xb3 machine # [ 2.821757] do_group_exit+0x33/0xa0 machine # [ 2.821757] __x64_sys_exit_group+0x14/0x20 machine # [ 2.821757] do_syscall_64+0x33/0x40 machine # [ 2.821757] entry_SYSCALL_64_after_hwframe+0x44/0xa9 machine # [ 2.821757] RIP: 0033:0x7f67ec2800f6 machine # [ 2.821757] Code: 00 4c 8b 0d 2c 5d 11 00 eb 19 66 2e 0f 1f 84 00 00 00 00 00 89 d7 89 f0 0f 05 48 3d 00 f0 ff ff 77 22 f4 89 d7 44 89 c0 0f 05 <48> 3d 00 f0 ff ff 76 e2 f7 d8 64 41 89 01 eb da 66 2e 0f 1f 84 00 machine # [ 2.821757] RSP: 002b:00007fff8f5a71d8 EFLAGS: 00000202 ORIG_RAX: 00000000000000e7 machine # [ 2.821757] RAX: ffffffffffffffda RBX: 0000000000699704 RCX: 00007f67ec2800f6 machine # [ 2.821757] RDX: 0000000000000001 RSI: 000000000000003c RDI: 0000000000000001 machine # [ 2.821757] RBP: 0000000000000004 R08: 00000000000000e7 R09: ffffffffffffff80 machine # [ 2.821757] R10: 00007f67ec33f3e0 R11: 0000000000000202 R12: 000000000000000b machine # [ 2.821757] R13: 00007fff8f5a75a8 R14: 0000000000000000 R15: 00000000004fc198 machine # [ 2.821757] Kernel Offset: 0x31e00000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) machine # [ 2.821757] Rebooting in 1 seconds.. This happened because the kernel failed to load modules such as `ext4` from `boot.initrd.availableKernelModules`[1] on e.g. a `mount(2)` syscall. The problem is that `kmod` isn't linked against `libpthread.so.0` anymore because it got merged into `libc.so.6` (however, the .so still exists), but still needs it: machine # newfstatat(AT_FDCWD, "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-glibc-2.34-36/lib/x86_64", 0x7ffd951114c0, 0) = -1 ENOENT (No such file or directory) machine # openat(AT_FDCWD, "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-glibc-2.34-36/lib/x86_64/libpthread.so.0", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) machine # newfstatat(AT_FDCWD, "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-glibc-2.34-36/lib/x86_64", 0x7ffd951114c0, 0) = -1 ENOENT (No such file or directory) machine # openat(AT_FDCWD, "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-glibc-2.34-36/lib/libpthread.so.0", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) machine # newfstatat(AT_FDCWD, "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-glibc-2.34-36/lib", 0x7ffd951114c0, 0) = -1 ENOENT (No such file or directory) machine # openat(AT_FDCWD, "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-glibc-2.34-36/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) machine # writev(2, [{iov_base="/nix/store/kdc9n48ksdc1a8y8w512w"..., iov_len=69}, {iov_base=": ", iov_len=2}, {iov_base="error while loading shared libra"..., iov_len=36}, {iov_base=": ", iov_len=2}, {iov_base="libpthread.so.0", iov_len=15}, {iov_base=": ", iov_len=2}, {iov_base="cy machine # ) = 184 machine # exit_group(127) = ? machine # +++ exited with 127 +++ machine # mount: mounting /dev/vda on /mnt-root/ failed: No such device machine # [ 19.167180] Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000100 machine # [ 19.167711] CPU: 0 PID: 1 Comm: init Not tainted 5.10.72 #1-NixOS This is not a problem * inside stage-1 because `LD_LIBRARY_PATH` points to `$out/lib` of extra-utils where `libpthread.so.6` also exists. * on a running system because `${pkgs.glibc}/lib` is part of kmod's rpath. However this is a problem inside the kernel which calls `modprobe` (in our case `kmod`) to load modules and doesn't know about `LD_LIBRARY_PATH`. Also, the rpath-reference was nuked. To work around this, the kernel's `modprobe` (i.e. `/proc/sys/kernel/modprobe`) now points to a wrapper which explicitly declares `LD_LIBRARY_PATH`. We can't use `makeWrapper` here because `modprobe` itself must not be renamed. Otherwise, `kmod` (which is the link-target of `modprobe`) won't work because it expects `argv[0] == "modprobe"` to perform modprobe's tasks. [1] https://nixos.org/manual/nixos/stable/options.html#opt-boot.initrd.availableKernelModules --- nixos/modules/system/boot/stage-1-init.sh | 2 +- nixos/modules/system/boot/stage-1.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 8fcc1f02972..ec8860b7424 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -232,7 +232,7 @@ done mkdir -p /lib ln -s @modulesClosure@/lib/modules /lib/modules ln -s @modulesClosure@/lib/firmware /lib/firmware -echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe +echo @extraUtils@/bin/modprobe-kernel > /proc/sys/kernel/modprobe for i in @kernelModules@; do info "loading module $(basename $i)..." modprobe $i diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 1575c0257d1..5999a993b14 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -131,6 +131,26 @@ let copy_bin_and_libs ${pkgs.kmod}/bin/kmod ln -sf kmod $out/bin/modprobe + # Dirty hack to make sure the kernel properly loads modules + # such as ext4 on demand (e.g. on a `mount(2)` syscall). This is necessary + # because `kmod` isn't linked against `libpthread.so.0` anymore (since + # it was merged into `libc.so.6` since version `2.34`), but still needs + # to access it for some reason. This is not an issue in stage-1 itself + # because of the `LD_LIBRARY_PATH`-variable and anytime later because the rpath of + # kmod/modprobe points to glibc's `$out/lib` where `libpthread.so.6` exists. + # However, this is a problem when the kernel calls `modprobe` inside + # the initial ramdisk because it doesn't know about the + # `LD_LIbRARY_PATH` and the rpath was nuked. + # + # Also, we can't use `makeWrapper` here because `kmod` only does + # `modprobe` functionality if `argv[0] == "modprobe"`. + cat >$out/bin/modprobe-kernel < Date: Sun, 31 Oct 2021 14:04:43 +0100 Subject: [PATCH 082/685] libowfat: mark as broken Failing Hydra build: https://hydra.nixos.org/build/156248131 This doesn't build with `glibc-2.34`, however there's already an upstream fix and can be marked as unbroken as soon as it's available[1]. I tried to apply the patch from a Git mirror[2], however this doesn't apply properly on `0.32` and I decided to wait for a release - such as Gentoo does it - instead. [1] https://bugs.gentoo.org/806505 [2] https://git.lighttpd.net/mirrors/libowfat/commit/a10f89d5f3fbe58e8233cc755b599d1d07c63e44 --- pkgs/development/libraries/libowfat/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 9db1354677d..665121b58b5 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -17,5 +17,8 @@ stdenv.mkDerivation rec { homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; + # Doesn't build with glibc 2.34: https://hydra.nixos.org/build/156248131 + # Should be fixed with the next release: https://bugs.gentoo.org/806505 + broken = true; }; } From 5f56cd54061d9d79aa387ad1df677cfac7eaf55f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 31 Oct 2021 14:09:41 +0100 Subject: [PATCH 083/685] tiscamera: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/156249703 --- pkgs/os-specific/linux/tiscamera/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index 38bc7c3eaff..1182aead36b 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -17,6 +17,7 @@ , python3Packages , libuuid , wrapGAppsHook +, catch2 }: stdenv.mkDerivation rec { @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { sha256 = "0hpy9yhc4mn6w8gvzwif703smmcys0j2jqbz2xfghqxcyb0ykplj"; }; + postPatch = '' + cp ${catch2}/include/catch2/catch.hpp external/catch/catch.hpp + ''; + nativeBuildInputs = [ cmake pkg-config From 18d915e48e2ff34a525eac03ab0dba82ef89eceb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 31 Oct 2021 14:14:16 +0100 Subject: [PATCH 084/685] ursadb: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/156279394 --- pkgs/servers/ursadb/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix index 836a5934d96..c9b39eccd8a 100644 --- a/pkgs/servers/ursadb/default.nix +++ b/pkgs/servers/ursadb/default.nix @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { hash = "sha256-/EK1CKJ0IR7fkKSpQkONbWcz6uhUoAwK430ljNYsV5U="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace \ + "add_executable(ursadb_test Tests.cpp)" "" \ + --replace \ + "target_link_libraries(ursadb_test ursa)" "" + ''; + installPhase = '' mkdir -p $out/bin cp ursadb $out/bin/ From 89caa8e552328b8a28d0133ed5931927eb671ddc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 31 Oct 2021 14:24:09 +0100 Subject: [PATCH 085/685] libfive: mark as broken Failing Hydra build: https://hydra.nixos.org/build/156227205 Vendored `catch2` is too old and thus cannot be patched. --- pkgs/development/libraries/libfive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 8634f05ebbc..00031e66bf5 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -47,5 +47,6 @@ mkDerivation { maintainers = with maintainers; [ hodapp kovirobi ]; license = with licenses; [ mpl20 gpl2Plus ]; platforms = with platforms; linux ++ darwin; + broken = true; }; } From fe58c181d3573e35da55bf43c3827d2e7627c8af Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 31 Oct 2021 14:33:13 +0100 Subject: [PATCH 086/685] libspf2: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/156229214 --- pkgs/development/libraries/libspf2/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index c48c71e1448..203f2768e37 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: with lib; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "03iiaafdcwh220pqignk407h6klrakwz0zkb8iwk6nkwipkwvhsx"; }; + patches = [ + # glibc-2.34 compat + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/dbb8a5c9f749cc11e61cfe558f164b165cbc30cb/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch"; + sha256 = "sha256-6JVVkVGCcFJsNeBdVTPcLhW4KoHLY4ai/KXDMliXgPA="; + }) + ]; + postPatch = '' # disable static bins compilation sed -i \ From 6b98a5e51256e8b9d7a5c30f93a8d4178554013f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 31 Oct 2021 14:44:28 +0100 Subject: [PATCH 087/685] nethack-qt: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/156236800 --- pkgs/games/nethack/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 2b29bddad93..f6de3d57c13 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison +{ stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison, fetchpatch , less , buildPackages , x11Mode ? false, qtMode ? false, libXaw, libXext, libXpm, bdftopcf, mkfontdir, pkg-config, qt5 @@ -24,6 +24,15 @@ in stdenv.mkDerivation rec { else if qtMode then "nethack-qt" else "nethack"; + patches = [ + # Don't unset `__warn_unused_result__`, breaks on glibc-2.34 + (fetchpatch { + url = "https://github.com/NetHack/NetHack/commit/81d73ce417dda6a98e2e918e06922e68b67c53f7.patch"; + sha256 = "sha256-PX9XtJTEE3K1yg/IwIzEIT+EZWi02gU+9msrsG9ZWQY="; + revert = true; + }) + ]; + src = fetchurl { url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz"; sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng"; From 748faeb623035c1360eeb6dc4b05abf5defd721c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 3 Jan 2022 23:19:37 +0100 Subject: [PATCH 088/685] glibc: don't hide symbol `__nss_files_fopen` I realized that `libredirect` doesn't wrap `__nss_files_fopen` anymore which subsequently broke the `checkPhase` of `pkgs.openssh`[1] which was implemented in 85c63a515d21c8fa27a561a9b8a1db5b18118e39. The reason for that is what `libc_hidden_{def,proto}` are used for, to quote `libc-symbols.h`[2]: The following macros are used for PLT bypassing within libc.so (and if needed other libraries similarly). This basically means that these symbols are altered in a way so that they cannot be wrapped by `libredirect` even though it re-defines `__nss_files_fopen` while being loaded at first with `LD_PRELOAD`. The problem was caused by a change in 2.34[3] where the `files`-module for NSS isn't loaded from `libnss_files.so.2` anymore, but the relevant symbols are directly obtained from `libc.so.6` since a lot of glibc's APIs were merged into `libc.so.6` before. As this would effectively break `libredirect` whenever it tries to wrap C APIs that interact with NSS (e.g. to use `getpwnam(3)`), I decided to undo this change for `__nss_files_fopen`. [1] https://hydra.nixos.org/build/160688523 [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=include/libc-symbols.h;h=d41ecf4384d07f9108698dba1d4e9e6a7a9b975f;hb=ae37d06c7d127817ba43850f0f898b793d42aea7 [3] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f9c8b11ed7726b858cd7b7cea0d3d7c5233d78cf;hp=6212bb67f4695962748a5981e1b9fea105af74f6 --- pkgs/development/libraries/glibc/common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 599a7f2a130..47aa304e7d3 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -140,6 +140,10 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + + # Ensure that `__nss_files_fopen` can still be wrapped by `libredirect`. + sed -i -e '/libc_hidden_def (__nss_files_fopen)/d' nss/nss_files_fopen.c + sed -i -e '/libc_hidden_proto (__nss_files_fopen)/d' include/nss_files.h '' # FIXME: find a solution for infinite recursion in cross builds. # For now it's hopefully acceptable that IDN from libc doesn't reliably work. From 1046c86c9986ca7239b00a6ef1396aae0961ba90 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Jan 2022 16:14:04 +0100 Subject: [PATCH 089/685] libosmscout: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163072881 --- pkgs/development/libraries/libosmscout/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index 2f83963d205..b11ec3eb94c 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -11,6 +11,8 @@ mkDerivation rec { sha256 = "1pa459h52kw88mvsdvkz83f4p35vvgsfy2qfjwcj61gj4y9d2rq4"; }; + cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ marisa qtlocation ]; From c0f49544d4952b1c63180fbb3dd5af2611a1b6c6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Jan 2022 16:32:33 +0100 Subject: [PATCH 090/685] maude: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163067005 --- pkgs/development/interpreters/maude/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 860f9ac3a5e..30055dc7a3d 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation { hardeningDisable = [ "stackprotector" ] ++ lib.optionals stdenv.isi686 [ "pic" "fortify" ]; + # Fix for glibc-2.34, see + # https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-lang/maude/maude-3.1-r1.ebuild?id=f021cc6cfa1e35eb9c59955830f1fd89bfcb26b4 + configureFlags = [ "--without-libsigsegv" ]; + preConfigure = '' configureFlagsArray=( --datadir="$out/share/maude" From 4427e547ca418bac7cc2a6b4c5d144a4a2fac126 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Jan 2022 16:49:52 +0100 Subject: [PATCH 091/685] jetbrains.jdk: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163085108 --- pkgs/development/compilers/jetbrains-jdk/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index bfff07aabcb..2d76b98f580 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,4 +1,4 @@ -{ lib, openjdk11, fetchFromGitHub, jetbrains }: +{ lib, openjdk11, fetchFromGitHub, jetbrains, fetchpatch }: openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; @@ -10,7 +10,12 @@ openjdk11.overrideAttrs (oldAttrs: rec { rev = "jb${version}"; sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI="; }; - patches = []; + patches = [ + (fetchpatch { + url = "https://github.com/JetBrains/JetBrainsRuntime/commit/980cfdf8d04c015bf2ecb4642064e45e3f36630d.patch"; + sha256 = "sha256-/f20sWnlWoObgdgZKWD785q0aRZ5oIP5pzW+AmejLWM="; + }) + ]; meta = with lib; { description = "An OpenJDK fork to better support Jetbrains's products."; longDescription = '' From 81e0c947ecbf88e89f75bed560b07ae2fdc006a5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Jan 2022 16:58:31 +0100 Subject: [PATCH 092/685] xnee: fix build w/glibc-2.34 ChangeLog: https://hydra.nixos.org/build/163058159 --- pkgs/tools/X11/xnee/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index c3355b80263..00ebb1ecec2 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' done + + # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added + # if `sem_init` is part of libc which causes errors like + # `gcc: error: CCC: No such file or directory` during the build. + substituteInPlace configure \ + --replace 'LIBSEMA="CCC"' 'LIBSEMA=""' ''; buildInputs = From 7605d492a772670ebe621a9d0a8f7e34dcf79300 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Jan 2022 17:01:27 +0100 Subject: [PATCH 093/685] qt512.qtwebengine: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163120450 --- pkgs/development/libraries/qt-5/5.12/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index d8954726188..01b65eb3e43 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -85,6 +85,14 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch"; + sha256 = "sha256-CJxN6sTvWdPVEwSkr0zpPrjyhUIi6tYSWb8ZyO0sY2o="; + excludes = [ + "src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc" + ]; + }) ./qtwebengine-no-build-skip.patch # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707 # https://bugreports.qt.io/browse/QTBUG-77037 From f31930977deea1c0c49b8a72234a0a7a7864aa35 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 9 Jan 2022 17:09:08 +0100 Subject: [PATCH 094/685] djmount: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163123869 --- pkgs/tools/filesystems/djmount/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index f5b0a0315df..3111be5b4d1 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; + postPatch = '' + # Taken from https://github.com/pupnp/pupnp/pull/334/files + substituteInPlace libupnp/threadutil/inc/ithread.h \ + --replace \ + "#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np" \ + '#define ithread_mutexattr_setkind_np pthread_mutexattr_settype' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse]; From 52bba1de8ae33329d9e5937f0585c56179160938 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Jan 2022 16:33:32 +0100 Subject: [PATCH 095/685] clingcon: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163641612 --- pkgs/applications/science/logic/potassco/clingcon.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index 1614adf4553..d7ec2e72433 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , clingo +, catch2 }: stdenv.mkDerivation rec { @@ -15,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1g2xkz9nsgqnrw3fdf5jchl16f0skj5mm32va61scc2yrchll166"; }; + postPatch = '' + cp ${catch2}/include/catch2/catch.hpp libclingcon/tests/catch.hpp + ''; + nativeBuildInputs = [ cmake clingo ]; cmakeFlags = [ From 322c490803f242fef658f37f4ddf71b97e2e05fd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Jan 2022 16:34:40 +0100 Subject: [PATCH 096/685] mustache-hpp: fix build w/glibc-2.34 Actually, this package doesn't need a build as it copies over the .hpp-file only, so I simplified it a bit. Failing Hydra build: https://hydra.nixos.org/build/163643601 --- pkgs/development/libraries/mustache-hpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mustache-hpp/default.nix b/pkgs/development/libraries/mustache-hpp/default.nix index 373f232a986..ce6dd1d21a9 100644 --- a/pkgs/development/libraries/mustache-hpp/default.nix +++ b/pkgs/development/libraries/mustache-hpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mustache"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb"; }; - nativeBuildInputs = [ cmake ]; + dontBuild = true; installPhase = '' mkdir -p $out/include - cp ../mustache.hpp $out/include + cp mustache.hpp $out/include ''; meta = with lib; { From a2ac7c607b965aa2296421bfd801f1c74f09fd9a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Jan 2022 16:40:44 +0100 Subject: [PATCH 097/685] recastnavigation: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163634618 --- pkgs/development/libraries/recastnavigation/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/development/libraries/recastnavigation/default.nix index d39d1a71321..6fd2056d2ea 100644 --- a/pkgs/development/libraries/recastnavigation/default.nix +++ b/pkgs/development/libraries/recastnavigation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU }: +{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU, catch }: stdenv.mkDerivation rec { pname = "recastai"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-QP3lMMFR6fiKQTksAkRL6X9yaoVz2xt4QSIP9g6piww="; }; + postPatch = '' + cp ${catch}/include/catch/catch.hpp Tests/catch.hpp + ''; + + doCheck = true; + nativeBuildInputs = [ cmake ]; buildInputs = [ libGL SDL2 libGLU ]; From 5f9c36c07f0f82d5488f7264651e32dd4c6b0e0a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Jan 2022 22:53:35 +0100 Subject: [PATCH 098/685] spdlog_0: fix build w/glibc-2.34 The patch only appears necessary for spdlog_1, so we skip it for v0 which builds fine without it. Failing Hydra build: https://hydra.nixos.org/build/163659629 --- pkgs/development/libraries/spdlog/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 2857b8776f6..6ef4f4af43a 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch }: let - generic = { version, sha256 }: + generic = { version, sha256, patches ? [] }: stdenv.mkDerivation { pname = "spdlog"; inherit version; @@ -13,13 +13,7 @@ let inherit sha256; }; - patches = [ - # glibc 2.34 compat - (fetchpatch { - url = "https://github.com/gabime/spdlog/commit/d54b8e89c058f3cab2b32b3e9a2b49fd171d5895.patch"; - sha256 = "sha256-pb7cREF90GXb5Mbs8xFLQ+eLo6Xum13/xYa8JUgJlbI="; - }) - ]; + inherit patches; nativeBuildInputs = [ cmake ]; # spdlog <1.3 uses a bundled version of fmt @@ -59,6 +53,13 @@ in spdlog_1 = generic { version = "1.9.2"; sha256 = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y="; + patches = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://github.com/gabime/spdlog/commit/d54b8e89c058f3cab2b32b3e9a2b49fd171d5895.patch"; + sha256 = "sha256-pb7cREF90GXb5Mbs8xFLQ+eLo6Xum13/xYa8JUgJlbI="; + }) + ]; }; spdlog_0 = generic { From 8ba95b68554d35faa422dec4a8bb201510e6686b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 10 Jan 2022 22:58:19 +0100 Subject: [PATCH 099/685] symengine: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163675793 --- pkgs/development/libraries/symengine/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index cbe5e13a700..5cb2e211786 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -5,6 +5,7 @@ , flint , mpfr , libmpc +, catch }: stdenv.mkDerivation rec { @@ -18,6 +19,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-5KpxBusJCuwrfFWHbrRKlH6Ic7YivYqz2m+BCbNfZp0="; }; + postPatch = '' + cp ${catch}/include/catch/catch.hpp symengine/utilities/catch/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ gmp flint mpfr libmpc ]; From 6a977757e284b76468c7973f094eb99aa20b9251 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Jan 2022 12:25:50 +0100 Subject: [PATCH 100/685] zeroc-ice: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163122463 --- pkgs/development/libraries/zeroc-ice/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index fcd83634855..9a1861f6044 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -3,6 +3,7 @@ , darwin, libiconv, Security , python3 # for tests only , cpp11 ? false +, fetchpatch }: let @@ -32,6 +33,18 @@ in stdenv.mkDerivation rec { sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4"; }; + patches = [ + # Fixes for openssl 3.0 / glibc-2.34. + (fetchpatch { + url = "https://github.com/zeroc-ice/ice/commit/7204b31a082a10cd481c1f31dbb6184ec699160d.patch"; + sha256 = "sha256-RN8kQrvWRu1oXB7UV7DkYbZ8A0VyJYGArx6ikovwefo="; + }) + (fetchpatch { + url = "https://github.com/zeroc-ice/ice/commit/358e7fea00383d55d1c19d38a3bbb64aca803aeb.patch"; + sha256 = "sha256-ntrTO6qHB7dw398BRdAyJQUfVYW3iEfzUaBYoWWOEDs="; + }) + ]; + buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; From e10ea9608a46565bd4d8d0a692647f9ce43b1de5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 11 Jan 2022 20:42:16 +0100 Subject: [PATCH 101/685] gcc{7,9,10}: apply patches for asan w/glibc-2.34 This should fix a few broken cc-wrapper tests that also check for libasan[1][2][3]: [...] checking whether sanitizers are fully functional... ==243==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22) [...] The underlying issue is that `SIGSTKSZ` isn't a compile-time constant anymore, but in this case the uninitialized `kAltStackSize` was initialized early enough to evalute to `0`[4]. The issue is already fixed in gcc11 and there's GCC 8.5 which also contains the patch, however the backports to v9 and v10 aren't released yet, so we have to apply patches on our own here. For GCC 7.5 I applied the patch from gcc8 as it doesn't seem as if there's an official upstream backport. [1] https://hydra.nixos.org/build/163102264 [2] https://hydra.nixos.org/build/163624687 [3] https://hydra.nixos.org/build/163619227 [4] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100114 --- pkgs/development/compilers/gcc/10/default.nix | 4 +- .../gcc/10/gcc10-asan-glibc-2.34.patch | 70 +++++++++++++++++++ pkgs/development/compilers/gcc/7/default.nix | 3 + .../gcc/7/gcc8-asan-glibc-2.34.patch | 70 +++++++++++++++++++ pkgs/development/compilers/gcc/9/default.nix | 2 +- .../gcc/9/gcc9-asan-glibc-2.34.patch | 70 +++++++++++++++++++ 6 files changed, 216 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch create mode 100644 pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch create mode 100644 pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 4493fd936ec..6c5adac600c 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -61,8 +61,8 @@ let majorVersion = "10"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ ./gcc10-asan-glibc-2.34.patch ] + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied diff --git a/pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch b/pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch new file mode 100644 index 00000000000..d6d4f41ffdf --- /dev/null +++ b/pkgs/development/compilers/gcc/10/gcc10-asan-glibc-2.34.patch @@ -0,0 +1,70 @@ +From 950bac27d63c1c2ac3a6ed867692d6a13f21feb3 Mon Sep 17 00:00:00 2001 +From: Jakub Jelinek +Date: Sat, 17 Apr 2021 11:27:14 +0200 +Subject: [PATCH] sanitizer: Fix asan against glibc 2.34 [PR100114] + +As mentioned in the PR, SIGSTKSZ is no longer a compile time constant in +glibc 2.34 and later, so +static const uptr kAltStackSize = SIGSTKSZ * 4; +needs dynamic initialization, but is used by a function called indirectly +from .preinit_array and therefore before the variable is constructed. +This results in using 0 size instead and all asan instrumented programs +die with: +==91==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22) + +Here is a cherry-pick from upstream to fix this. + +2021-04-17 Jakub Jelinek + + PR sanitizer/100114 + * sanitizer_common/sanitizer_posix_libcdep.cpp: Cherry-pick + llvm-project revisions 82150606fb11d28813ae6da1101f5bda638165fe + and b93629dd335ffee2fc4b9b619bf86c3f9e6b0023. + +(cherry picked from commit d9f462fb372fb02da032cefd6b091d7582c425ae) +--- + .../sanitizer_common/sanitizer_posix_libcdep.cpp | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp +index 304b3a01a08..ac88fbe074e 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp +@@ -169,7 +169,11 @@ bool SupportsColoredOutput(fd_t fd) { + + #if !SANITIZER_GO + // TODO(glider): different tools may require different altstack size. +-static const uptr kAltStackSize = SIGSTKSZ * 4; // SIGSTKSZ is not enough. ++static uptr GetAltStackSize() { ++ // SIGSTKSZ is not enough. ++ static const uptr kAltStackSize = SIGSTKSZ * 4; ++ return kAltStackSize; ++} + + void SetAlternateSignalStack() { + stack_t altstack, oldstack; +@@ -180,10 +184,9 @@ void SetAlternateSignalStack() { + // TODO(glider): the mapped stack should have the MAP_STACK flag in the + // future. It is not required by man 2 sigaltstack now (they're using + // malloc()). +- void* base = MmapOrDie(kAltStackSize, __func__); +- altstack.ss_sp = (char*) base; ++ altstack.ss_size = GetAltStackSize(); ++ altstack.ss_sp = (char *)MmapOrDie(altstack.ss_size, __func__); + altstack.ss_flags = 0; +- altstack.ss_size = kAltStackSize; + CHECK_EQ(0, sigaltstack(&altstack, nullptr)); + } + +@@ -191,7 +194,7 @@ void UnsetAlternateSignalStack() { + stack_t altstack, oldstack; + altstack.ss_sp = nullptr; + altstack.ss_flags = SS_DISABLE; +- altstack.ss_size = kAltStackSize; // Some sane value required on Darwin. ++ altstack.ss_size = GetAltStackSize(); // Some sane value required on Darwin. + CHECK_EQ(0, sigaltstack(&altstack, &oldstack)); + UnmapOrDie(oldstack.ss_sp, oldstack.ss_size); + } +-- +2.27.0 + diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index dcb7d0b91f6..72f3e06bd32 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -63,6 +63,9 @@ let majorVersion = "7"; ./riscv-pthread-reentrant.patch # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html ./riscv-no-relax.patch + # Fix for asan w/glibc-2.34. Although there's no upstream backport to v7, + # the patch from gcc 8 seems to work perfectly fine. + ./gcc8-asan-glibc-2.34.patch ./0001-Fix-build-for-glibc-2.31.patch ] diff --git a/pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch b/pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch new file mode 100644 index 00000000000..5645b97c1d8 --- /dev/null +++ b/pkgs/development/compilers/gcc/7/gcc8-asan-glibc-2.34.patch @@ -0,0 +1,70 @@ +From ef195a39d0d3b929cc676302d074b42c25460601 Mon Sep 17 00:00:00 2001 +From: Jakub Jelinek +Date: Sat, 17 Apr 2021 11:27:14 +0200 +Subject: [PATCH] sanitizer: Fix asan against glibc 2.34 [PR100114] + +As mentioned in the PR, SIGSTKSZ is no longer a compile time constant in +glibc 2.34 and later, so +static const uptr kAltStackSize = SIGSTKSZ * 4; +needs dynamic initialization, but is used by a function called indirectly +from .preinit_array and therefore before the variable is constructed. +This results in using 0 size instead and all asan instrumented programs +die with: +==91==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22) + +Here is a cherry-pick from upstream to fix this. + +2021-04-17 Jakub Jelinek + + PR sanitizer/100114 + * sanitizer_common/sanitizer_posix_libcdep.cc: Cherry-pick + llvm-project revisions 82150606fb11d28813ae6da1101f5bda638165fe + and b93629dd335ffee2fc4b9b619bf86c3f9e6b0023. + +(cherry picked from commit 950bac27d63c1c2ac3a6ed867692d6a13f21feb3) +--- + .../sanitizer_common/sanitizer_posix_libcdep.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc +index 1a37118c299..066079b3954 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc +@@ -159,7 +159,11 @@ bool SupportsColoredOutput(fd_t fd) { + + #if !SANITIZER_GO + // TODO(glider): different tools may require different altstack size. +-static const uptr kAltStackSize = SIGSTKSZ * 4; // SIGSTKSZ is not enough. ++static uptr GetAltStackSize() { ++ // SIGSTKSZ is not enough. ++ static const uptr kAltStackSize = SIGSTKSZ * 4; ++ return kAltStackSize; ++} + + void SetAlternateSignalStack() { + stack_t altstack, oldstack; +@@ -170,10 +174,9 @@ void SetAlternateSignalStack() { + // TODO(glider): the mapped stack should have the MAP_STACK flag in the + // future. It is not required by man 2 sigaltstack now (they're using + // malloc()). +- void* base = MmapOrDie(kAltStackSize, __func__); +- altstack.ss_sp = (char*) base; ++ altstack.ss_size = GetAltStackSize(); ++ altstack.ss_sp = (char *)MmapOrDie(altstack.ss_size, __func__); + altstack.ss_flags = 0; +- altstack.ss_size = kAltStackSize; + CHECK_EQ(0, sigaltstack(&altstack, nullptr)); + } + +@@ -181,7 +184,7 @@ void UnsetAlternateSignalStack() { + stack_t altstack, oldstack; + altstack.ss_sp = nullptr; + altstack.ss_flags = SS_DISABLE; +- altstack.ss_size = kAltStackSize; // Some sane value required on Darwin. ++ altstack.ss_size = GetAltStackSize(); // Some sane value required on Darwin. + CHECK_EQ(0, sigaltstack(&altstack, &oldstack)); + UnmapOrDie(oldstack.ss_sp, oldstack.ss_size); + } +-- +2.27.0 + diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 9d21ed667f6..62878cb6d87 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -78,7 +78,7 @@ let majorVersion = "9"; # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96796 # # This patch can most likely be removed by a post 9.3.0-release. - [ ./avoid-cycling-subreg-reloads.patch ] + [ ./avoid-cycling-subreg-reloads.patch ./gcc9-asan-glibc-2.34.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch b/pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch new file mode 100644 index 00000000000..1aea1f9b18a --- /dev/null +++ b/pkgs/development/compilers/gcc/9/gcc9-asan-glibc-2.34.patch @@ -0,0 +1,70 @@ +From 3d0135bf3be416bbe2531dc763d19b749eb2b856 Mon Sep 17 00:00:00 2001 +From: Jakub Jelinek +Date: Sat, 17 Apr 2021 11:27:14 +0200 +Subject: [PATCH] sanitizer: Fix asan against glibc 2.34 [PR100114] + +As mentioned in the PR, SIGSTKSZ is no longer a compile time constant in +glibc 2.34 and later, so +static const uptr kAltStackSize = SIGSTKSZ * 4; +needs dynamic initialization, but is used by a function called indirectly +from .preinit_array and therefore before the variable is constructed. +This results in using 0 size instead and all asan instrumented programs +die with: +==91==ERROR: AddressSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack (error code: 22) + +Here is a cherry-pick from upstream to fix this. + +2021-04-17 Jakub Jelinek + + PR sanitizer/100114 + * sanitizer_common/sanitizer_posix_libcdep.cc: Cherry-pick + llvm-project revisions 82150606fb11d28813ae6da1101f5bda638165fe + and b93629dd335ffee2fc4b9b619bf86c3f9e6b0023. + +(cherry picked from commit 950bac27d63c1c2ac3a6ed867692d6a13f21feb3) +--- + .../sanitizer_common/sanitizer_posix_libcdep.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc +index d2fd76a6d36..1917e29ced2 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc +@@ -169,7 +169,11 @@ bool SupportsColoredOutput(fd_t fd) { + + #if !SANITIZER_GO + // TODO(glider): different tools may require different altstack size. +-static const uptr kAltStackSize = SIGSTKSZ * 4; // SIGSTKSZ is not enough. ++static uptr GetAltStackSize() { ++ // SIGSTKSZ is not enough. ++ static const uptr kAltStackSize = SIGSTKSZ * 4; ++ return kAltStackSize; ++} + + void SetAlternateSignalStack() { + stack_t altstack, oldstack; +@@ -180,10 +184,9 @@ void SetAlternateSignalStack() { + // TODO(glider): the mapped stack should have the MAP_STACK flag in the + // future. It is not required by man 2 sigaltstack now (they're using + // malloc()). +- void* base = MmapOrDie(kAltStackSize, __func__); +- altstack.ss_sp = (char*) base; ++ altstack.ss_size = GetAltStackSize(); ++ altstack.ss_sp = (char *)MmapOrDie(altstack.ss_size, __func__); + altstack.ss_flags = 0; +- altstack.ss_size = kAltStackSize; + CHECK_EQ(0, sigaltstack(&altstack, nullptr)); + } + +@@ -191,7 +194,7 @@ void UnsetAlternateSignalStack() { + stack_t altstack, oldstack; + altstack.ss_sp = nullptr; + altstack.ss_flags = SS_DISABLE; +- altstack.ss_size = kAltStackSize; // Some sane value required on Darwin. ++ altstack.ss_size = GetAltStackSize(); // Some sane value required on Darwin. + CHECK_EQ(0, sigaltstack(&altstack, &oldstack)); + UnmapOrDie(oldstack.ss_sp, oldstack.ss_size); + } +-- +2.27.0 + From 64f9c9236150cdf03ffacf2c5fcf0055fea1f428 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 23 Jan 2022 01:26:21 +0100 Subject: [PATCH 102/685] soci: fix build w/glibc-2.34 We don't run the tests and I didn't manage to get them running trivially, so let's disable them. This not only speeds up compilation-time, but also fixes the build for glibc 2.34. Failing Hydra build: https://hydra.nixos.org/build/163952252 --- pkgs/development/libraries/soci/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index b17fbe16655..142081da015 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; # Do not build static libraries - cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; + cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" "-DSOCI_TESTS=off" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ From da55ba2a06e02e200daa3433ea84d0f9874eff4e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 16:52:53 +0100 Subject: [PATCH 103/685] sfizz: fix build w/glibc-2.34, actually enable tests Failing Hydra build: https://hydra.nixos.org/build/163931927 --- pkgs/applications/audio/sfizz/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 54acc782c60..aaa79bd3e39 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, libjack2, libsndfile, xorg, freetype , libxkbcommon, cairo, glib, gnome, flac, libogg, libvorbis, libopus, cmake -, pango, pkg-config }: +, pango, pkg-config, catch2 +}: stdenv.mkDerivation rec { pname = "sfizz"; @@ -40,6 +41,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' + cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp + substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ --replace 'zenitypath = "zenity"' 'zenitypath = "${gnome.zenity}/bin/zenity"' substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \ @@ -48,6 +51,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DSFIZZ_TESTS=ON" ]; + doCheck = true; + meta = with lib; { homepage = "https://github.com/sfztools/sfizz"; description = "SFZ jack client and LV2 plugin"; From 9a9fff59b28d06cd3f22397c778fcbacf46ccc22 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 17:00:05 +0100 Subject: [PATCH 104/685] quvi*: mark as broken Failing Hydra build: https://hydra.nixos.org/build/163943269 Given that it hasn't had a release since 2013[1] and Gentoo/Fedora already dropped it[2][3]. Also, there are a lot of alternative stream/video downloaders, so it doesn't seem a big deal. [1] http://quvi.sourceforge.net/news/ [2] https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80024f2367f394b46326064823d0c39f373e2820 [3] https://src.fedoraproject.org/rpms/quvi/c/bf189503ae6c15d2731679e292c0a90ce1454e62?branch=rawhide --- pkgs/applications/video/quvi/library.nix | 1 + pkgs/applications/video/quvi/scripts.nix | 1 + pkgs/applications/video/quvi/tool.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 071e67a1721..548b3d7f972 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = [ ]; + broken = true; # missing glibc-2.34 support, no upstream activity }; } diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index 676d073900c..a31ef6e72ae 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = [ ]; + broken = true; # missing glibc-2.34 support, no upstream activity }; } diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 87c8066a976..ad6233cbd00 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = [ ]; + broken = true; # missing glibc-2.34 support, no upstream activity }; } From 357dd9ed5f5d956e97080996bcf0ed6fdf5b3257 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 17:14:04 +0100 Subject: [PATCH 105/685] zeroc-ice-36: remove, unmaintained --- pkgs/development/libraries/zeroc-ice/3.6.nix | 59 ------------------- .../uninitialized-variable-warning.patch | 20 ------- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 pkgs/development/libraries/zeroc-ice/3.6.nix delete mode 100644 pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix deleted file mode 100644 index e8082e50447..00000000000 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, lib, fetchFromGitHub -, mcpp, bzip2, expat, openssl, db5 -, darwin, libiconv, Security -, zeroc-ice # to share meta -, cpp11 ? false -}: - -stdenv.mkDerivation rec { - pname = "zeroc-ice"; - version = "3.6.5"; - - src = fetchFromGitHub { - owner = "zeroc-ice"; - repo = "ice"; - rev = "v${version}"; - sha256 = "073h7v1f2sw77cr1a6xxa5l9j547pz24sxa9qdjc4zki0ivcnq15"; - }; - - buildInputs = [ mcpp bzip2 expat openssl db5 ] - ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - - postUnpack = '' - sourceRoot=$sourceRoot/cpp - ''; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace config/Make.rules.Darwin \ - --replace xcrun "" - ''; - - patches = [ - # Fixes compilation warning about uninitialied variables (in test code) - ./uninitialized-variable-warning.patch - ]; - - preBuild = '' - makeFlagsArray+=( - "prefix=$out" - "OPTIMIZE=yes" - "USR_DIR_INSTALL=yes" - "CONFIGS=${if cpp11 then "cpp11-shared" else "shared"}" - "SKIP=slice2py" # provided by a separate package - ) - ''; - - # cannot find -lIceXML (linking bin/transformdb) - enableParallelBuilding = false; - - outputs = [ "out" "bin" "dev" ]; - - postInstall = '' - mkdir -p $bin $dev/share - mv $out/bin $bin - mv $out/share/Ice-* $dev/share/ice - rm -rf $out/share/slice - ''; - - inherit (zeroc-ice) meta; -} diff --git a/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch b/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch deleted file mode 100644 index 878dee26bb8..00000000000 --- a/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/test/Glacier2/dynamicFiltering/TestControllerI.h b/test/Glacier2/dynamicFiltering/TestControllerI.h -index 7e21639..1279200 100644 ---- a/test/Glacier2/dynamicFiltering/TestControllerI.h -+++ b/test/Glacier2/dynamicFiltering/TestControllerI.h -@@ -21,13 +21,12 @@ struct SessionTuple - { - Glacier2::SessionPrx session; - Glacier2::SessionControlPrx sessionControl; -- bool configured; -+ bool configured = false; - - SessionTuple() {} - SessionTuple(Glacier2::SessionPrx s, Glacier2::SessionControlPrx control): - session(s), -- sessionControl(control), -- configured(false) -+ sessionControl(control) - {} - - SessionTuple& diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 46371603fda..e85ef792e43 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1411,6 +1411,9 @@ mapAliases ({ targetLlvmLibraries = targetPackages.llvmPackages_git.libraries; }); + # Added 2022-01-28 + zeroc-ice-36 = throw "Unmaintained, doesn't build w/glibc-2.34"; + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a209911431..4118bd5b0e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30174,10 +30174,6 @@ with pkgs; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; - zeroc-ice-36 = callPackage ../development/libraries/zeroc-ice/3.6.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - zeronet = callPackage ../applications/networking/p2p/zeronet { }; zexy = callPackage ../applications/audio/pd-plugins/zexy { From 2db6c7e893ffcfa79e94fb3f6d70666c36e26043 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 17:45:33 +0100 Subject: [PATCH 106/685] jumanpp: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163976320 --- ...001-Exclude-all-tests-from-the-build.patch | 177 ++++++++++++++++++ pkgs/tools/text/jumanpp/default.nix | 3 + 2 files changed, 180 insertions(+) create mode 100644 pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch diff --git a/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch new file mode 100644 index 00000000000..d41bada82de --- /dev/null +++ b/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch @@ -0,0 +1,177 @@ +From c52a5046e19718a43d48c9b3cfdc121d964e8c3b Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Fri, 28 Jan 2022 17:43:35 +0100 +Subject: [PATCH] Exclude all tests from the build + +For some reason it isn't sufficient to set `-DJPP_ENABLE_TESTS=OFF`. +Doing that because the tests on 2.0.0-rc3 don't seem to be working and +the vendored catch2 doesn't build with glibc 2.34. +--- + src/CMakeLists.txt | 3 +-- + src/core/CMakeLists.txt | 11 +---------- + src/core/analysis/CMakeLists.txt | 2 -- + src/core/codegen/CMakeLists.txt | 3 --- + src/core/spec/CMakeLists.txt | 2 -- + src/core/training/CMakeLists.txt | 2 -- + src/jumandic/CMakeLists.txt | 8 +------- + src/rnn/CMakeLists.txt | 5 +---- + src/util/CMakeLists.txt | 2 -- + 9 files changed, 4 insertions(+), 34 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 169dff5..64b6a07 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -67,7 +67,6 @@ function(jpp_feature_codegen) + endfunction(jpp_feature_codegen) + + add_subdirectory(util) +-add_subdirectory(testing) + add_subdirectory(core) + add_subdirectory(jumandic) +-add_subdirectory(rnn) +\ No newline at end of file ++add_subdirectory(rnn) +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index c63d134..01c825e 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -55,20 +55,11 @@ set(core_hdrs + ${core_hdrs} + ) + +-set(core_test_srcs +- ${core_test_srcs} +- ${core_tsrcs} +- test/test_analyzer_env.h +- ../testing/test_analyzer.h +- ) +- + add_library(jpp_core ${core_srcs} ${core_hdrs} ${libs3p_pegtl_headers}) +-jpp_test_executable(jpp_core_tests ${core_test_srcs}) + + target_include_directories(jpp_core PUBLIC ${jpp_core_cfg_dir}) + + target_link_libraries(jpp_core PUBLIC jpp_util jpp_rnn PRIVATE pathie) +-target_link_libraries(jpp_core_tests jpp_core jpp_core_train) + + if (${JPP_USE_PROTOBUF}) + target_include_directories(jpp_core PUBLIC ${Protobuf_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +@@ -78,4 +69,4 @@ endif() + add_subdirectory(benchmarks) + if (${JPP_ENABLE_DEV_TOOLS}) + add_subdirectory(devtools) +-endif () +\ No newline at end of file ++endif () +diff --git a/src/core/analysis/CMakeLists.txt b/src/core/analysis/CMakeLists.txt +index 526263e..1b32f8d 100644 +--- a/src/core/analysis/CMakeLists.txt ++++ b/src/core/analysis/CMakeLists.txt +@@ -79,5 +79,3 @@ jpp_core_files(core_hdrs + ) + + +-jpp_test_executable(jpp_core_analysis_tests ${core_analysis_tsrc}) +-target_link_libraries(jpp_core_analysis_tests jpp_core) +diff --git a/src/core/codegen/CMakeLists.txt b/src/core/codegen/CMakeLists.txt +index a905cee..fa759c7 100644 +--- a/src/core/codegen/CMakeLists.txt ++++ b/src/core/codegen/CMakeLists.txt +@@ -30,7 +30,4 @@ set(jpp_codegen_tsrcs + + add_library(jpp_core_codegen ${jpp_codegen_srcs} ${jpp_codegen_hdrs}) + +-jpp_test_executable(jpp_codegen_tests ${jpp_codegen_tsrcs}) +-target_include_directories(jpp_codegen_tests PRIVATE ${cgtest02_INCLUDE}) + target_link_libraries(jpp_core_codegen jpp_core) +-target_link_libraries(jpp_codegen_tests jpp_core_codegen) +\ No newline at end of file +diff --git a/src/core/spec/CMakeLists.txt b/src/core/spec/CMakeLists.txt +index f495d67..da827b9 100644 +--- a/src/core/spec/CMakeLists.txt ++++ b/src/core/spec/CMakeLists.txt +@@ -33,5 +33,3 @@ jpp_core_files(core_hdrs + + ) + +-jpp_test_executable(jpp_core_spec_tests ${core_spec_tsrc} ${libs3p_pegtl_headers}) +-target_link_libraries(jpp_core_spec_tests jpp_core) +\ No newline at end of file +diff --git a/src/core/training/CMakeLists.txt b/src/core/training/CMakeLists.txt +index 960437e..4ede9e1 100644 +--- a/src/core/training/CMakeLists.txt ++++ b/src/core/training/CMakeLists.txt +@@ -39,7 +39,5 @@ set(core_train_hdrs + + + add_library(jpp_core_train ${core_train_src} ${core_train_hdrs}) +-jpp_test_executable(jpp_core_train_tests ${core_train_tsrc}) + + target_link_libraries(jpp_core_train jpp_core) +-target_link_libraries(jpp_core_train_tests jpp_core_train) +\ No newline at end of file +diff --git a/src/jumandic/CMakeLists.txt b/src/jumandic/CMakeLists.txt +index bef3149..85a8b5d 100644 +--- a/src/jumandic/CMakeLists.txt ++++ b/src/jumandic/CMakeLists.txt +@@ -53,10 +53,6 @@ if (${JPP_USE_PROTOBUF}) + endif () + + +-jpp_test_executable(jpp_jumandic_tests ${jumandic_tests}) +-jpp_test_executable(jpp_bug_tests ${bug_test_sources}) +-target_include_directories(jpp_jumandic_tests PRIVATE ${jpp_jumandic_cg_INCLUDE}) +- + add_executable(jpp_jumandic_bootstrap main/bootstrap.cc) + add_executable(jumanpp_v2 main/jumanpp.cc) + add_executable(jumanpp_v2_train main/jumanpp_train.cc main/jumanpp_train.h) +@@ -64,11 +60,9 @@ add_executable(jpp_jumandic_pathdiff main/path_diff.cc) + target_include_directories(jpp_jumandic_pathdiff PRIVATE ${jpp_jumandic_cg_INCLUDE}) + + target_link_libraries(jpp_jumandic jpp_jumandic_spec) +-target_link_libraries(jpp_jumandic_tests jpp_jumandic jpp_core_train) +-target_link_libraries(jpp_bug_tests jpp_jumandic jpp_core_train) + target_link_libraries(jpp_jumandic_bootstrap jpp_jumandic) + target_link_libraries(jumanpp_v2 jpp_jumandic) + target_link_libraries(jumanpp_v2_train jpp_jumandic jpp_core_train) + target_link_libraries(jpp_jumandic_pathdiff jpp_jumandic) + +-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin) +\ No newline at end of file ++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin) +diff --git a/src/rnn/CMakeLists.txt b/src/rnn/CMakeLists.txt +index 448ba51..ca09a00 100644 +--- a/src/rnn/CMakeLists.txt ++++ b/src/rnn/CMakeLists.txt +@@ -1,12 +1,9 @@ + set(jpp_rnn_sources mikolov_rnn.cc) + set(jpp_rnn_includes mikolov_rnn.h simple_rnn_impl.h mikolov_rnn_impl.h rnn_arg_parse.h) +-set(jpp_rnn_tests mikolov_rnn_test.cc) + + add_library(jpp_rnn ${jpp_rnn_sources} ${jpp_rnn_includes} ) + add_library(jumanpp_rnn_legacy legacy/rnnlmlib.h legacy/rnnlmlib_static.h legacy/rnnlmlib_static.cpp) + +-jpp_test_executable(jpp_rnn_tests ${jpp_rnn_tests}) + target_link_libraries(jpp_rnn jpp_util) +-target_link_libraries(jpp_rnn_tests jpp_rnn jumanpp_rnn_legacy) + +-target_link_libraries(jumanpp_rnn_legacy jpp_util) +\ No newline at end of file ++target_link_libraries(jumanpp_rnn_legacy jpp_util) +diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt +index 53b6c57..c4599d5 100644 +--- a/src/util/CMakeLists.txt ++++ b/src/util/CMakeLists.txt +@@ -25,8 +25,6 @@ endif() + + + add_library(jpp_util ${jpp_util_sources} ${jpp_util_headers} ${BACKWARD_headers}) +-jpp_test_executable(jpp_util_test ${jpp_util_test_srcs} ${jpp_util_headers}) +-target_link_libraries(jpp_util_test jpp_util) + target_link_libraries(jpp_util ${CMAKE_THREAD_LIBS_INIT}) + target_include_directories(jpp_util PUBLIC ${JPP_LIBS_DIR} ${JPP_SRC_DIR}) + target_compile_features(jpp_util PUBLIC +-- +2.33.1 + diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 5fb5ec88d67..5bea259bcca 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; }; + patches = [ ./0001-Exclude-all-tests-from-the-build.patch ]; + cmakeFlags = [ "-DJPP_ENABLE_TESTS=OFF" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ] ++ lib.optional stdenv.isDarwin libiconv; From b43a3567eca70579e2a34e5fba3fda6154ea142f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 19:50:19 +0100 Subject: [PATCH 107/685] cpp-hocon: fix build w/glibc-2.34 Simply disable tests as it tries to pull in an old `catch2` from `leatherman`. Failing Hydra build: https://hydra.nixos.org/build/163982252 --- pkgs/development/libraries/cpp-hocon/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index dfe7f777670..bba2e03f8d5 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + postPatch = '' + sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt + ''; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; From 6320b7240f75d11b5a96bc03372a839c53427433 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 20:52:45 +0100 Subject: [PATCH 108/685] cataclysm-dda: fix build w/glibc-2.34 * Enable parallel building to speed up the build-time. * Disable tests as vendored catch2 doesn't compile against glibc 2.34 and I couldn't get the tests to run in the sandbox. Failing Hydra build: https://hydra.nixos.org/build/163952121 --- pkgs/games/cataclysm-dda/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index ccba8e23d5a..33790cf8800 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation { buildInputs = cursesDeps ++ optionals tiles tilesDeps; + enableParallelBuilding = true; + postPatch = '' patchShebangs . @@ -49,7 +51,7 @@ stdenv.mkDerivation { ''; makeFlags = [ - "PREFIX=$(out)" "LANGUAGES=all" + "PREFIX=$(out)" "LANGUAGES=all" "RUNTESTS=0" (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1") ] ++ optionals (!debug) [ "RELEASE=1" From 25172c97d03c3035869c8a1a753232b0b5017cd1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 21:17:27 +0100 Subject: [PATCH 109/685] securefs: fix build w/glibc-2.34 Tests don't work in the sandbox and vendored catch2 doesn't compile, so we disable the tests. Failing Hydra build: https://hydra.nixos.org/build/163981825 --- pkgs/tools/filesystems/securefs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 44e547b01c2..4d56f08b442 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { ./add-macfuse-support.patch ]; + postPatch = '' + sed -i -e '/TEST_SOURCES/d' CMakeLists.txt + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ fuse ]; From 11597d116244611940d3366db7c85f7181a32ae3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Jan 2022 21:44:02 +0100 Subject: [PATCH 110/685] sfxr-qt: fix build w/glibc-2.34 Failing Hydra build: https://hydra.nixos.org/build/163999266 --- pkgs/applications/audio/sfxr-qt/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index bf8b826f544..ef83531e436 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -7,6 +7,7 @@ , qtquickcontrols2 , SDL , python3 +, catch2 }: mkDerivation rec { @@ -21,6 +22,10 @@ mkDerivation rec { fetchSubmodules = true; }; + postPatch = '' + cp ${catch2}/include/catch2/catch.hpp 3rdparty/catch2/single_include/catch2/catch.hpp + ''; + nativeBuildInputs = [ cmake extra-cmake-modules @@ -33,6 +38,8 @@ mkDerivation rec { SDL ]; + doCheck = true; + meta = with lib; { homepage = "https://github.com/agateau/sfxr-qt"; description = "A sound effect generator, QtQuick port of sfxr"; From e9187abff193a6689621acb00c3ee31c954bf793 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Feb 2022 12:04:46 +0100 Subject: [PATCH 111/685] gdb: remove `--disable-sim` fix --- pkgs/development/tools/misc/gdb/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 91947a024d7..5bb5bc0652f 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { "--disable-shared" "--enable-static" "--with-system-zlib" "--with-system-readline" - "--disable-sim" "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" From 69af73d4b05fcb2cdd35e9f82ba881718172a920 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Feb 2022 12:11:18 +0100 Subject: [PATCH 112/685] texinfo: review fixes --- pkgs/development/tools/misc/texinfo/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index e47d3369de9..26732657eb9 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit sha256; }; - patches = patches ++ (optional crossBuildTools ./cross-tools-flags.patch); + patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch; # ncurses is required to build `makedoc' # this feature is introduced by the ./cross-tools-flags.patch From 238d634e4b7cbe58c9d9fbc155ffcf19f25f2b12 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 24 Oct 2021 09:39:21 +0100 Subject: [PATCH 113/685] ocaml: enable parallel building Enable parallel building for ocaml-4.08 and above. tested as: $ nix build -f. ocaml-ng.ocamlPackages_{4_{00_1,01_0,02,03,04,05,06,07,08,09,10,11,12,13},latest}.ocaml --keep-going ocaml build system supports parallel building, but but for multiple top-level targets at the same time as it usually spawns subprocess $(MAKE) that occasionally conflict with one another. To work it around we use tiny Makefile with a single rule that calls top-level targets sequentially as makefile calls: nixpkgs_world_bootstrap_world_opt: $(MAKE) world $(MAKE) bootstrap $(MAKE) world.opt On a 16-core machine ocaml-4.12 build speeds up from 6m55s to 1m35s. Releases 4_00_1, 4_01_0, 4_04 and 4_05 still have some race in them. Thus this change enables parallel builds only for ocaml-4.06 and above. Adapted from #142723 upstreams's CI tests the parallel makefile: https://github.com/ocaml/ocaml/issues/10235#issuecomment-782100584 The limit was chosen to be 4.08 because it was released in 2019, not too long before the above link. --- .../development/compilers/ocaml/Makefile.nixpkgs | 16 ++++++++++++++++ pkgs/development/compilers/ocaml/generic.nix | 13 ++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/ocaml/Makefile.nixpkgs diff --git a/pkgs/development/compilers/ocaml/Makefile.nixpkgs b/pkgs/development/compilers/ocaml/Makefile.nixpkgs new file mode 100644 index 00000000000..2d6457852fc --- /dev/null +++ b/pkgs/development/compilers/ocaml/Makefile.nixpkgs @@ -0,0 +1,16 @@ +# ocaml build system does not allow for parallel building of some +# top-level targets like 'world', 'bootstrap', 'world.opt' as +# then spawn '$(MAKE) all' subprocesses that conflict among each +# other. But we would still like to run each target in parallel +# individually. This file defines such entry points. + +# Re-export all existing phases to make 'make install' work as is. +include Makefile + +nixpkgs_world: + $(MAKE) world + +nixpkgs_world_bootstrap_world_opt: + $(MAKE) world + $(MAKE) bootstrap + $(MAKE) world.opt diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index e4cec4cf52e..c8198b5b373 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -68,7 +68,18 @@ stdenv.mkDerivation (args // { # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"; - buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; + # Older versions have some race: + # cp: cannot stat 'boot/ocamlrun': No such file or directory + # make[2]: *** [Makefile:199: backup] Error 1 + enableParallelBuilding = lib.versionAtLeast version "4.08"; + + # Workaround lack of parallelism support among top-level targets: + # we place nixpkgs-specific targets to a separate file and set + # sequential order among them as a single rule. + makefile = ./Makefile.nixpkgs; + buildFlags = if useNativeCompilers + then ["nixpkgs_world_bootstrap_world_opt"] + else ["nixpkgs_world"]; buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; propagatedBuildInputs = optional spaceTimeSupport libunwind; From e110983ed3c6bb301b9a4266e400e0e1b2ef58dd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Feb 2022 14:06:23 +0100 Subject: [PATCH 114/685] glibc: add empty libpthread.a See https://github.com/NixOS/nixpkgs/pull/133431#discussion_r805338099 --- pkgs/development/libraries/glibc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index a48276f0b9c..65a622f0467 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -129,6 +129,7 @@ callPackage ./common.nix { inherit stdenv; } { ln -sf $out/lib/librt.so.1 $out/lib/librt.so ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so + touch $out/lib/libpthread.a '' # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. From 1077a6e040b445bf3d0854a667a1c03f33aa5c60 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Feb 2022 14:06:45 +0100 Subject: [PATCH 115/685] nixos/stage-1: typo fixes --- nixos/modules/system/boot/stage-1-init.sh | 1 + nixos/modules/system/boot/stage-1.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index ec8860b7424..31758366980 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -232,6 +232,7 @@ done mkdir -p /lib ln -s @modulesClosure@/lib/modules /lib/modules ln -s @modulesClosure@/lib/firmware /lib/firmware +# see comment in stage-1.nix for explanation echo @extraUtils@/bin/modprobe-kernel > /proc/sys/kernel/modprobe for i in @kernelModules@; do info "loading module $(basename $i)..." diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 5999a993b14..c45857441c6 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -136,11 +136,11 @@ let # because `kmod` isn't linked against `libpthread.so.0` anymore (since # it was merged into `libc.so.6` since version `2.34`), but still needs # to access it for some reason. This is not an issue in stage-1 itself - # because of the `LD_LIBRARY_PATH`-variable and anytime later because the rpath of + # because of the `LD_LIBRARY_PATH`-variable and anytime later because the rpath of # kmod/modprobe points to glibc's `$out/lib` where `libpthread.so.6` exists. # However, this is a problem when the kernel calls `modprobe` inside # the initial ramdisk because it doesn't know about the - # `LD_LIbRARY_PATH` and the rpath was nuked. + # `LD_LIBRARY_PATH` and the rpath was nuked. # # Also, we can't use `makeWrapper` here because `kmod` only does # `modprobe` functionality if `argv[0] == "modprobe"`. From 91fa7657d180942da624520231754706940f23f4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Feb 2022 15:10:58 +0100 Subject: [PATCH 116/685] stdenv: revert gcc hack See https://github.com/NixOS/nixpkgs/pull/133431#discussion_r805339569 --- pkgs/stdenv/linux/default.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e20ea9e1686..e5771860bce 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -254,19 +254,6 @@ in ''; }); - gcc-unwrapped = self.stdenvNoCC.mkDerivation { - inherit (prevStage.gcc-unwrapped) name; - dontUnpack = true; - dontBuild = true; - installPhase = '' - mkdir -p $out - cp -ar ${prevStage.gcc-unwrapped}/* $out/ - chmod -R a+w $out/ - cp -a ${getLibc self}/lib/* $out/lib/ - chmod -R a-w $out/ - ''; - }; - # This also contains the full, dynamically linked, final Glibc. binutils = prevStage.binutils.override { # Rewrap the binutils with the new glibc, so both the next From 41eb407d2c77046ed0cc8c4beb246be25728ffb2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Feb 2022 18:33:00 +0100 Subject: [PATCH 117/685] Revert "jetbrains.jdk: fix build w/glibc-2.34" This reverts commit 4427e547ca418bac7cc2a6b4c5d144a4a2fac126. Patch is not needed anymore. --- pkgs/development/compilers/jetbrains-jdk/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 2d76b98f580..bfff07aabcb 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,4 +1,4 @@ -{ lib, openjdk11, fetchFromGitHub, jetbrains, fetchpatch }: +{ lib, openjdk11, fetchFromGitHub, jetbrains }: openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; @@ -10,12 +10,7 @@ openjdk11.overrideAttrs (oldAttrs: rec { rev = "jb${version}"; sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/JetBrains/JetBrainsRuntime/commit/980cfdf8d04c015bf2ecb4642064e45e3f36630d.patch"; - sha256 = "sha256-/f20sWnlWoObgdgZKWD785q0aRZ5oIP5pzW+AmejLWM="; - }) - ]; + patches = []; meta = with lib; { description = "An OpenJDK fork to better support Jetbrains's products."; longDescription = '' From 82580b15188e994aff429220d1634b3fc6ad357f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 27 Feb 2022 20:02:04 +0100 Subject: [PATCH 118/685] cataclysm-dda: fix eval No idea why this breaks now, but let's see if that's sufficient to make ofborg happy. --- pkgs/games/cataclysm-dda/common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 33790cf8800..3a620c075de 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -39,8 +39,6 @@ stdenv.mkDerivation { buildInputs = cursesDeps ++ optionals tiles tilesDeps; - enableParallelBuilding = true; - postPatch = '' patchShebangs . From 9239261de14a81237e1cc74dfa1b0b09adb09e05 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 24 Feb 2022 15:34:32 -0800 Subject: [PATCH 119/685] python3Packages.dnspython: fix tests --- pkgs/development/python-modules/dnspython/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 40b3d7a36de..ad58f310636 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -1,9 +1,11 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pythonOlder , setuptools-scm , pytestCheckHook +, cacert }: buildPythonPackage rec { @@ -19,11 +21,15 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + ] ++ lib.optional stdenv.isDarwin [ + cacert ]; disabledTests = [ # dns.exception.SyntaxError: protocol not found "test_misc_good_WKS_text" + # fails if IPv6 isn't available + "test_resolver_override" ]; nativeBuildInputs = [ From b83b3490495f0a086597416e0766b6d5729e3c54 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 23 Feb 2022 21:00:06 +0100 Subject: [PATCH 120/685] treewide: rename name to pname&version --- pkgs/development/libraries/cwiid/default.nix | 4 ++-- pkgs/development/libraries/cxxopts/default.nix | 4 ++-- pkgs/development/libraries/dotconf/default.nix | 2 +- pkgs/development/libraries/gcc/libgcc/default.nix | 2 +- pkgs/development/libraries/ggz_base_libs/default.nix | 5 ++--- pkgs/development/libraries/gtkmm/2.x.nix | 6 +++--- pkgs/development/libraries/hspell/dicts.nix | 8 ++++---- pkgs/development/libraries/jcal/default.nix | 2 +- .../libraries/khronos-ocl-icd-loader/default.nix | 2 +- pkgs/development/libraries/languagemachines/frog.nix | 2 +- pkgs/development/libraries/languagemachines/frogdata.nix | 2 +- pkgs/development/libraries/languagemachines/libfolia.nix | 2 +- pkgs/development/libraries/languagemachines/mbt.nix | 2 +- pkgs/development/libraries/languagemachines/ticcutils.nix | 2 +- pkgs/development/libraries/languagemachines/timbl.nix | 2 +- .../libraries/languagemachines/timblserver.nix | 2 +- pkgs/development/libraries/languagemachines/ucto.nix | 2 +- pkgs/development/libraries/languagemachines/uctodata.nix | 2 +- pkgs/development/libraries/libcollectdclient/default.nix | 3 ++- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 31a5420e375..e640b6cbbba 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "cwiid-${version}-git"; - version = "2010-02-21"; + pname = "cwiid"; + version = "unstable-2010-02-21"; src = fetchFromGitHub { owner = "abstrakraft"; diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index 9d3ea6f32de..5d12b3c19ee 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - name = "cxxopts"; + pname = "cxxopts"; version = "3.0.0"; src = fetchFromGitHub { owner = "jarro2783"; - repo = name; + repo = "cxxopts"; rev = "v${version}"; sha256 = "08x7j168l1xwj0r3rv89cgghmfhsx98lpq35r3vkh504m1pd55a6"; }; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 39d71eee432..fed050f64b6 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, stdenv, autoreconfHook }: stdenv.mkDerivation rec { - name = "dotconf-" + version; + pname = "dotconf"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index b9b7db729eb..094bb7e7a1d 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -4,7 +4,7 @@ }: stdenvNoLibs.mkDerivation rec { - name = "libgcc-${version}"; + pname = "libgcc"; inherit (gcc.cc) src version; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix index 025423ecd8a..bff0af6b2b1 100644 --- a/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/pkgs/development/libraries/ggz_base_libs/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, intltool, openssl, expat, libgcrypt }: stdenv.mkDerivation rec { + pname = "ggz-base-libs"; version = "0.99.5"; - baseName = "ggz-base-libs"; - name = "${baseName}-snapshot-${version}"; src = fetchurl { - url = "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/${name}.tar.gz"; + url = "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-base-libs-snapshot-${version}.tar.gz"; sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk"; }; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index cf26e22da5b..284ee83c2d4 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { - name = "gtkmm-${minVer}.5"; - minVer = "2.24"; + pname = "gtkmm"; + version = "2.24.5"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz"; sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"; }; diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index 83942c2c1dd..06f80bf5cf2 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -2,7 +2,7 @@ let dict = variant: a: stdenv.mkDerivation ({ - inherit (hspell) src patchPhase nativeBuildInputs; + inherit (hspell) version src patchPhase nativeBuildInputs; buildFlags = [ variant ]; meta = hspell.meta // { @@ -15,7 +15,7 @@ in recurseForDerivations = true; aspell = dict "aspell" { - name = "aspell-dict-he-${hspell.version}"; + pname = "aspell-dict-he"; installPhase = '' mkdir -p $out/lib/aspell @@ -23,7 +23,7 @@ in }; myspell = dict "myspell" { - name = "myspell-dict-he-${hspell.version}"; + pname = "myspell-dict-he"; installPhase = '' mkdir -p $out/lib/myspell @@ -31,7 +31,7 @@ in }; hunspell = dict "hunspell" { - name = "hunspell-dict-he-${hspell.version}"; + pname = "hunspell-dict-he"; installPhase = '' mkdir -p $out/lib diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix index 4ce62ec67bc..354a5518c43 100644 --- a/pkgs/development/libraries/jcal/default.nix +++ b/pkgs/development/libraries/jcal/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "jcal"; + pname = "jcal"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 732efda1df4..8ff7b933247 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { - name = "khronos-ocl-icd-loader-${version}"; + pname = "khronos-ocl-icd-loader"; version = "2022.01.04"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 130fc60a12c..8ffd42ad033 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "frog-${release.version}"; + pname = "frog"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "frog-v${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 61134a8ebfb..7e3475e6450 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { - name = "frogdata-${release.version}"; + pname = "frogdata"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "frogdata-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index 3137d864683..76a2e378d5c 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation { - name = "libfolia-${release.version}"; + pname = "libfolia"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "libfolia-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index 49fc3c850ae..d47bdf34a08 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "mbt-${release.version}"; + pname = "mbt"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "mbt-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 53bbd131bfa..b536c3168f7 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { - name = "ticcutils-${release.version}"; + pname = "ticcutils"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "ticcutils-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index 9ca0b080a21..43115eac8fa 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "timbl-${release.version}"; + pname = "timbl"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "timbl-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index 42bc5edb43f..afa1c122287 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "timblserver-${release.version}"; + pname = "timblserver"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "timblserver-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index 42985825606..252e1e85fbe 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "ucto-${release.version}"; + pname = "ucto"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "ucto-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 7f8d4889c62..baf851456d5 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { - name = "uctodata-${release.version}"; + pname = "uctodata"; version = release.version; src = fetchurl { inherit (release) url sha256; name = "uctodata-${release.version}.tar.gz"; }; diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 0bf654ee963..919ddcd3f06 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -2,7 +2,8 @@ with lib; collectd.overrideAttrs (oldAttrs: { - name = "libcollectdclient-${collectd.version}"; + pname = "libcollectdclient"; + inherit (collectd) version; buildInputs = [ ]; configureFlags = (oldAttrs.configureFlags or []) ++ [ From 32c30ae43c475fdf2c2c60c6441821945ab3a88f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 28 Feb 2022 09:39:27 +0000 Subject: [PATCH 121/685] pkgs/stdenv/linux/default.nix: restore dropped gcc-wrapper 7459a40 `stdenv-bootstrap: force using new libc from stage2` overrode `gcc-wrapper`. 91fa7657 `stdenv: revert gcc hack` dod not restore the initial value. As a result attempt to build glibc-2.35 fails early on perl as: ld: cannot find -lnsl: No such file or directory collect2: error: ld returned 1 exit status I can't compile the test program. (The supplied flags or libraries might be incorrect.) The change restores `gcc-wrapper` as it was before 7459a40. --- pkgs/stdenv/linux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e5771860bce..d2c28b97ff9 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -230,7 +230,7 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv - coreutils gnugrep + gcc-unwrapped coreutils gnugrep perl gnum4 bison; dejagnu = super.dejagnu.overrideAttrs (a: { doCheck = false; } ); From 9808412565795c8d2e560a4abefe4003dc45cc3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Feb 2022 12:51:55 +0000 Subject: [PATCH 122/685] libical: 3.0.11 -> 3.0.14 --- pkgs/development/libraries/libical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index f4a1959a512..77c595c9184 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.11"; + version = "3.0.14"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-9kMYqWITZ2LlBDebJUZFWyVclAjfIZtc3Dm7lii9ZMc="; + sha256 = "sha256-gZ6IBjG5pNKJ+hWcTzXMP7yxL4he4LTklZGoC9vXra8="; }; nativeBuildInputs = [ From d14fe018fcf9502dfa20fde84d45d8845e1441f4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 12:21:37 +0100 Subject: [PATCH 123/685] libsecret: clean up - re-order the expression - format with nixpkgs-fmt - make patchShebangs argument more specific - run hooks in installCheckPhase --- .../libraries/libsecret/default.nix | 78 ++++++++++++++----- 1 file changed, 60 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 18f00a0933c..36db62182e4 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,29 +1,64 @@ -{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 -, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala -, gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }: +{ stdenv +, lib +, fetchurl +, glib +, pkg-config +, gettext +, libxslt +, python3 +, docbook-xsl-nons +, docbook_xml_dtd_42 +, libgcrypt +, gobject-introspection +, vala +, gtk-doc +, gnome +, gjs +, libintl +, dbus +, xvfb-run +}: stdenv.mkDerivation rec { pname = "libsecret"; version = "0.20.4"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"; }; - postPatch = '' - patchShebangs . - ''; - - outputs = [ "out" "dev" "devdoc" ]; - - propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ - pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl - gobject-introspection vala gtk-doc glib + pkg-config + gettext + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + libintl + gobject-introspection + vala + gtk-doc + glib + ]; + + buildInputs = [ + libgcrypt + ]; + + propagatedBuildInputs = [ + glib + ]; + + installCheckInputs = [ + python3 + python3.pkgs.dbus-python + python3.pkgs.pygobject3 + xvfb-run + dbus + gjs ]; - buildInputs = [ libgcrypt ]; - # optional: build docs with gtk-doc? (probably needs a flag as well) configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" @@ -31,17 +66,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installCheckInputs = [ - python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs - ]; - # needs to run after install because typelibs point to absolute paths doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib + + postPatch = '' + patchShebangs \ + ./tool/test-*.sh \ + build/tap-unittest + ''; + installCheckPhase = '' + runHook preInstallCheck + export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ make check + + runHook postInstallCheck ''; passthru = { From d56a0b9d728ac92383a135760f8daa5bed1c9bdb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Feb 2022 11:11:37 +0000 Subject: [PATCH 124/685] =?UTF-8?q?libsecret:=200.20.4=20=E2=86=92=200.20.?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libsecret/-/compare/0.20.4...0.20.5 --- .../libraries/libsecret/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 36db62182e4..aec0b8f120f 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -2,6 +2,8 @@ , lib , fetchurl , glib +, meson +, ninja , pkg-config , gettext , libxslt @@ -11,7 +13,7 @@ , libgcrypt , gobject-introspection , vala -, gtk-doc +, gi-docgen , gnome , gjs , libintl @@ -21,25 +23,27 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.4"; + version = "0.20.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"; + sha256 = "P7PONA/NfbVNh8iT5pv8Kx9uTUsnkGX/5m2snw/RK00="; }; nativeBuildInputs = [ + meson + ninja pkg-config gettext - libxslt + libxslt # for xsltproc for building man pages docbook-xsl-nons docbook_xml_dtd_42 libintl gobject-introspection vala - gtk-doc + gi-docgen glib ]; @@ -60,19 +64,12 @@ stdenv.mkDerivation rec { gjs ]; - configureFlags = [ - "--with-libgcrypt-prefix=${libgcrypt.dev}" - ]; - - enableParallelBuilding = true; - # needs to run after install because typelibs point to absolute paths doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib postPatch = '' patchShebangs \ - ./tool/test-*.sh \ - build/tap-unittest + ./tool/test-*.sh ''; installCheckPhase = '' @@ -81,11 +78,16 @@ stdenv.mkDerivation rec { export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check + meson test --print-errorlogs runHook postInstallCheck ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 821703c0d20f28592ccb40d43246cdcfa644679d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Feb 2022 15:10:40 +0100 Subject: [PATCH 125/685] libsecret: fix tests --- .../libraries/libsecret/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index aec0b8f120f..796fe77f7b6 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -18,7 +18,6 @@ , gjs , libintl , dbus -, xvfb-run }: stdenv.mkDerivation rec { @@ -55,32 +54,44 @@ stdenv.mkDerivation rec { glib ]; - installCheckInputs = [ + checkInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 - xvfb-run dbus gjs ]; - # needs to run after install because typelibs point to absolute paths - doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib + doCheck = true; postPatch = '' patchShebangs \ ./tool/test-*.sh ''; - installCheckPhase = '' - runHook preInstallCheck + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overwitten during installation. + mkdir -p $out/lib $out/lib + ln -s "$PWD/libsecret/libmock-service.so" "$out/lib/libmock-service.so" + ln -s "$PWD/libsecret/libsecret-1.so.0" "$out/lib/libsecret-1.so.0" + ''; - export NO_AT_BRIDGE=1 - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + checkPhase = '' + runHook preCheck + + dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --print-errorlogs - runHook postInstallCheck + runHook postCheck + ''; + + postCheck = '' + # This is test-only so it won’t be overwritten during installation. + rm "$out/lib/libmock-service.so" ''; postFixup = '' From e2b9641729c32d3cc37ecd16ca82a0e43161fb10 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 28 Feb 2022 16:07:28 +0100 Subject: [PATCH 126/685] perl: rename name to pname --- pkgs/development/interpreters/perl/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 54769a03b7b..f29e61d1105 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -19,11 +19,10 @@ let common = { perl, buildPerl, version, sha256 }: stdenv.mkDerivation (rec { inherit version; - - name = "perl-${version}"; + pname = "perl"; src = fetchurl { - url = "mirror://cpan/src/5.0/${name}.tar.gz"; + url = "mirror://cpan/src/5.0/perl-${version}.tar.gz"; inherit sha256; }; From 4261fff202d5758bac695d2523798e0fb5477ab0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 28 Feb 2022 10:14:22 -0600 Subject: [PATCH 127/685] libcbor: 0.8.0 -> 0.9.0, libfido2: 1.9.0 -> 1.10.0 (#157553) * libcbor: 0.8.0 -> 0.9.0 (cherry picked from commit 9c06d262d2ac0225d0f2b2626fae064c340d375a) * libfido2: 1.9.0 -> 1.10.0 https://github.com/Yubico/libfido2/blob/1.10.0/NEWS Co-authored-by: R. Ryantm --- pkgs/development/libraries/libcbor/default.nix | 4 ++-- pkgs/development/libraries/libfido2/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 349b715d852..9473c4823fc 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcbor"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "PJK"; repo = pname; rev = "v${version}"; - sha256 = "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7"; + sha256 = "sha256-Wp/48yQA17mf/dTgeMcMDvPpKOPkfLhQkCnzgGLpLtk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 13bbd246c64..e5d6d1c7c67 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.9.0"; + version = "1.10.0"; # releases on https://developers.yubico.com/libfido2/Releases/ are signed src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-ujnjrzc20t/IrT0ctuO+fszAlYhhCjsHyGXQ7T5YwtI="; + sha256 = "sha256-Um79PVavcGwF0J89IfGO47CxWsDB9cXaGsvCfCcwuZs="; }; nativeBuildInputs = [ cmake pkg-config ]; From b9ed8525d90f648e5954d052b0ab38052963e4f6 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Feb 2022 10:45:53 -0800 Subject: [PATCH 128/685] python3Packages.httplib2: disable failing test on darwin --- pkgs/development/python-modules/httplib2/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 9a8a8853780..8f74099a96a 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -52,7 +52,9 @@ buildPythonPackage rec { # ValueError: Unable to load PEM file. # https://github.com/httplib2/httplib2/issues/192#issuecomment-993165140 "test_client_cert_password_verified" - ] ++ lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals stdenv.isDarwin [ + # fails with "ConnectionResetError: [Errno 54] Connection reset by peer" + "test_connection_close" # fails with HTTP 408 Request Timeout, instead of expected 200 OK "test_timeout_subsequent" ]; From d5cd8efaca6d2a04a35696ddc2f38a7a374e54d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Feb 2022 21:10:42 +0100 Subject: [PATCH 129/685] mesa.drivers: improve readability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Janne Heß --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index de996cf74f3..c17b5883e45 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -235,7 +235,7 @@ self = stdenv.mkDerivation { done # NAR doesn't support hard links, so convert them to symlinks. - ${jdupes}/bin/jdupes -Hlr "$drivers" + ${jdupes}/bin/jdupes --hard-links --link-soft --recurse "$drivers" # add RPATH so the drivers can find the moved libgallium and libdricore9 # moved here to avoid problems with stripping patchelfed files From f5f9b6af9d207974075ce3963a6f17739beb3726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Feb 2022 21:25:21 +0100 Subject: [PATCH 130/685] mesa.drivers: nit, more info in a comment --- pkgs/development/libraries/mesa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c17b5883e45..a732fa92e0e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -234,7 +234,7 @@ self = stdenv.mkDerivation { fi done - # NAR doesn't support hard links, so convert them to symlinks. + # NAR doesn't support hard links, so convert them to symlinks to save space. ${jdupes}/bin/jdupes --hard-links --link-soft --recurse "$drivers" # add RPATH so the drivers can find the moved libgallium and libdricore9 From ae747bc0072f8e3eb2d17da131cd9134208a1142 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 28 Feb 2022 22:26:34 +0100 Subject: [PATCH 131/685] rubygems: rename name to pname --- pkgs/development/interpreters/ruby/rubygems/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 4150f7683d5..6a8e171ee6e 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { - name = "rubygems"; + pname = "rubygems"; version = "3.2.26"; src = fetchurl { From cba041c35d4817f83892e6a49c52fe34dde494d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Tue, 1 Mar 2022 10:47:32 +0100 Subject: [PATCH 132/685] =?UTF-8?q?gitSVN,gitMinimal:=20remove=20appendToN?= =?UTF-8?q?ame=20to=20have=20a=20consistent=20package=20n=E2=80=A6=20(#161?= =?UTF-8?q?390)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro --- .../version-management/git-and-tools/git/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 13da857b790..6af95d7fe82 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -32,7 +32,9 @@ let in stdenv.mkDerivation { - pname = "git"; + pname = "git" + + lib.optionalString svnSupport "-with-svn" + + lib.optionalString (!svnSupport && !guiSupport && !sendEmailSupport && !withManual && !pythonSupport && !withpcre2) "-minimal"; inherit version; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e717465f1..c41db87697d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25996,9 +25996,7 @@ with pkgs; }; # Git with SVN support, but without GUI. - gitSVN = lowPrio (appendToName "with-svn" (git.override { - svnSupport = true; - })); + gitSVN = lowPrio (git.override { svnSupport = true; }); git-doc = lib.addMetaAttrs { description = "Additional documentation for Git"; @@ -26008,11 +26006,11 @@ with pkgs; ''; } gitFull.doc; - gitMinimal = appendToName "minimal" (git.override { + gitMinimal = git.override { withManual = false; pythonSupport = false; withpcre2 = false; - }); + }; gitRepo = callPackage ../applications/version-management/git-repo { }; From 5545fb36d2eac17f3301dedce60e58ba8bf29a06 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Mar 2022 11:52:52 +0100 Subject: [PATCH 133/685] cargo: rename name to pname --- pkgs/development/compilers/rust/cargo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index ee909e973a3..b50f36f0d9b 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -5,7 +5,7 @@ }: rustPlatform.buildRustPackage { - name = "cargo-${rustc.version}"; + pname = "cargo"; inherit (rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again From 6381ee34b5a84a3935194de62e97d5ac22dc3a6f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Mar 2022 11:53:13 +0100 Subject: [PATCH 134/685] rust: rename name to pname --- pkgs/development/compilers/rust/binary.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index ce4250f675e..1145f4da8f6 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -19,7 +19,7 @@ in rec { rustc = stdenv.mkDerivation { - name = "rustc-${versionType}-${version}"; + pname = "rustc-${versionType}"; inherit version; inherit src; @@ -71,7 +71,7 @@ rec { }; cargo = stdenv.mkDerivation { - name = "cargo-${versionType}-${version}"; + pname = "cargo-${versionType}"; inherit version; inherit src; From a9dc51bd26ce5c667807b35ce96c39790bf8ef75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Feb 2022 15:12:51 +0100 Subject: [PATCH 135/685] python3Packages.respx: 0.19.1 -> 0.19.2 --- pkgs/development/python-modules/respx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 51d88446c0b..241f0f9e9da 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "134h9526md242p7ql0cpknqvkpd3fhxk2vridkvswg91f532w180"; + sha256 = "sha256-uNmSBJOQF4baq8AWzfwj0kinO19jr6Mp9Yblys/WmZs="; }; propagatedBuildInputs = [ From 103f0186e15a0485a9cd612b710e17e91e561e31 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Mar 2022 14:55:45 +0100 Subject: [PATCH 136/685] ocaml: rename name to pname --- pkgs/development/compilers/ocaml/generic.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 51c45616d39..0573b43f5e2 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -28,7 +28,7 @@ in let useNativeCompilers = !stdenv.isMips; inherit (lib) optional optionals optionalString; - name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}"; + pname = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}"; in let @@ -41,10 +41,7 @@ in stdenv.mkDerivation (args // { - inherit name; - inherit version; - - inherit src; + inherit pname version src; patches = map fetchpatch' patches; From e3360ea46cf66371a241621ddf7a1dabfcb1f842 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Mar 2022 18:15:58 +0000 Subject: [PATCH 137/685] libjpeg: 2.1.2 -> 2.1.3 --- pkgs/development/libraries/libjpeg-turbo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 92aaf6201b9..75ec20545ca 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -16,13 +16,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; rev = version; - sha256 = "sha256-mlHueKAU/uNUdV9s4jWKAE+XVJdpEFhw2hxGvqRwAGc="; + sha256 = "sha256-GbOYoCNAsOESXrEsBb6OHVB4TKhPUEU04PBp8qXVMug="; }; # This is needed by freeimage From 18c72c223a65a6bbe26f974f04976a279dce01e4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Feb 2022 18:46:50 +0100 Subject: [PATCH 138/685] nftables: 1.0.1 -> 1.0.2 --- pkgs/os-specific/linux/nftables/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 0b6291226bc..8485a868d8a 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, bison, file, flex , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl , libmnl, libnftnl, libpcap -, gmp, jansson, readline +, gmp, jansson, libedit +, autoreconfHook, fetchpatch , withDebugSymbols ? false , withPython ? false , python3 , withXtables ? true , iptables @@ -10,22 +11,23 @@ with lib; stdenv.mkDerivation rec { - version = "1.0.1"; + version = "1.0.2"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "08x4xw0s5sap3q7jfr91v7mrkxrydi4dvsckw85ims0qb1ibmviw"; + sha256 = "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b"; }; nativeBuildInputs = [ + autoreconfHook pkg-config bison file flex asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt ]; buildInputs = [ libmnl libnftnl libpcap - gmp jansson readline + gmp jansson libedit ] ++ optional withXtables iptables ++ optional withPython python3; @@ -33,9 +35,17 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file ''; + patches = [ + # fix build after 1.0.2 release, drop when updating to a newer release + (fetchpatch { + url = "https://git.netfilter.org/nftables/patch/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3"; + sha256 = "03dzhd7fhg0d20ly4rffk4ra7wlxp731892dhp8zw67jwhys9ywz"; + }) + ]; + configureFlags = [ "--with-json" - "--with-cli=readline" # TODO: maybe switch to editline + "--with-cli=editline" ] ++ optional (!withDebugSymbols) "--disable-debug" ++ optional (!withPython) "--disable-python" ++ optional withPython "--enable-python" From dd3d4171471b8bbd58550ca412c66dc54771fedf Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 28 Feb 2022 07:57:13 -0500 Subject: [PATCH 139/685] python3Packages.pybind11: build in parallel --- pkgs/development/python-modules/pybind11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 46c1307826e..b776271a7a0 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { postBuild = '' # build tests - make + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES ''; postInstall = '' From bcad3669e8b2b32bdaeace0618f02393121a41bf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Mar 2022 14:21:26 +0100 Subject: [PATCH 140/685] util-linuxMinimal: remove appendToName to have a consistent package name for repology --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index bedd2417e7e..d54f577def3 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - pname = "util-linux"; + pname = "util-linux" + lib.optionalString ( !nlsSupport && ncurses == null && systemd == null ) "-minimal"; version = "2.37.4"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; sha256 = "sha256-Y05pFq2RM2bDU2tkaOeER2lUm5mnsr+AMU3nirVlW4M="; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b88233d082..4b39ceb8fb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23333,11 +23333,11 @@ with pkgs; util-linuxCurses = util-linux; - util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override { + util-linuxMinimal = if stdenv.isLinux then util-linux.override { nlsSupport = false; ncurses = null; systemd = null; - }) else util-linux; + } else util-linux; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; From 5c09870c0244bbcf47a84f379e05bf10c7aa3f0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Feb 2022 00:26:26 +0100 Subject: [PATCH 141/685] python3Packages.setuptools: 57.2.0 -> 60.8.2 --- pkgs/development/python-modules/setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index e748334b5ad..f02b73a99c6 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,7 +10,7 @@ let pname = "setuptools"; - version = "57.2.0"; + version = "60.8.2"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zFmndVoATNxfvDsacY+gj5bzIbbd/8ldbsJj4qOawTA="; + sha256 = "1mqpmbn58rx3g24dm6wnllx0xs97ampn2yga3qypqgwnh1nk477i"; name = "${pname}-${version}-source"; }; From 3411fecdd5afe7642aa2015e974881725159204d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Feb 2022 03:53:29 +0100 Subject: [PATCH 142/685] python3Packages.parse-type: 0.5.6 -> 0.6.0 https://github.com/jenisys/parse_type/releases/tag/v0.6.0 --- pkgs/development/python-modules/parse-type/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 5cfb4b610ce..3356853e8ac 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "parse-type"; - version = "0.5.6"; + version = "0.6.0"; src = fetchFromGitHub { owner = "jenisys"; repo = "parse_type"; rev = "v${version}"; - sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E="; + sha256 = "sha256-v79zzAAwXYoK2N8ZPl1L90qOwMRexAV2wCTMvo4vrSc="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ --replace "--metadata PACKAGE_UNDER_TEST parse_type" "" \ - --replace "--metadata PACKAGE_VERSION 0.5.6" "" \ + --replace "--metadata PACKAGE_VERSION ${version}" "" \ --replace "--html=build/testing/report.html --self-contained-html" "" \ --replace "--junit-xml=build/testing/report.xml" "" ''; From 31507976bc879492830004338dd847c8bacb0378 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Feb 2022 17:16:38 +0100 Subject: [PATCH 143/685] python3Packages.readme_renderer: disable tests that rely on old distutils behaviour --- pkgs/development/python-modules/readme_renderer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 65ab0cb2682..31b0aa39af3 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -43,6 +43,12 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/pypa/readme_renderer/issues/221 "test_GFM_" + # Relies on old distutils behaviour removed by setuptools (TypeError: dist must be a Distribution instance) + "test_valid_rst" + "test_invalid_rst" + "test_malicious_rst" + "test_invalid_missing" + "test_invalid_empty" ]; pythonImportsCheck = [ From 20b0221ec3e97cfce9778df834c7311d34239522 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Feb 2022 17:39:18 +0100 Subject: [PATCH 144/685] python3Packages.pybind11: disable tests that parse setuptools output --- pkgs/development/python-modules/pybind11/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index b776271a7a0..8627ca53d54 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -60,6 +60,8 @@ buildPythonPackage rec { "tests/test_numpy_dtypes.py" # no need to test internal packaging "tests/extra_python_package/test_files.py" + # tests that try to parse setuptools stdout + "tests/extra_setuptools/test_setuphelper.py" ]; meta = with lib; { From f1738923eb0949cd8b14fea258347a770d9d85a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Feb 2022 22:49:50 +0100 Subject: [PATCH 145/685] python3Packages.async-lru: fix tests --- pkgs/development/python-modules/async-lru/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 9dc412ccde8..69e6519b32c 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -28,6 +28,10 @@ buildPythonPackage rec { pytest-asyncio ]; + pytestFlagsArray = [ + "--asyncio-mode=strict" + ]; + disabledTests = [ # https://github.com/aio-libs/async-lru/issues/341 "test_alru_cache_deco" From e26fba6f34dcf90b715416c67fbdd008d83593ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Feb 2022 22:55:09 +0100 Subject: [PATCH 146/685] python3Packages.bitcoin-price-api: drop --- .../bitcoin-price-api/default.nix | 24 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/bitcoin-price-api/default.nix diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix deleted file mode 100644 index c9d317a81c3..00000000000 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, python-dateutil, requests }: - -buildPythonPackage rec { - pname = "bitcoin-price-api"; - version = "0.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029"; - }; - - propagatedBuildInputs = [ python-dateutil requests ]; - - # No tests in archive - doCheck = false; - - meta = { - homepage = "https://github.com/dursk/bitcoin-price-api"; - description = "Price APIs for bitcoin exchanges"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4e0f922e168..ad8dfaa52c7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -35,6 +35,7 @@ in mapAliases ({ anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 asyncio-nats-client = nats-py; # added 2022-02-08 + bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f3ba8705a7..4585db8b1db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1214,8 +1214,6 @@ in { bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; - bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; - bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { }; bitcoinrpc = callPackage ../development/python-modules/bitcoinrpc { }; From aaf81c378c85b62e1836fec88e3bfb0b4c72f00e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 15 Feb 2022 23:37:46 +0100 Subject: [PATCH 147/685] python3Packages.django-widget-tweaks: fix build and update tests --- .../django-widget-tweaks/default.nix | 41 +++++++++++++++---- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index 63e575b6345..5fd29de1610 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -1,4 +1,16 @@ -{ buildPythonPackage, fetchFromGitHub, python, lib, django }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# native +, setuptools-scm + +# propagated +, django + +# tests +, python +}: buildPythonPackage rec { pname = "django-widget-tweaks"; @@ -11,15 +23,26 @@ buildPythonPackage rec { sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h"; }; - checkPhase = "${python.interpreter} runtests.py"; - propagatedBuildInputs = [ django ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings=tests.settings + ''; meta = with lib; { - description = "Tweak the form field rendering in templates, not in python-level form definitions."; - homepage = "https://github.com/jazzband/django-widget-tweaks"; - license = licenses.mit; - maintainers = with maintainers; [ - maxxk - ]; + description = "Tweak the form field rendering in templates, not in python-level form definitions."; + homepage = "https://github.com/jazzband/django-widget-tweaks"; + license = licenses.mit; + maintainers = with maintainers; [ + maxxk + ]; }; } From a98f94fcf3bc4b096d666211b39798e6cae9ff0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Feb 2022 00:11:41 +0100 Subject: [PATCH 148/685] python3Packages.hypothesmith: patch lark requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The library was renamed and this package didn't follow … yet? --- pkgs/development/python-modules/hypothesmith/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 3ce0f068fec..d1a6625e8c7 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "lark-parser" "lark" + ''; + propagatedBuildInputs = [ hypothesis lark libcst ]; checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; From bef19b759f000cd0b2c83665f621cc54c4430188 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Feb 2022 00:23:00 +0100 Subject: [PATCH 149/685] python3Packages.hypothesmith: configure parallel build Including pytest-xdist without configuring it has no effect... --- pkgs/development/python-modules/hypothesmith/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index d1a6625e8c7..8fe65b3f4d7 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; + pytestFlagsArray = [ + "--numprocesses $NIX_BUILD_CORES" + ]; + pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { From 83c88278c3c845d7183c3280ce975a6d36f375eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Feb 2022 01:27:27 +0100 Subject: [PATCH 150/685] isso: fix check phase --- pkgs/servers/isso/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index f02fc8df3b1..4368663ef79 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -50,7 +50,9 @@ with python3Packages; buildPythonApplication rec { checkInputs = [ nose ]; checkPhase = '' - ${python.interpreter} setup.py nosetests + runHook preCheck + ${python.interpreter} -m nose + runHook postCheck ''; passthru.tests = { inherit (nixosTests) isso; }; From 3ee7104971a9b0f62a4ab118e6158846cf93c106 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Feb 2022 16:38:11 -0800 Subject: [PATCH 151/685] python3Packages.portalocker: disable setuptools sensitive test --- pkgs/development/python-modules/portalocker/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 357ca815407..cd7d6d03bbd 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { pytest-mypy ]; + disabledTests = [ + "test_combined" # no longer compatible with setuptools>=58 + ]; + meta = with lib; { description = "A library to provide an easy API to file locking"; homepage = "https://github.com/WoLpH/portalocker"; From 42dea375bc96ab86fd0f6799d6169ae3800773ac Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Feb 2022 16:43:20 -0800 Subject: [PATCH 152/685] python3Packages.keepalive: mark brokenk for setuptools>=58 --- pkgs/development/python-modules/keepalive/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/keepalive/default.nix b/pkgs/development/python-modules/keepalive/default.nix index b6daec6ca20..6a4fcdb265f 100644 --- a/pkgs/development/python-modules/keepalive/default.nix +++ b/pkgs/development/python-modules/keepalive/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive"; homepage = "https://github.com/wikier/keepalive"; license = licenses.asl20; + broken = true; # uses use_2to3, which is no longer supported for setuptools>=58 }; } From 4ecb548a6b737755ee50bb234432d89b90c6b0e7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Feb 2022 16:44:31 -0800 Subject: [PATCH 153/685] python3Packages.parameterizedtestcase: mark brokenk for setuptools>=58 --- .../development/python-modules/parameterizedtestcase/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/parameterizedtestcase/default.nix b/pkgs/development/python-modules/parameterizedtestcase/default.nix index 20e662cd66d..9d277af8d1a 100644 --- a/pkgs/development/python-modules/parameterizedtestcase/default.nix +++ b/pkgs/development/python-modules/parameterizedtestcase/default.nix @@ -27,5 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + broken = python.isPy3k; # uses use_2to3 }; } From 4cc256f221c0c346ecd56333e8c36fd32b23369b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 15 Feb 2022 17:14:50 -0800 Subject: [PATCH 154/685] azure-cli: fix build --- pkgs/tools/admin/azure-cli/python-packages.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index d27805bb257..9fbb9d3e50a 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -481,18 +481,6 @@ let }; }); - PyGithub = super.PyGithub.overridePythonAttrs(oldAttrs: rec { - version = "1.38"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "sha256-HtCPd17FBnvIRStyveLbuVz05S/yvVDMMsackf+tknI="; - }; - - doCheck = false; - }); - knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.9.0"; From 4b2b144dfe8dc1c925ed76fbe0446cb5efa61e71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Feb 2022 16:01:33 +0100 Subject: [PATCH 155/685] python3Packages.nose-cover3: drop --- .../python-modules/nose-cover3/default.nix | 27 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/nose-cover3/default.nix diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix deleted file mode 100644 index b75dcc526c5..00000000000 --- a/pkgs/development/python-modules/nose-cover3/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -}: - -buildPythonPackage rec { - pname = "nose-cover3"; - version = "0.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1la4hhc1yszjpcchvkqk5xmzlb2g1b3fgxj9wwc58qc549whlcc1"; - }; - - propagatedBuildInputs = [ nose ]; - - # No tests included - doCheck = false; - - meta = with lib; { - description = "Coverage 3.x support for Nose"; - homepage = "https://github.com/ask/nosecover3"; - license = licenses.lgpl21; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ad8dfaa52c7..06ea055ef5b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -74,6 +74,7 @@ mapAliases ({ lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 + nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4585db8b1db..87685cce92d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5540,8 +5540,6 @@ in { nose-cov = callPackage ../development/python-modules/nose-cov { }; - nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; - nose-cprof = callPackage ../development/python-modules/nose-cprof { }; nose-exclude = callPackage ../development/python-modules/nose-exclude { }; From 73726ba87d5651f8cc318deceb6225bde35c5944 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 18 Feb 2022 20:11:29 +0000 Subject: [PATCH 156/685] python3Packages.setuptools: add patch for bundled distutils c++ support setuptools 60.x (re-)introduces a bundled distutils, which we need to patch with C++ support in the same way as we do with the stdlib's distutils (mostly to placate clang on macos) --- .../python-modules/setuptools/default.nix | 1 + .../setuptools/setuptools-distutils-C++.patch | 216 ++++++++++++++++++ 2 files changed, 217 insertions(+) create mode 100644 pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index f02b73a99c6..6b18422cc18 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -26,6 +26,7 @@ let patches = [ ./tag-date.patch + ./setuptools-distutils-C++.patch ]; buildPhase = '' diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch new file mode 100644 index 00000000000..a14e514fda7 --- /dev/null +++ b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch @@ -0,0 +1,216 @@ +Based on pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch, +adapted to apply to setuptools 60.x's bundled distutils. + +diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py +index c5c86d8f..b879e447 100644 +--- a/setuptools/_distutils/cygwinccompiler.py ++++ b/setuptools/_distutils/cygwinccompiler.py +@@ -124,14 +124,19 @@ class CygwinCCompiler(UnixCCompiler): + self.cxx = os.environ.get('CXX', 'g++') + + self.linker_dll = self.cc ++ self.linker_dll_cxx = self.cxx + shared_option = "-shared" + + self.set_executables(compiler='%s -mcygwin -O -Wall' % self.cc, + compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc, + compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, ++ compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx, + linker_exe='%s -mcygwin' % self.cc, + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='%s -mcygwin' % self.cxx, ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll_cxx, shared_option))) + + # Include the appropriate MSVC runtime library if Python was built + # with MSVC 7.0 or later. +@@ -162,8 +167,12 @@ class CygwinCCompiler(UnixCCompiler): + raise CompileError(msg) + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -279,9 +288,13 @@ class Mingw32CCompiler(CygwinCCompiler): + self.set_executables(compiler='%s -O -Wall' % self.cc, + compiler_so='%s -mdll -O -Wall' % self.cc, + compiler_cxx='%s -O -Wall' % self.cxx, ++ compiler_so_cxx='%s -mdll -O -Wall' % self.cxx, + linker_exe='%s' % self.cc, + linker_so='%s %s' +- % (self.linker_dll, shared_option)) ++ % (self.linker_dll, shared_option), ++ linker_exe_cxx='%s' % self.cxx, ++ linker_so_cxx='%s %s' ++ % (self.linker_dll_cxx, shared_option)) + + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) +diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py +index 4a77a431..1ad85181 100644 +--- a/setuptools/_distutils/sysconfig.py ++++ b/setuptools/_distutils/sysconfig.py +@@ -216,9 +216,11 @@ def customize_compiler(compiler): + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' + +- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ ++ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', ++ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') ++ ++ cxxflags = cflags + + if 'CC' in os.environ: + newcc = os.environ['CC'] +@@ -232,19 +234,27 @@ def customize_compiler(compiler): + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = cflags + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -253,13 +263,17 @@ def customize_compiler(compiler): + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + + if 'RANLIB' in os.environ and compiler.executables.get('ranlib', None): +diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py +index a07e5988..576ef490 100644 +--- a/setuptools/_distutils/unixccompiler.py ++++ b/setuptools/_distutils/unixccompiler.py +@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler): + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = self.compiler_so ++ compiler_so_cxx = self.compiler_so_cxx + if sys.platform == 'darwin': + compiler_so = _osx_support.compiler_fixup(compiler_so, + cc_args + extra_postargs) ++ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, ++ cc_args + extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + +@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler): + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: +- if target_desc == CCompiler.EXECUTABLE: +- linker = self.linker_exe[:] ++ if target_lang == "c++": ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe_cxx[:] ++ else: ++ linker = self.linker_so_cxx[:] + else: +- linker = self.linker_so[:] +- if target_lang == "c++" and self.compiler_cxx: +- # skip over environment variable settings if /usr/bin/env +- # is used to set up the linker's environment. +- # This is needed on OSX. Note: this assumes that the +- # normal and C++ compiler have the same environment +- # settings. +- i = 0 +- if os.path.basename(linker[0]) == "env": +- i = 1 +- while '=' in linker[i]: +- i += 1 +- +- if os.path.basename(linker[i]) == 'ld_so_aix': +- # AIX platforms prefix the compiler with the ld_so_aix +- # script, so we need to adjust our linker index +- offset = 1 ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe[:] + else: +- offset = 0 +- +- linker[i+offset] = self.compiler_cxx[i] ++ linker = self.linker_so[:] + + if sys.platform == 'darwin': + linker = _osx_support.compiler_fixup(linker, ld_args) From 01667337f1a397fab9ac234eac1f975d37d482f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 21:26:09 +0100 Subject: [PATCH 157/685] release-python.nix: add buildcatrust to tested set This is the tool that manages our certificate store. --- pkgs/top-level/release-python.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index d90be7f3bb4..f3418572220 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -35,11 +35,12 @@ let name = "python-tested"; meta.description = "Release-critical packages from the python package sets"; constituents = [ - jobs.remarshal.x86_64-linux # Used in pkgs.formats helper - jobs.python39Packages.colorama.x86_64-linux # Used in nixos test-driver - jobs.python39Packages.ptpython.x86_64-linux # Used in nixos test-driver - jobs.python39Packages.requests.x86_64-linux # Almost ubiquous package - jobs.python39Packages.sphinx.x86_64-linux # Document creation for many packages + jobs.remarshal.x86_64-linux # Used in pkgs.formats helper + jobs.python39Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert + jobs.python39Packages.colorama.x86_64-linux # Used in nixos test-driver + jobs.python39Packages.ptpython.x86_64-linux # Used in nixos test-driver + jobs.python39Packages.requests.x86_64-linux # Almost ubiquous package + jobs.python39Packages.sphinx.x86_64-linux # Document creation for many packages ]; }; From 3bb7f98d2b267326fe2111587170176167ef4d74 Mon Sep 17 00:00:00 2001 From: Joel Date: Tue, 1 Mar 2022 14:56:46 +1000 Subject: [PATCH 158/685] python3Packages.rich: 11.0.0 -> 11.2.0 - https://github.com/Textualize/rich/releases/tag/v11.2.0 - https://github.com/Textualize/rich/releases/tag/v11.1.0 --- pkgs/development/python-modules/rich/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index f6194970adb..3e7055d274e 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "rich"; - version = "11.0.0"; + version = "11.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "willmcgugan"; + owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "0vkwar22rv1j6a3kqj3c016j0vnnha0kwi79fkd90ib1n501m7rn"; + sha256 = "19k8c8jnqj1v0ji8kkx3r2ny6wlpwy58ir7lyrh2qyjvzkw08i58"; }; nativeBuildInputs = [ poetry-core ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"; - homepage = "https://github.com/willmcgugan/rich"; + homepage = "https://github.com/Textualize/rich"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; From c90cc201b3a51a4d7230ea319ce9a2c8ae38195d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 2 Mar 2022 19:10:49 +0100 Subject: [PATCH 159/685] git: install contrib git hooks --- .../version-management/git-and-tools/git/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 13da857b790..b9697f01062 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -166,8 +166,13 @@ stdenv.mkDerivation { cp -a contrib $out/share/git/ mkdir -p $out/share/bash-completion/completions ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git - mkdir -p $out/share/bash-completion/completions ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/ + # only readme, developed in another repo + rm -r contrib/hooks/multimail + mkdir -p $out/share/git-core/contrib + cp -a contrib/hooks/ $out/share/git-core/contrib/ + substituteInPlace $out/share/git-core/contrib/hooks/pre-auto-gc-battery \ + --replace ' grep' ' ${gnugrep}/bin/grep' \ # grep is a runtime dependency, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ From 71f1f4884b5e40ae6647fa7f0f1890554ad6aa7d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Jan 2022 12:49:58 +0000 Subject: [PATCH 160/685] openssl: stop static binaries referencing libs Previously, the "out" output of openssl would contain would contain a couple of tiny libraries in etc/, and the big OpenSSL libraries in lib/. This bloated closures when building things against OpenSSL with pkgsStatic. To fix this, introduce a lib output, so only the config files are left in out. Additionally, we have to disable support for dynamic engines in static builds to avoid a reference to the engines directory in $lib. I don't think it's likely that this would ever have worked anyway. --- pkgs/development/libraries/openssl/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 390227cfe95..a478f6e03cf 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -45,7 +45,7 @@ let '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' ''; - outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional withDocs "doc"; + outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optional withDocs "doc"; setOutputFlags = false; separateDebugInfo = !stdenv.hostPlatform.isDarwin && @@ -94,7 +94,7 @@ let dontAddStaticConfigureFlags = true; configureFlags = [ "shared" # "shared" builds both shared and static libraries - "--libdir=lib" + "--libdir=${placeholder "lib"}/lib" "--openssldir=etc/ssl" ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" @@ -103,6 +103,7 @@ let ++ lib.optional enableSSL3 "enable-ssl3" ++ lib.optional (lib.versionAtLeast version "3.0.0") "enable-ktls" ++ lib.optional (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" + ++ lib.optional static "disable-dynamic-engine" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. @@ -117,8 +118,21 @@ let "MANSUFFIX=ssl" ]; + buildFlags = lib.optionals static [ + # Even though engines are disabled in static builds, we have to + # override ENGINESDIR so the bin output doesn't end up with an + # reference to the lib output. + "ENGINESDIR=/" + ]; + enableParallelBuilding = true; + preInstall = lib.optionalString static '' + # Build system wants to be able to create the engines directory + # even though nothing will get installed to it. + installFlagsArray+=(ENGINESDIR="$NIX_BUILD_TOP/engines") + ''; + postInstall = lib.optionalString (!static) '' # If we're building dynamic libraries, then don't install static From 7bd35b61fe880ae282b7a332431b740f20406c3c Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 3 Mar 2022 16:04:59 -0500 Subject: [PATCH 161/685] go_1_17: 1.17.7 -> 1.17.8 --- pkgs/development/compilers/go/1.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index a7259358749..5c1cff94053 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.7"; + version = "1.17.8"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-wQjNM7c7GRGgK2l3Qd896kPgGlxOCOQJ6LOg43RdK00="; + sha256 = "sha256-Lv/NiYFA2nmgYfN4TKT42LE9gR+yq+na0kBEQtq733o="; }; # perl is used for testing go vet From 8b5a7940b0cd1f6f232933099f12f383c3b3c32a Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Fri, 25 Feb 2022 17:06:28 -0500 Subject: [PATCH 162/685] go: Bunch of fixes when using excludedPackages and other bits Few things going on in this commit: Do not print "Building subPakage $pkg" message if actually going to skip the package. This was confusing to me when I was trying to figure out how to set excludedPackages and seeing the "Building subpackage $pkg" messages for packages I wanted to skip. Turns out this messages was being printed before checking if we actually wanted to build the package and not necessarily that my excludedPackages was wrong. Make go-packages look a little bit more like go-modules, by adding testdata to the default list of excluded packages. This commit also does some setup outside the buildGoDir function so that we avoid checking `excludedPackages` for every package and cut down the number of grep calls by half since we always want at least one grep for the default excludedPackages, might as well just add to the patterns being checked. Finally, adds documentation for usage of excludedPackages and subPackages. I had to read the implementation to figure out how to correctly use these function arguments since there was no documentation and different uses in the code base. So this commit documents usage of the arguments. --- doc/languages-frameworks/go.section.md | 6 +++++- pkgs/development/go-modules/generic/default.nix | 12 ++++++++++-- pkgs/development/go-packages/generic/default.nix | 13 +++++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 411205d08e4..9c67a514335 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -142,4 +142,8 @@ Removes the pre-existing vendor directory. This should only be used if the depen ### `subPackages` {#var-go-subPackages} -Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built. +Specified as a string or list of strings. Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built. + +### `excludedPackages` {#var-go-excludedPackages} + +Specified as a string or list of strings. Causes the builder to skip building child packages that match any of the provided values. If `excludedPackages` is not specified, all child packages will be built. diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 76d0dc961c5..ace8b820ee2 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -171,13 +171,20 @@ let buildPhase = args.buildPhase or '' runHook preBuild + exclude='\(/_\|examples\|Godeps\|testdata' + if [[ -n "$excludedPackages" ]]; then + IFS=' ' read -r -a excludedArr <<<$excludedPackages + printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}" + excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf + exclude+='\\|'"$excludedAlternates" + fi + exclude+='\)' + buildGoDir() { local d; local cmd; cmd="$1" d="$2" . $TMPDIR/buildFlagsArray - echo "$d" | grep -q "\(/_\|examples\|Godeps\|testdata\)" && return 0 - [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then @@ -214,6 +221,7 @@ let export NIX_BUILD_CORES=1 fi for pkg in $(getGoDirs ""); do + grep -q "$exclude" <<<$pkg && continue echo "Building subPackage $pkg" buildGoDir install "$pkg" done diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 7c4d173b937..6e96f443ff9 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -150,13 +150,20 @@ let runHook renameImports + exclude='\(/_\|examples\|Godeps\|testdata' + if [[ -n "$excludedPackages" ]]; then + IFS=' ' read -r -a excludedArr <<<$excludedPackages + printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}" + excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf + exclude+='\\|'"$excludedAlternates" + fi + exclude+='\)' + buildGoDir() { local d; local cmd; cmd="$1" d="$2" . $TMPDIR/buildFlagsArray - echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 - [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" ''${tags:+-tags=${lib.concatStringsSep "," tags}} ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES $d 2>&1)"; then if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then @@ -195,6 +202,8 @@ let export NIX_BUILD_CORES=1 fi for pkg in $(getGoDirs ""); do + grep -q "$exclude" <<<$pkg && continue + echo "Building subPackage $pkg" buildGoDir install "$pkg" done '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' From 64ca089436377e1359636c22e19fdd56f0d889ff Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Fri, 25 Feb 2022 17:19:19 -0500 Subject: [PATCH 163/685] go: Avoid setting excludedPackages for package already being excluded by default --- pkgs/development/tools/go-motion/default.nix | 1 - pkgs/development/tools/gocode-gomod/default.nix | 2 -- pkgs/development/tools/gocode/default.nix | 1 - pkgs/development/tools/gogetdoc/default.nix | 2 -- pkgs/development/tools/golint/default.nix | 2 -- pkgs/development/tools/gotools/default.nix | 2 +- pkgs/development/tools/ineffassign/default.nix | 1 - pkgs/development/tools/interfacer/default.nix | 1 - 8 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index 9ece650f0cb..5004afc28e3 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -9,7 +9,6 @@ buildGoPackage rec { rev = "218875ebe23806e7af82f3b5b14bb3355534f679"; goPackagePath = "github.com/fatih/motion"; - excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index fca346b78c4..c07d38b6073 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -9,8 +9,6 @@ buildGoModule rec { # standard packages. allowGoReference = true; - excludedPackages = "internal/suggest/testdata"; - src = fetchFromGitHub { owner = "stamblerre"; repo = "gocode"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index be9f70da934..687b69cf202 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -6,7 +6,6 @@ buildGoPackage rec { rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c"; goPackagePath = "github.com/mdempsky/gocode"; - excludedPackages = "internal/suggest/testdata"; # we must allow references to the original `go` package, # because `gocode` needs to dig into $GOROOT to provide completions for the diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 2a111a8d1ab..6f7c189ea9d 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -12,8 +12,6 @@ buildGoModule rec { doCheck = false; - excludedPackages = "\\(testdata\\)"; - src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 3187f793127..aa6ce6c7cda 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -5,8 +5,6 @@ buildGoModule rec { version = "20201208-${lib.strings.substring 0 7 rev}"; rev = "83fdc39ff7b56453e3793356bcff3070b9b96445"; - excludedPackages = "testdata"; - # we must allow references to the original `go` package, as golint uses # compiler go/build package to load the packages it's linting. allowGoReference = true; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 285d546d742..190a41d2db3 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { ''; excludedPackages = "\\(" - + lib.concatStringsSep "\\|" ([ "testdata" "vet" "cover" ]) + + lib.concatStringsSep "\\|" ([ "vet" "cover" ]) + "\\)"; # Set GOTOOLDIR for derivations adding this to buildInputs diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 21580957752..111048b562f 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -9,7 +9,6 @@ buildGoPackage rec { rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; goPackagePath = "github.com/gordonklaus/ineffassign"; - excludedPackages = "testdata"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix index 4358ee24489..072818ea621 100644 --- a/pkgs/development/tools/interfacer/default.nix +++ b/pkgs/development/tools/interfacer/default.nix @@ -9,7 +9,6 @@ buildGoPackage rec { rev = "c20040233aedb03da82d460eca6130fcd91c629a"; goPackagePath = "mvdan.cc/interfacer"; - excludedPackages = "check/testdata"; src = fetchFromGitHub { inherit rev; From 10d3e3a0f41fd682011e572ab92edf1edda1138e Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Sat, 26 Feb 2022 10:01:37 -0500 Subject: [PATCH 164/685] go: convert alternating regex string to list of packages to exclude This is just easier to read. --- pkgs/applications/networking/cluster/kube3d/default.nix | 2 +- pkgs/applications/networking/cluster/tektoncd-cli/default.nix | 2 +- .../networking/instant-messengers/pond/default.nix | 2 +- pkgs/development/tools/deadcode/default.nix | 2 +- pkgs/development/tools/delve/default.nix | 2 +- pkgs/development/tools/gauge/default.nix | 2 +- pkgs/development/tools/ginkgo/default.nix | 2 +- pkgs/development/tools/gotools/default.nix | 4 +--- pkgs/development/tools/reftools/default.nix | 2 +- pkgs/servers/monitoring/grafana/default.nix | 2 +- pkgs/tools/security/cosign/default.nix | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 0da63fae421..ebcb3bda738 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - excludedPackages = "\\(tools\\|docgen\\)"; + excludedPackages = [ "tools" "docgen" ]; ldflags = let t = "github.com/rancher/k3d/v5/version"; in diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 9f3c046a266..df6fd8c72c8 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { # third_party/VENDOR-LICENSE breaks build/check as go files are still included # docs is a tool for generating docs - excludedPackages = "\\(third_party\\|cmd/docs\\)"; + excludedPackages = [ "third_party" "cmd/docs" ]; preCheck = '' # some tests try to write to the home dir diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index f26cd010944..cb52144b017 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi ++ lib.optionals gui [ wrapGAppsHook ]; tags = lib.optionals (!gui) [ "nogui" ]; - excludedPackages = "\\(appengine\\|bn256cgo\\)"; + excludedPackages = [ "appengine" "bn256cgo" ]; postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix index 014acc89e1f..c5074cd0377 100644 --- a/pkgs/development/tools/deadcode/default.nix +++ b/pkgs/development/tools/deadcode/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "210d2dc333e90c7e3eedf4f2242507a8e83ed4ab"; goPackagePath = "github.com/tsenart/deadcode"; - excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; + excludedPackages = "cmd/fillswitch/test-fixtures"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 9681bfe75bd..f73d3ce0c44 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { version = "1.8.1"; goPackagePath = "github.com/go-delve/delve"; - excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; + excludedPackages = [ "_fixtures" "scripts" "service/test" ]; src = fetchFromGitHub { owner = "go-delve"; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 1048ca19441..4a300df0577 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "gauge"; version = "1.4.3"; - excludedPackages = ''\(build\|man\)''; + excludedPackages = [ "build" "man" ]; src = fetchFromGitHub { owner = "getgauge"; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 6719d710392..9985d43da2f 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { # integration tests expect more file changes # types tests are missing CodeLocation - excludedPackages = "\\(integration\\|types\\)"; + excludedPackages = [ "integration" "types" ]; meta = with lib; { homepage = "https://onsi.github.io/ginkgo/"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 190a41d2db3..442f98ac7f2 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -39,9 +39,7 @@ buildGoModule rec { export GOTOOLDIR=$out/bin ''; - excludedPackages = "\\(" - + lib.concatStringsSep "\\|" ([ "vet" "cover" ]) - + "\\)"; + excludedPackages = [ "vet" "cover" ]; # Set GOTOOLDIR for derivations adding this to buildInputs postInstall = '' diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index a31108f3381..0e8371e4a01 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { doCheck = false; - excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; + excludedPackages = "cmd/fillswitch/test-fixtures"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 425dcdfa56c..0e62dbd7ef7 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "grafana"; version = "8.4.2"; - excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; + excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ]; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 5bfc16718bf..f743c055464 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorSha256 = "sha256-d3aOX4iMlhlxgYbqCHCIFKXunVha0Fw4ZBmy4OA6EhI="; - excludedPackages = "\\(sample\\|webhook\\|help\\)"; + excludedPackages = [ "sample" "webhook" "help" ]; tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ]; From dc17b7f725b597d1efb7609195b93d90694a6c8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 10:14:37 +0100 Subject: [PATCH 165/685] python3Packages.oauthlib: 3.1.1 -> 3.2.0 --- .../python-modules/oauthlib/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 01e6ca29b5d..3a2f5cb1bdd 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -1,28 +1,26 @@ { lib -, buildPythonPackage -, fetchFromGitHub - -# propagates , blinker +, buildPythonPackage , cryptography -, pyjwt - -# test +, fetchFromGitHub , mock +, pyjwt , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "oauthlib"; - version = "3.1.1"; + version = "3.2.0"; format = "setuptools"; - # master supports pyjwt==1.7.1 + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256:1bgxpzh11i0x7h9py3a29cz5z714b3p498b62znnn5ciy0cr80sv"; + hash = "sha256-41JFURG8G8BjlAlNu2+lbj84XR/trAk1U5OPYxPq+5M="; }; propagatedBuildInputs = [ @@ -36,10 +34,14 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "oauthlib" + ]; + meta = with lib; { + description = "Generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; homepage = "https://github.com/idan/oauthlib"; - description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; - maintainers = with maintainers; [ prikhi ]; license = licenses.bsd3; + maintainers = with maintainers; [ prikhi ]; }; } From 5f82cdc853aaf809534dcdf85bfe0c1ad1135c12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 12:00:41 +0100 Subject: [PATCH 166/685] python3Packages.weconnect: 0.37.0 -> 0.37.1 --- pkgs/development/python-modules/weconnect/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index f5af3e5aa50..5c331b84dac 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.37.0"; + version = "0.37.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-h6jKtQt9vCh5bnhIqWLniUIJ41GxCs0uSi4vBVNs8tE="; + sha256 = "sha256-wug1wodbbVzuH0mPwWVU2BE166EqnD5hUXlTwAxNK+o="; }; propagatedBuildInputs = [ @@ -42,8 +42,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," - substituteInPlace requirements.txt \ - --replace "pillow~=9.0.0" "pillow" + substituteInPlace image_extra_requirements.txt \ + --replace "pillow~=9.0.1" "pillow" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" From e7d4a05b2d20c07c32d68867b6cb1941eac5eb72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 12:01:20 +0100 Subject: [PATCH 167/685] python3Packages.weconnect-mqtt: 0.30.0 -> 0.30.1 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 42a3877cffc..1bb4c0a4d55 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.30.0"; + version = "0.30.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-/mlN9gEEy8DJSFef0Pp2PLjHhwStKwANKSzw4nT19eM="; + sha256 = "sha256-J4Sh33onwYWE5k0c7KFlJpoh6X7c/43ZPQtfoD1BIhA="; }; propagatedBuildInputs = [ From 62860b31ef9060340c480831b7f735b963dcfcbf Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 3 Mar 2022 13:24:14 -0800 Subject: [PATCH 168/685] Revert "darwin.apple_sdk.frameworks.IOSurface: use Libsystem instead of xpc (#161561)" This reverts commit 92074a45f308a1c42de2c57233471bfd7cc6189c. --- pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix index 5f26a14341f..e9121b02116 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix @@ -89,7 +89,9 @@ IOBluetooth = { inherit CoreBluetooth IOKit; }; IOBluetoothUI = { inherit IOBluetooth; }; IOKit = {}; - IOSurface = { inherit IOKit Libsystem; }; + # `IOSurface` should depend on `Libsystem` (in place of `xpc`) but this currently causes build + # issues due to incompatibility issues between `Libsystem` and `libcxx`. + IOSurface = { inherit IOKit xpc; }; IOUSBHost = {}; IdentityLookup = {}; ImageCaptureCore = {}; From 48a007306b4bc19af90142e28b7da1e9330f782a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 Mar 2022 08:18:00 +0100 Subject: [PATCH 169/685] expat: 2.4.6 -> 2.4.7 This primarily fixes regressions in various other packages after the expat security fixes. --- pkgs/development/libraries/expat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index ac54ced75b1..83038918e3a 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "expat"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3lV5S3qbwhSFL9wHW+quzYVO/hNhWX5iaO6HlGlRKJs="; + sha256 = "0zbss0dssn17mjmvk17qfi5cmvm0lcyzs62cwvqr219hhl864xcq"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers From c18eab5a31b3e37254780877e4ca6eabda0a0e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 Mar 2022 08:19:03 +0100 Subject: [PATCH 170/685] Revert "python3Packages.xmltodict: disable incompatible expat tests" This reverts commit 0451c289d3011dd1ad1f97f6157c8937ba4f620e. Now it's not needed anymore. --- .../development/python-modules/xmltodict/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 13cc5b89c2a..790aaec3ce3 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , coverage -, pytestCheckHook +, nose }: buildPythonPackage rec { @@ -14,13 +14,11 @@ buildPythonPackage rec { sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; - checkInputs = [ coverage pytestCheckHook ]; + checkInputs = [ coverage nose ]; - disabledTests = [ - # incompatibilities with security fixes: https://github.com/martinblech/xmltodict/issues/289 - "test_namespace_collapse" - "test_namespace_support" - ]; + checkPhase = '' + nosetests + ''; meta = { description = "Makes working with XML feel like you are working with JSON"; From 331797fdc9c842342047a822bc3ab0b29827b1ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Mar 2022 12:18:29 +0100 Subject: [PATCH 171/685] python3Packages.weconnect: 0.37.1 -> 0.37.2 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 5c331b84dac..096f1b0e99b 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.37.1"; + version = "0.37.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-wug1wodbbVzuH0mPwWVU2BE166EqnD5hUXlTwAxNK+o="; + sha256 = "sha256-54T4L1MzF2rkKM0AXz+bPBdVL7Izdho6c3AVSXBho2E="; }; propagatedBuildInputs = [ From b85cdb44a83225624a81a19f0bd619930911235c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Mar 2022 12:40:13 +0100 Subject: [PATCH 172/685] python3Packages.weconnect-mqtt: 0.30.1 -> 0.30.2 --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 1bb4c0a4d55..0bb0a8f7999 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.30.1"; + version = "0.30.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-J4Sh33onwYWE5k0c7KFlJpoh6X7c/43ZPQtfoD1BIhA="; + sha256 = "sha256-e8dDdtabEHQKNx3c63Ou3T3ygsj4763C9Pd8usFrSCE="; }; propagatedBuildInputs = [ From bfc349fcb7032a3cb137aae185ff213a22add6a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Feb 2022 12:35:41 +0100 Subject: [PATCH 173/685] python3Packages.XlsxWriter: 1.2.9 -> 3.0.2 --- .../python-modules/XlsxWriter/default.nix | 38 ++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index 15bd1ee35fe..5096f37e302 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -1,24 +1,36 @@ -{lib, buildPythonPackage, fetchFromGitHub}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { + pname = "xlsxwriter"; + version = "3.0.2"; + format = "setuptools"; - pname = "XlsxWriter"; - version = "1.2.9"; + disabled = pythonOlder "3.7"; - # PyPI release tarball doesn't contain tests so let's use GitHub. See: - # https://github.com/jmcnamara/XlsxWriter/issues/327 - src = fetchFromGitHub{ + src = fetchFromGitHub { owner = "jmcnamara"; - repo = pname; + repo = "XlsxWriter"; rev = "RELEASE_${version}"; - sha256 = "08pdca5ssi50bx2xz52gkmjix2ybv5i4bjw7yd6yfiph0y0qsbsb"; + hash = "sha256-I87/8OhMoI9/BRXdmTZ1Ul+d+/x+Kg/9CuqMgTsP8Eo="; }; - meta = { - description = "A Python module for creating Excel XLSX files"; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xlsxwriter" + ]; + + meta = with lib; { + description = "Module for creating Excel XLSX files"; homepage = "https://xlsxwriter.readthedocs.io/"; - maintainers = with lib.maintainers; [ jluttine ]; - license = lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ jluttine ]; }; - } From 999f1ed5b5aa059de96bf060c66b1443cbdb326f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Feb 2022 10:56:52 +0000 Subject: [PATCH 174/685] ethtool: 5.15 -> 5.16 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 65797f65fe6..d46815e8bf2 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "5.15"; + version = "5.16"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-aG/WEQOJ1JwqEg8Aw81d/kPeutqOAh5CcNdLvkUqEW0="; + sha256 = "sha256-qi/vGTbdShF1XfoL25Pw7FvqRSCNJ8l1S8Or4apCwcs="; }; nativeBuildInputs = [ From 3cef6effe981d7dd2896320da6f0bf7e94a7fd9c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 15:45:58 +0100 Subject: [PATCH 175/685] python3Packages.xmltodict: use pytest over nosetests --- .../python-modules/xmltodict/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 790aaec3ce3..5e0733b6256 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -1,28 +1,27 @@ { lib , buildPythonPackage , fetchPypi -, coverage -, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "xmltodict"; version = "0.12.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; - checkInputs = [ coverage nose ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - nosetests - ''; - - meta = { + meta = with lib; { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 28b3e0a8a0cb69043cc0971a8eec25f93ac9f19f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Mar 2022 15:48:05 +0000 Subject: [PATCH 176/685] cmake: 3.22.2 -> 3.22.3 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 47abc7ec767..cf2fe926ddb 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI"; - version = "3.22.2"; + version = "3.22.3"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-PBxHi5ZQsQfUUsW9VFxy4vrU43wJuJoZhLmi9G32rO0="; + sha256 = "sha256-n4RpFm+UVTtpeKFu4pIn7Emi61zrYIJ13sQNiuDRtaA="; }; patches = [ From 0423158e106ec4a838f0d8f956faecfacf4396f3 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 12 Dec 2021 03:57:53 +0100 Subject: [PATCH 177/685] systemd: reformat code with nixpkgs-fmt --- pkgs/os-specific/linux/systemd/default.nix | 83 +++++++++++++--------- 1 file changed, 50 insertions(+), 33 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3a3a419093b..c29bd637bf4 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -168,40 +168,51 @@ stdenv.mkDerivation { # need (AFAICT). # See https://github.com/systemd/systemd/pull/20479 for upsteam discussion. ./0019-core-handle-lookup-paths-being-symlinks.patch - ] ++ lib.optional stdenv.hostPlatform.isMusl (let - oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-14c6e5a4b72d0e4665279158a0740dd1dc21f72f.tar.bz2"; - sha256 = "1jixya4czkr5p5rdcw3d6ips8zzr82dvnanvzvgjh67730scflya"; - }; - musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; - in [ - (musl-patches + "/0002-don-t-use-glibc-specific-qsort_r.patch") - (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch") - (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch") - (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch") - (musl-patches + "/0006-Include-netinet-if_ether.h.patch") - (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch") - (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch") - (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch") - (musl-patches + "/0010-Use-uintmax_t-for-handling-rlim_t.patch") - (musl-patches + "/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch") - (musl-patches + "/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch") - (musl-patches + "/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch") - (musl-patches + "/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch") - (musl-patches + "/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch") - (musl-patches + "/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch") - (musl-patches + "/0017-missing_type.h-add-__compar_d_fn_t-definition.patch") - (musl-patches + "/0018-avoid-redefinition-of-prctl_mm_map-structure.patch") - (musl-patches + "/0019-Handle-missing-LOCK_EX.patch") - (musl-patches + "/0021-test-json.c-define-M_PIl.patch") - (musl-patches + "/0022-do-not-disable-buffer-in-writing-files.patch") - (musl-patches + "/0025-Handle-__cpu_mask-usage.patch") - (musl-patches + "/0026-Handle-missing-gshadow.patch") - (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch") - # Being discussed upstream: https://lists.openembedded.org/g/openembedded-core/topic/86411771#157056 - ./musl.diff - ]); + # In v248 compiler weirdness and refactoring lead to the bootloader + # erroring out handling keyboard input on some systems. See + # https://github.com/systemd/systemd/issues/19191 + # This should be redundant in v249.6 when it offically gets tagged in + # systemd-stable + ./0020-sd-boot-Unify-error-handling.patch + ./0021-sd-boot-Rework-console-input-handling.patch + ] ++ lib.optional stdenv.hostPlatform.isMusl ( + let + oe-core = fetchzip { + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-14c6e5a4b72d0e4665279158a0740dd1dc21f72f.tar.bz2"; + sha256 = "1jixya4czkr5p5rdcw3d6ips8zzr82dvnanvzvgjh67730scflya"; + }; + musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; + in + [ + (musl-patches + "/0002-don-t-use-glibc-specific-qsort_r.patch") + (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch") + (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch") + (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch") + (musl-patches + "/0006-Include-netinet-if_ether.h.patch") + (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch") + (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch") + (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch") + (musl-patches + "/0010-Use-uintmax_t-for-handling-rlim_t.patch") + (musl-patches + "/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch") + (musl-patches + "/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch") + (musl-patches + "/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch") + (musl-patches + "/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch") + (musl-patches + "/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch") + (musl-patches + "/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch") + (musl-patches + "/0017-missing_type.h-add-__compar_d_fn_t-definition.patch") + (musl-patches + "/0018-avoid-redefinition-of-prctl_mm_map-structure.patch") + (musl-patches + "/0019-Handle-missing-LOCK_EX.patch") + (musl-patches + "/0021-test-json.c-define-M_PIl.patch") + (musl-patches + "/0022-do-not-disable-buffer-in-writing-files.patch") + (musl-patches + "/0025-Handle-__cpu_mask-usage.patch") + (musl-patches + "/0026-Handle-missing-gshadow.patch") + (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch") + + # Being discussed upstream: https://lists.openembedded.org/g/openembedded-core/topic/86411771#157056 + ./musl.diff + ] + ); postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" @@ -575,6 +586,12 @@ stdenv.mkDerivation { ''; postInstall = '' + # sysinit.target: Don't depend on + # systemd-tmpfiles-setup.service. This interferes with NixOps's + # send-keys feature (since sshd.service depends indirectly on + # sysinit.target). + mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ + mkdir -p $out/example/systemd mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example mv $out/lib/systemd/{system,user} $out/example/systemd From 3869ce784e80445cc6037999b087e7ca61ebf60f Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 12 Dec 2021 03:56:45 +0100 Subject: [PATCH 178/685] systemd: 249.7 -> 250.3 --- .../from_md/release-notes/rl-2205.section.xml | 5 + .../manual/release-notes/rl-2205.section.md | 2 + ...ts-for-uninitialised-encrypted-devic.patch | 4 +- ...on-t-try-to-unmount-nix-or-nix-store.patch | 8 +- .../systemd/0003-Fix-NixOS-containers.patch | 10 +- ...004-Look-for-fsck-in-the-right-place.patch | 6 +- ...some-NixOS-specific-unit-directories.patch | 18 +- ...f-a-useless-message-in-user-sessions.patch | 8 +- ...d-timedated-disable-methods-that-cha.patch | 10 +- .../linux/systemd/0008-Fix-hwdb-paths.patch | 4 +- ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch | 22 +- ...calectl-use-etc-X11-xkb-for-list-x11.patch | 8 +- ...te-statedir-and-don-t-touch-prefixdi.patch | 12 +- ...-environment-when-calling-generators.patch | 8 +- ...3-add-rootprefix-to-lookup-dir-paths.patch | 6 +- ...-execute-scripts-in-etc-systemd-syst.patch | 10 +- ...ecute-scripts-in-etc-systemd-system-.patch | 6 +- ...s.service-Update-ConditionFileNotEmp.patch | 23 +-- ...-placeholder-for-DEFAULT_PATH_NORMAL.patch | 6 +- ...pkg-config-derive-prefix-from-prefix.patch | 4 +- ...e-handle-lookup-paths-being-symlinks.patch | 14 +- pkgs/os-specific/linux/systemd/default.nix | 189 ++++++++++++------ 22 files changed, 224 insertions(+), 159 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index f134295fa3e..7fecf5d66f0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -50,6 +50,11 @@ granular distinction between reloads and restarts. + + + Systemd has been upgraded to the version 250. + + kops diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index b089044db05..461b0e88db1 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -19,6 +19,8 @@ In addition to numerous new and upgraded packages, this release has the followin - systemd services can now set [systemd.services.\.reloadTriggers](#opt-systemd.services) instead of `reloadIfChanged` for a more granular distinction between reloads and restarts. +- Systemd has been upgraded to the version 250. + - [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details. ## New Services {#sec-release-22.05-new-services} diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index a87c59558e0..404b0d2ee6f 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 93b2d29de784c68d1b4d70d7f214b19432aec6a8 Mon Sep 17 00:00:00 2001 +From 8622539fe2ce67934ed2e60626a2303ef8191e40 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices @@ -28,5 +28,5 @@ index 25b8a590a6..d18999ea87 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index e9fedd239f4..d37ace3250c 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From 41edb381df0326e216b3c569d2cd5764591267d9 Mon Sep 17 00:00:00 2001 +From a845786195182c376b72a85433e278c35243676d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store @@ -25,10 +25,10 @@ index f683f05981..5a04c2c2a6 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 1f945b7875..6df9d383ba 100644 +index f5a2cb20c1..51608d24c0 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c -@@ -508,6 +508,8 @@ static int delete_md(MountPoint *m) { +@@ -502,6 +502,8 @@ static int delete_md(MountPoint *m) { static bool nonunmountable_path(const char *path) { return path_equal(path, "/") @@ -38,5 +38,5 @@ index 1f945b7875..6df9d383ba 100644 || path_equal(path, "/usr") #endif -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 217629f7d6a..56c6238b81f 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From 43620479f6bfbbc4c3eed28947e0676c817acb7c Mon Sep 17 00:00:00 2001 +From d33f3461fa2202ef9b0d6cdf2137c510c59fb052 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/19] Fix NixOS containers @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 575b9da447..438ca294db 100644 +index 8f17ab8810..197e5aa252 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5590,6 +5590,7 @@ static int run(int argc, char *argv[]) { +@@ -5625,6 +5625,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 575b9da447..438ca294db 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5604,6 +5605,7 @@ static int run(int argc, char *argv[]) { +@@ -5639,6 +5640,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } @@ -30,5 +30,5 @@ index 575b9da447..438ca294db 100644 } else { -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index f7b768af515..36d0ee0cde2 100644 --- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From a08ed6697974d7f7dabe60d42bbc9e31a10f7e23 Mon Sep 17 00:00:00 2001 +From 8fd5968163f3a1cb5f196d934756ba08ccaa5b1e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/19] Look for fsck in the right place @@ -8,7 +8,7 @@ Subject: [PATCH 04/19] Look for fsck in the right place 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index cd7adfaeb9..68cebdd158 100644 +index 745d01ff50..dd4eef45c3 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -368,7 +368,7 @@ static int run(int argc, char *argv[]) { @@ -21,5 +21,5 @@ index cd7adfaeb9..68cebdd158 100644 cmdline[i++] = "-T"; -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 7ebf07d0a82..6acac84a9d2 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From ddcfae6de8c460903c5db8c536ffeb5771e976f8 Mon Sep 17 00:00:00 2001 +From 90d1a90d3147e9c8db5caec8befabda270e755d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/19] Add some NixOS-specific unit directories @@ -14,10 +14,10 @@ Also, remove /usr and /lib as these don't exist on NixOS. 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 05eb17d66c..1cd141d012 100644 +index 6fb8c40e7a..142ecdecec 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c -@@ -91,11 +91,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { +@@ -92,11 +92,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { } static const char* const user_data_unit_paths[] = { @@ -29,7 +29,7 @@ index 05eb17d66c..1cd141d012 100644 NULL }; -@@ -613,15 +609,13 @@ int lookup_paths_init( +@@ -614,15 +610,13 @@ int lookup_paths_init( persistent_config, SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", @@ -46,7 +46,7 @@ index 05eb17d66c..1cd141d012 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -637,14 +631,11 @@ int lookup_paths_init( +@@ -638,14 +632,11 @@ int lookup_paths_init( persistent_config, USER_CONFIG_UNIT_DIR, "/etc/systemd/user", @@ -62,7 +62,7 @@ index 05eb17d66c..1cd141d012 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -794,7 +785,6 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -795,7 +786,6 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_SYSTEM: add = strv_new("/run/systemd/system-generators", "/etc/systemd/system-generators", @@ -70,7 +70,7 @@ index 05eb17d66c..1cd141d012 100644 SYSTEM_GENERATOR_DIR); break; -@@ -802,7 +792,6 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -803,7 +793,6 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_USER: add = strv_new("/run/systemd/user-generators", "/etc/systemd/user-generators", @@ -78,7 +78,7 @@ index 05eb17d66c..1cd141d012 100644 USER_GENERATOR_DIR); break; -@@ -841,12 +830,10 @@ char **env_generator_binary_paths(bool is_system) { +@@ -842,12 +831,10 @@ char **env_generator_binary_paths(bool is_system) { if (is_system) add = strv_new("/run/systemd/system-environment-generators", "/etc/systemd/system-environment-generators", @@ -122,5 +122,5 @@ index fc0f8c34fa..162432e77f 100644 systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index 0c09107c5ef..438d841bb1c 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From b39b8871bcaa07280d6b0cf2226b1a3be31232b8 Mon Sep 17 00:00:00 2001 +From 213279752124dc4a57a4189df9b5b2e96feaa0b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/19] Get rid of a useless message in user sessions @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 34891a8754..b9b4789720 100644 +index 9368a1dfa1..5b0bdb1bc7 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -1375,7 +1375,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { +@@ -1408,7 +1408,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { if (!unit_is_bound_by_inactive(u, &culprit)) continue; @@ -27,5 +27,5 @@ index 34891a8754..b9b4789720 100644 /* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the * service being unnecessary after a while. */ -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index d7649b5e44a..a93488afbf9 100644 --- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,4 +1,4 @@ -From 566208aea81057789218b959f4d0e898eec54fc9 Mon Sep 17 00:00:00 2001 +From 14474d5e116609ce4fac60d779b08fa3eab840c3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that @@ -11,10 +11,10 @@ Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 36702f2fb0..669257ea2f 100644 +index b20a93ad81..6292fca4fc 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -797,6 +797,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -813,6 +813,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -24,7 +24,7 @@ index 36702f2fb0..669257ea2f 100644 name = empty_to_null(name); context_read_etc_hostname(c); -@@ -860,6 +863,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess +@@ -876,6 +879,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -104,5 +104,5 @@ index 66b454269d..0a8fe25d0f 100644 if (r < 0) return r; -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index f938b553c9f..e1bc44a148e 100644 --- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,4 +1,4 @@ -From 3b9983969de2a86929768f6362ed41c20dd13bd3 Mon Sep 17 00:00:00 2001 +From d668df39728c992ec0c691ef6e76664e7121f5bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/19] Fix hwdb paths @@ -24,5 +24,5 @@ index 5ddc2211e6..ee621eec46 100644 + "/etc/udev/hwdb.bin\0" + -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 87cf1afc7d2..68d40980ab1 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From b5966b6abb9696798618367cab33d1fed317734f Mon Sep 17 00:00:00 2001 +From dd59ce5f1bbdafb0b92f8aeacc68b000ec347a61 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -35,10 +35,10 @@ index e486474c44..5f373d0723 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 5d162e8ffe..1bec83e555 100644 +index b659d6905d..660b1c6fed 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1269,7 +1269,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { +@@ -1267,7 +1267,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { assert(ret); @@ -47,7 +47,7 @@ index 5d162e8ffe..1bec83e555 100644 if (!f) return -errno; -@@ -1308,7 +1308,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { +@@ -1306,7 +1306,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { _cleanup_strv_free_ char **zones = NULL; int r; @@ -56,7 +56,7 @@ index 5d162e8ffe..1bec83e555 100644 if (!f) return -errno; -@@ -1421,7 +1421,7 @@ int verify_timezone(const char *name, int log_level) { +@@ -1419,7 +1419,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) return -ENAMETOOLONG; @@ -65,7 +65,7 @@ index 5d162e8ffe..1bec83e555 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) -@@ -1512,7 +1512,7 @@ int get_timezone(char **ret) { +@@ -1510,7 +1510,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -75,10 +75,10 @@ index 5d162e8ffe..1bec83e555 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 2cb4f80d5d..ebeaeac52f 100644 +index d28a416e5d..c7c215731d 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -491,7 +491,7 @@ static int process_timezone(void) { +@@ -494,7 +494,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -88,10 +88,10 @@ index 2cb4f80d5d..ebeaeac52f 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 438ca294db..98bd110d92 100644 +index 197e5aa252..c674fa61d5 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1887,8 +1887,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid +@@ -1899,8 +1899,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -137,5 +137,5 @@ index 0a8fe25d0f..2f02b9a520 100644 return -ENOMEM; -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index 6e36bbdc340..f2514de6c66 100644 --- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From f4e9304560ad42eeb8d42be583cc55eb2e5b4bb1 Mon Sep 17 00:00:00 2001 +From a93da270bed88972f4d60a1fa08f24e00712d7fb Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/19] localectl: use /etc/X11/xkb for list-x11-* @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 548ac8eb2c..5e372f1566 100644 +index b5624209dc..4ab7adfdb6 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -280,7 +280,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -279,7 +279,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; @@ -23,5 +23,5 @@ index 548ac8eb2c..5e372f1566 100644 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index 5aa22d98895..c21a1bda412 100644 --- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From 43a363f30b6012d600cfb62a3851c4ac7af4d1d5 Mon Sep 17 00:00:00 2001 +From 3bc3462165cd72de93a1c71f03e6c4150726b159 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir @@ -8,12 +8,12 @@ Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index 5bdfd9753d..5bf6afc7b7 100644 +index c0cbadecb1..8266bf57de 100644 --- a/meson.build +++ b/meson.build -@@ -3539,9 +3539,6 @@ install_data('LICENSE.GPL2', - 'docs/GVARIANT-SERIALIZATION.md', - install_dir : docdir) +@@ -3729,9 +3729,6 @@ install_data('LICENSE.GPL2', + install_subdir('LICENSES', + install_dir : docdir) -meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) -meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir)) @@ -22,5 +22,5 @@ index 5bdfd9753d..5bf6afc7b7 100644 # Ensure that changes to the docs/ directory do not break the -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch index a2bdfcf8ec3..5f27e417523 100644 --- a/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From 7ea935a5ac4f31106ce9347227d4eb59b77b02cd Mon Sep 17 00:00:00 2001 +From 85f0ad0cb7b4f0cfd482c9611f9cbc2dacbba33a Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 12/19] inherit systemd environment when calling generators. @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index b9b4789720..79239afe4a 100644 +index 5b0bdb1bc7..1538a5200a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4149,10 +4149,15 @@ static int manager_run_generators(Manager *m) { +@@ -3653,10 +3653,15 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) @@ -40,5 +40,5 @@ index b9b4789720..79239afe4a 100644 finish: -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch index 20372a5dbad..d008cf2821c 100644 --- a/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From eb93778af78a127e8e20d6ed7fd9f91fd22dc7c9 Mon Sep 17 00:00:00 2001 +From b30d2273d3ce1480b0c4c27c25211f84e04172e9 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 13/19] add rootprefix to lookup dir paths @@ -12,7 +12,7 @@ files that I might have missed. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/def.h b/src/basic/def.h -index 2e60abb4f1..732ec51d36 100644 +index eccee3d3fa..e94a2c8bd0 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -39,13 +39,15 @@ @@ -34,5 +34,5 @@ index 2e60abb4f1..732ec51d36 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index a22566eb4cc..49c6651c0ed 100644 --- a/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From 1d623def80a3532ac1445499c9d4673e21ae8195 Mon Sep 17 00:00:00 2001 +From 76da27ff77e5db07e502d4d8d26286d69c3f0319 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 14/19] systemd-shutdown: execute scripts in @@ -10,12 +10,12 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index a98cfc4d8a..b0b34edda7 100644 +index 7ad9930677..fdb03a2e1a 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) { +@@ -335,7 +335,7 @@ int main(int argc, char *argv[]) { _cleanup_free_ char *cgroup = NULL; - char *arguments[3], *watchdog_device; + char *arguments[3]; int cmd, r, umount_log_level = LOG_INFO; - static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL}; + static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, "/etc/systemd/system-shutdown", NULL}; @@ -23,5 +23,5 @@ index a98cfc4d8a..b0b34edda7 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 1a21d1005ee..78d77c00582 100644 --- a/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 5a96c4a98be971d84a12ae04e42bc3cb889d5191 Mon Sep 17 00:00:00 2001 +From 47c651f97acae814d4ff679ae04d78d4532cbca6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 15/19] systemd-sleep: execute scripts in @@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index a3aeb24633..0ed6a34d79 100644 +index 7064f3a905..b60ced9d9b 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -182,6 +182,7 @@ static int execute( @@ -22,5 +22,5 @@ index a3aeb24633..0ed6a34d79 100644 }; -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index 12624cb5548..3c1643e0f1a 100644 --- a/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,32 +1,27 @@ -From 775a2a8940c07f4af33a2a11bfa17e0257b427cb Mon Sep 17 00:00:00 2001 +From df0fec7ac2f33bcca60ba9a2396af33397ba42cc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty -kmod loads modules from not only /lib/modules but also from -/run/booted-system/kernel-modules/lib/modules and -/run/current-system/kernel-modules/lib/module - -Co-authored-by: Arian van Putten +On NixOS, kernel modules of the currently booted systems are located at +/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/. --- - units/kmod-static-nodes.service.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + units/kmod-static-nodes.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index 777e82d16b..9a5e05a1cc 100644 +index 777e82d16b..b6abc2bba0 100644 --- a/units/kmod-static-nodes.service.in +++ b/units/kmod-static-nodes.service.in -@@ -12,7 +12,9 @@ Description=Create List of Static Device Nodes +@@ -12,7 +12,7 @@ Description=Create List of Static Device Nodes DefaultDependencies=no Before=sysinit.target systemd-tmpfiles-setup-dev.service ConditionCapability=CAP_SYS_MODULE -ConditionFileNotEmpty=/lib/modules/%v/modules.devname -+ConditionFileNotEmpty=|/lib/modules/%v/modules.devname -+ConditionFileNotEmpty=|/run/booted-system/kernel-modules/lib/modules/%v/modules.devname -+ConditionFileNotEmpty=|/run/current-system/kernel-modules/lib/modules/%v/modules.devname ++ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname [Service] Type=oneshot -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 52b74284fe2..882690ad914 100644 --- a/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From 6ddb2011b379f3232374327517af874b68c434b5 Mon Sep 17 00:00:00 2001 +From f21722ac0f51b0b59a5c030af3db5fe4e6397f7c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 17/19] path-util.h: add placeholder for DEFAULT_PATH_NORMAL @@ -10,7 +10,7 @@ systemd itself uses extensively. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index 26e7362d1f..a8f8a863ec 100644 +index 518f3340bf..18e826ea0b 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -24,11 +24,11 @@ @@ -29,5 +29,5 @@ index 26e7362d1f..a8f8a863ec 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch b/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch index 58eb7f96e64..e602bef9c3d 100644 --- a/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch +++ b/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch @@ -1,4 +1,4 @@ -From 50f2ada6cbfafa75b628410e8834f29581854e6f Mon Sep 17 00:00:00 2001 +From 968bd0c7bc058a4b05b6457f9ff20d02b70c9852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 6 Dec 2020 08:34:19 +0100 Subject: [PATCH 18/19] pkg-config: derive prefix from --prefix @@ -29,5 +29,5 @@ index 162432e77f..2fc20daf03 100644 rootprefix=${root_prefix} sysconf_dir={{SYSCONF_DIR}} -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch index 54e5c32aeb4..916f95e194a 100644 --- a/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch +++ b/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch @@ -1,4 +1,4 @@ -From 2ab388cf0be320879e668a6206cb15d002b55f98 Mon Sep 17 00:00:00 2001 +From 169fc6f270ff3e3903a7a31550c964152f9751ec Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 18 Aug 2021 19:10:08 +0200 Subject: [PATCH 19/19] core: handle lookup paths being symlinks @@ -15,10 +15,10 @@ directory itself is already a symlink. 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c -index 0d58b1c4fe..7314f1245f 100644 +index 30c632dfce..6179100126 100644 --- a/src/basic/unit-file.c +++ b/src/basic/unit-file.c -@@ -254,6 +254,7 @@ int unit_file_build_name_map( +@@ -255,6 +255,7 @@ int unit_file_build_name_map( _cleanup_hashmap_free_ Hashmap *ids = NULL, *names = NULL; _cleanup_set_free_free_ Set *paths = NULL; @@ -26,7 +26,7 @@ index 0d58b1c4fe..7314f1245f 100644 uint64_t timestamp_hash; char **dir; int r; -@@ -273,6 +274,34 @@ int unit_file_build_name_map( +@@ -274,6 +275,34 @@ int unit_file_build_name_map( return log_oom(); } @@ -59,9 +59,9 @@ index 0d58b1c4fe..7314f1245f 100644 + } + STRV_FOREACH(dir, (char**) lp->search_path) { - struct dirent *de; _cleanup_closedir_ DIR *d = NULL; -@@ -351,11 +380,11 @@ int unit_file_build_name_map( + +@@ -386,11 +415,11 @@ int unit_file_build_name_map( continue; } @@ -76,5 +76,5 @@ index 0d58b1c4fe..7314f1245f 100644 log_debug("%s: linked unit file: %s → %s", __func__, filename, simplified); -- -2.33.1 +2.34.0 diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c29bd637bf4..95782d2c075 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -123,7 +123,14 @@ assert withHomed -> withCryptsetup; assert withCryptsetup -> (cryptsetup != null); let wantCurl = withRemote || withImportd; - version = "249.7"; + wantGcrypt = withResolved || withImportd; + version = "250.3"; + + # Bump this variable on every (major) version change. See below (in the meson options list) for why. + # command: + # $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \ + # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' + releaseTimestamp = "1640290180"; in stdenv.mkDerivation { inherit pname version; @@ -134,12 +141,12 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-y33/BvvI+JyhsvuT1Cbm6J2Z72j71oXgLw6X9NwCMPE="; + sha256 = "sha256-O1XE0BhIuDAlFVX7WIy02M9YTIxLX0Q8atJAYsUgQDQ="; }; - # If these need to be regenerated, `git am path/to/00*.patch` them into a - # systemd worktree, rebase to the more recent systemd version, and export the - # patches again via `git -c format.signoff=false format-patch v${version}`. + # On major changes, or when otherwise required, you *must* reformat the patches, + # `git am path/to/00*.patch` them into a systemd worktree, rebase to the more recent + # systemd version, and export the patches again via `git -c format.signoff=false format-patch v${version}`. # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all patches patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -168,14 +175,6 @@ stdenv.mkDerivation { # need (AFAICT). # See https://github.com/systemd/systemd/pull/20479 for upsteam discussion. ./0019-core-handle-lookup-paths-being-symlinks.patch - - # In v248 compiler weirdness and refactoring lead to the bootloader - # erroring out handling keyboard input on some systems. See - # https://github.com/systemd/systemd/issues/19191 - # This should be redundant in v249.6 when it offically gets tagged in - # systemd-stable - ./0020-sd-boot-Unify-error-handling.patch - ./0021-sd-boot-Rework-console-input-handling.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -287,6 +286,10 @@ stdenv.mkDerivation { { name = "libtss2-mu.so.0"; pkg = opt withTpm2Tss tpm2-tss; } { name = "libtss2-tcti-"; pkg = opt withTpm2Tss tpm2-tss; } { name = "libfido2.so.1"; pkg = opt withFido2 libfido2; } + + # inspect-elf support + { name = "libelf.so.1"; pkg = opt withCoredump elfutils; } + { name = "libdw.so.1"; pkg = opt withCoredump elfutils; } ]; patchDlOpen = dl: @@ -446,7 +449,12 @@ stdenv.mkDerivation { "-Dsmack=true" "-Db_pie=true" "-Dinstall-sysconfdir=false" - "-Defi-ld=${stdenv.cc.bintools.targetPrefix}ld" + "-Defi-ld=gold" + "-Dsbat-distro=nixos" + "-Dsbat-distro-summary=NixOS" + "-Dsbat-distro-url=https://nixos.org/" + "-Dsbat-distro-pkgname=${pname}" + "-Dsbat-distro-version=${version}" /* As of now, systemd doesn't allow runtime configuration of these values. So the settings in /etc/login.defs have no effect on it. Many people think this @@ -498,57 +506,112 @@ stdenv.mkDerivation { "-Dutmp=false" "-Didn=false" ]; + preConfigure = + let + # A list of all the runtime binaries that the systemd exectuables, tests and libraries are referencing in their source code, scripts and unit files. + # As soon as a dependency isn't required anymore we should remove it from the list. The `where` attribute for each of the replacement patterns must be exhaustive. If another (unhandled) case is found in the source code the build fails with an error message. + binaryReplacements = [ + { search = "/usr/bin/getent"; replacement = "${getent}/bin/getent"; where = [ "src/nspawn/nspawn-setuid.c" ]; } - preConfigure = '' - mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") - export LC_ALL="en_US.UTF-8"; - # FIXME: patch this in systemd properly (and send upstream). - # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount - for i in \ - src/core/mount.c \ - src/core/swap.c \ - src/cryptsetup/cryptsetup-generator.c \ - src/journal/cat.c \ - src/nspawn/nspawn.c \ - src/remount-fs/remount-fs.c \ - src/shared/generator.c \ - src/shutdown/shutdown.c \ - units/emergency.service.in \ - units/modprobe@.service \ - units/rescue.service.in \ - units/systemd-logind.service.in \ - units/systemd-nspawn@.service.in; \ - do - test -e $i - substituteInPlace $i \ - --replace /usr/bin/getent ${getent}/bin/getent \ - --replace /sbin/mkswap ${lib.getBin util-linux}/sbin/mkswap \ - --replace /sbin/swapon ${lib.getBin util-linux}/sbin/swapon \ - --replace /sbin/swapoff ${lib.getBin util-linux}/sbin/swapoff \ - --replace /bin/echo ${coreutils}/bin/echo \ - --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${lib.getBin util-linux}/sbin/sulogin \ - --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ - --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency - done + { + search = "/sbin/mkswap"; + replacement = "${lib.getBin util-linux}/sbin/mkswap"; + where = [ + "man/systemd-makefs@.service.xml" + ]; + } + { search = "/sbin/swapon"; replacement = "${lib.getBin util-linux}/sbin/swapon"; where = [ "src/core/swap.c" "src/basic/unit-def.h" ]; } + { search = "/sbin/swapoff"; replacement = "${lib.getBin util-linux}/sbin/swapoff"; where = [ "src/core/swap.c" ]; } + { + search = "/bin/echo"; + replacement = "${coreutils}/bin/echo"; + where = [ + "man/systemd-analyze.xml" + "man/systemd.service.xml" + "src/analyze/test-verify.c" + "src/test/test-env-file.c" + "src/test/test-fileio.c" + "test/test-execute/exec-systemcallfilter-failing2.service" + "test/test-execute/exec-systemcallfilter-failing3.service" + "test/test-execute/exec-systemcallfilter-failing.service" + "test/testsuite-06.units/hola.service" + "test/udev-test.pl" + "test/units/hello.service" + "test/units/testsuite-07.sh" + "test/units/testsuite-15.sh" + "test/units/testsuite-17.05.sh" + "test/units/testsuite-40.sh" + "test/units/unstoppable.service" + ]; + } + { + search = "/bin/cat"; + replacement = "${coreutils}/bin/cat"; + where = [ "test/create-busybox-container" "test/test-execute/exec-noexecpaths-simple.service" "src/journal/cat.c" ]; + } + { search = "/sbin/modprobe"; replacement = "${lib.getBin kmod}/sbin/modprobe"; where = [ "units/modprobe@.service" ]; } + { + search = "/usr/lib/systemd/systemd-fsck"; + replacement = "$out/lib/systemd/systemd-fsck"; + where = [ + "man/systemd-fsck@.service.xml" + "test/test-fstab-generator.sh" + "test/test-fstab-generator/test-12-dev-sdx.expected/systemd-fsck-root.service" + "test/test-fstab-generator/test-13-label.expected/systemd-fsck-root.service" + "test/test-fstab-generator/test-14-uuid.expected/systemd-fsck-root.service" + "test/test-fstab-generator/test-15-partuuid.expected/systemd-fsck-root.service" + ]; + } + ] ++ lib.optionals withImportd [ + { + search = "\"gpg\""; + replacement = "\\\"${gnupg}/bin/gpg\\\""; + where = [ "src/import/pull-common.c" ]; + } + { + search = "\"tar\""; + replacement = "\\\"${gnutar}/bin/tar\\\""; + where = [ + "src/import/export-tar.c" + "src/import/export.c" + "src/import/import-common.c" + "src/import/import-tar.c" + "src/import/import.c" + "src/import/importd.c" + "src/import/pull-tar.c" + "src/import/pull.c" + ]; + } + ]; - for dir in tools src/resolve test src/test src/shared; do - patchShebangs $dir - done + # { replacement, search, where } -> List[str] + mkSubstitute = { replacement, search, where }: + map (path: "substituteInPlace ${path} --replace '${search}' \"${replacement}\"") where; + mkEnsureSubstituted = { replacement, search, where }: + '' + if [[ $(grep -r '${search}' | grep -v "${replacement}" | grep -v NEWS | wc -l) -gt 0 ]]; then + echo "Not all references to '${search}' have been replace. Found the following matches:" + grep '${search}' -r | grep -v "${replacement}" | grep -v NEWS + exit 1 + fi + ''; - # absolute paths to gpg & tar - substituteInPlace src/import/pull-common.c \ - --replace '"gpg"' '"${gnupg}/bin/gpg"' - for file in src/import/{{export,import,pull}-tar,import-common}.c; do - substituteInPlace $file \ - --replace '"tar"' '"${gnutar}/bin/tar"' - done + in + '' + mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") + export LC_ALL="en_US.UTF-8"; + + ${lib.concatStringsSep "\n" (lib.flatten (map mkSubstitute binaryReplacements))} + ${lib.concatMapStringsSep "\n" mkEnsureSubstituted binaryReplacements} - substituteInPlace src/libsystemd/sd-journal/catalog.c \ - --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ - ''; + for dir in tools src/resolve test src/test src/shared; do + patchShebangs $dir + done + + substituteInPlace src/libsystemd/sd-journal/catalog.c \ + --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ + ''; # These defines are overridden by CFLAGS and would trigger annoying # warning messages @@ -556,7 +619,7 @@ stdenv.mkDerivation { substituteInPlace config.h \ --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \ --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \ - --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" + --replace "SYSTEMD_CGROUP_AGENTS_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; NIX_CFLAGS_COMPILE = toString ([ @@ -568,8 +631,8 @@ stdenv.mkDerivation { # Set the release_agent on /sys/fs/cgroup/systemd to the # currently running systemd (/run/current-system/systemd) so # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENT_PATH" - "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + "-USYSTEMD_CGROUP_AGENTS_PATH" + "-DSYSTEMD_CGROUP_AGENTS_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" From 3ceeae830d42e7857981d11ad251c4f39e2fdd4b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 12 Dec 2021 15:49:40 +0100 Subject: [PATCH 179/685] systemdMinimal: don't set {libfido2,p11-kit,libgcrypt} to null We don't have to do that as we already set all the feature flags to null. Setting individual libraries to null instead of disabling their feature flag will lead with bad example that will cause each of the features to be disabled with multiple flags in the systemdMinimal variant. If a dependency is pulled in via another feature we should disable that rather than setting it to null. Overriding a given package should be the last resort. --- pkgs/os-specific/linux/systemd/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 95782d2c075..c1217510813 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -61,6 +61,8 @@ , kexec-tools , bashInteractive , libmicrohttpd +, libfido2 +, p11-kit # the (optional) BPF feature requires bpftool, libbpf, clang and llmv-strip to be avilable during build time. # Only libbpf should be a runtime dependency. @@ -97,8 +99,6 @@ , withTimesyncd ? true , withTpm2Tss ? !stdenv.hostPlatform.isMusl , withUserDb ? !stdenv.hostPlatform.isMusl -, libfido2 -, p11-kit # name argument , pname ? "systemd" @@ -373,13 +373,13 @@ stdenv.mkDerivation { glib kmod libcap - libgcrypt libidn2 libuuid linuxHeaders pam ] + ++ lib.optional wantGcrypt libgcrypt ++ lib.optional withApparmor libapparmor ++ lib.optional wantCurl (lib.getDev curl) ++ lib.optionals withCompression [ bzip2 lz4 xz zstd ] @@ -418,7 +418,7 @@ stdenv.mkDerivation { # while we do not run tests we should also not build them. Removes about 600 targets "-Dtests=false" "-Danalyze=${lib.boolToString withAnalyze}" - "-Dgcrypt=${lib.boolToString (libgcrypt != null)}" + "-Dgcrypt=${lib.boolToString wantGcrypt}" "-Dimportd=${lib.boolToString withImportd}" "-Dlz4=${lib.boolToString withCompression}" "-Dhomed=${lib.boolToString withHomed}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06857eb515a..c56a7ed533a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23233,10 +23233,8 @@ with pkgs; withTpm2Tss = false; withUserDb = false; glib = null; - libgcrypt = null; + lvm2 = null; - libfido2 = null; - p11-kit = null; }; From 0c852e1fa6318bfc43b138832e6d42e40ed054e6 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 12 Dec 2021 15:58:17 +0100 Subject: [PATCH 180/685] systemd: remove unused lvm2 input --- pkgs/os-specific/linux/systemd/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c1217510813..471ecf8683a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -29,7 +29,6 @@ # Optional dependencies , pam , cryptsetup -, lvm2 , audit , acl , lz4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c56a7ed533a..66ed930f0c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23233,8 +23233,6 @@ with pkgs; withTpm2Tss = false; withUserDb = false; glib = null; - - lvm2 = null; }; From e6280a639759ff6343a9d63e83c0466f17281a68 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 12 Dec 2021 15:59:20 +0100 Subject: [PATCH 181/685] systemd: introduce withTests flag This allows us to make test-only dependencies optional in builds that aren't running tests (sadly all of our builds). --- pkgs/os-specific/linux/systemd/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 471ecf8683a..6b075a29f6f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -15,6 +15,8 @@ , gperf , getent , glibcLocales + + # glib is only used during tests (test-bus-gvariant, test-bus-marshal) , glib , substituteAll , gettext @@ -98,6 +100,8 @@ , withTimesyncd ? true , withTpm2Tss ? !stdenv.hostPlatform.isMusl , withUserDb ? !stdenv.hostPlatform.isMusl + # tests assume too much system access for them to be feasible for us right now +, withTests ? false # name argument , pname ? "systemd" @@ -369,7 +373,6 @@ stdenv.mkDerivation { [ acl audit - glib kmod libcap libidn2 @@ -379,6 +382,7 @@ stdenv.mkDerivation { ] ++ lib.optional wantGcrypt libgcrypt + ++ lib.optional withTests glib ++ lib.optional withApparmor libapparmor ++ lib.optional wantCurl (lib.getDev curl) ++ lib.optionals withCompression [ bzip2 lz4 xz zstd ] @@ -413,7 +417,7 @@ stdenv.mkDerivation { "-Dsetfont-path=${kbd}/bin/setfont" "-Dtty-gid=3" # tty in NixOS has gid 3 "-Ddebug-shell=${bashInteractive}/bin/bash" - "-Dglib=${lib.boolToString (glib != null)}" + "-Dglib=${lib.boolToString withTests}" # while we do not run tests we should also not build them. Removes about 600 targets "-Dtests=false" "-Danalyze=${lib.boolToString withAnalyze}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66ed930f0c9..976abf520c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23232,7 +23232,6 @@ with pkgs; withTimesyncd = false; withTpm2Tss = false; withUserDb = false; - glib = null; }; From d67caf3c894ed5424ba73b6d39db2eddf25bc128 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 31 Dec 2021 14:12:56 +0100 Subject: [PATCH 182/685] nixos/timesyncd: initialize clock file with current time When initializing a system (e.g. first boot / livecd) we have no good reference source for time. systemd-timesyncd however would revert back to its configured fallback time (in our case 01.01.1980). Since we probably don't want to hardcode a specific date as fallback we are now using the current system time (wherever that might have come from) to initialize the reference clock file. The only systems that might be remotely affected by this change are machines that have highly unreliable RTCs or those where the battery that backs the RTC is running empty. Historically these systems always had a tough time with anything time related and likely required manual intervention. For stateless systems (those that wipe / between reboots or our installer CDs) this has the consequence that time will always be reset to whatever the system comes up with on boot. This is likely the correct time coming from an RTC. No harm done here the situation is likely unchanged for them. For stateful systems (those that retain the / partition across reboots) there shouldn't be a change at all. They'll provide an initial clock value once on their lifetime (during first boot / after installation). From then onwards systemd-timesyncd will update the file with the newer fallback time (that will be picked up on the next boot). --- nixos/modules/system/boot/timesyncd.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 5f35a154769..6279957fcd6 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -60,15 +60,27 @@ with lib; }; users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync; - system.activationScripts.systemd-timesyncd-migration = mkIf (versionOlder config.system.stateVersion "19.09") '' + system.activationScripts.systemd-timesyncd-migration = # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes # - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742 # - https://github.com/systemd/systemd/issues/12131 - if [ -L /var/lib/systemd/timesync ]; then - rm /var/lib/systemd/timesync - mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync + mkIf (versionOlder config.system.stateVersion "19.09") '' + if [ -L /var/lib/systemd/timesync ]; then + rm /var/lib/systemd/timesync + mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync + fi + ''; + system.activationScripts.systemd-timesyncd-init-clock = + # Ensure that we have some stored time to prevent systemd-timesyncd to + # resort back to the fallback time. + # If the file doesn't exist we assume that our current system clock is + # good enough to provide an initial value. + '' + if ! [ -f /var/lib/systemd/timesync/clock ]; then + test -d /var/lib/systemd/timesync || mkdir -p /var/lib/systemd/timesync + touch /var/lib/systemd/timesync/clock fi - ''; + ''; }; } From 49267a99d248c1666cae2621f311b25bccf9d7ac Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 31 Dec 2021 17:21:05 +0100 Subject: [PATCH 183/685] systemd: add the release timestamp into the build This helps systemd during runtime to make decisions about the sanity of the system clock. See the references news article for more details on the matter. --- pkgs/os-specific/linux/systemd/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 6b075a29f6f..3030234b497 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -406,6 +406,14 @@ stdenv.mkDerivation { mesonFlags = [ "-Dversion-tag=${version}" + # We bump this variable on every (major) version change to ensure + # that we have known-good value for a timestamp that is in the (not so distant) past. + # This serves as a lower bound for valid system timestamps during startup. Systemd will + # reset the system timestamp if this date is +- 15 years from the system time. + # See the systemd v250 release notes for further details: + # https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266 + "-Dtime-epoch=${releaseTimestamp}" + "-Ddbuspolicydir=${placeholder "out"}/share/dbus-1/system.d" "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services" "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" @@ -470,7 +478,6 @@ stdenv.mkDerivation { */ "-Dsystem-uid-max=999" "-Dsystem-gid-max=999" - # "-Dtime-epoch=1" "-Dsysvinit-path=" "-Dsysvrcnd-path=" From f592c5a7c484ab50f2be569c9a3c5c984b9e2a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 24 Jan 2022 12:51:21 +0100 Subject: [PATCH 184/685] systemd: do not patch test files We do not run them, so it is unnecessary work. --- pkgs/os-specific/linux/systemd/default.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3030234b497..8ae68d18084 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -541,17 +541,6 @@ stdenv.mkDerivation { "src/analyze/test-verify.c" "src/test/test-env-file.c" "src/test/test-fileio.c" - "test/test-execute/exec-systemcallfilter-failing2.service" - "test/test-execute/exec-systemcallfilter-failing3.service" - "test/test-execute/exec-systemcallfilter-failing.service" - "test/testsuite-06.units/hola.service" - "test/udev-test.pl" - "test/units/hello.service" - "test/units/testsuite-07.sh" - "test/units/testsuite-15.sh" - "test/units/testsuite-17.05.sh" - "test/units/testsuite-40.sh" - "test/units/unstoppable.service" ]; } { @@ -565,11 +554,6 @@ stdenv.mkDerivation { replacement = "$out/lib/systemd/systemd-fsck"; where = [ "man/systemd-fsck@.service.xml" - "test/test-fstab-generator.sh" - "test/test-fstab-generator/test-12-dev-sdx.expected/systemd-fsck-root.service" - "test/test-fstab-generator/test-13-label.expected/systemd-fsck-root.service" - "test/test-fstab-generator/test-14-uuid.expected/systemd-fsck-root.service" - "test/test-fstab-generator/test-15-partuuid.expected/systemd-fsck-root.service" ]; } ] ++ lib.optionals withImportd [ @@ -599,9 +583,9 @@ stdenv.mkDerivation { map (path: "substituteInPlace ${path} --replace '${search}' \"${replacement}\"") where; mkEnsureSubstituted = { replacement, search, where }: '' - if [[ $(grep -r '${search}' | grep -v "${replacement}" | grep -v NEWS | wc -l) -gt 0 ]]; then - echo "Not all references to '${search}' have been replace. Found the following matches:" - grep '${search}' -r | grep -v "${replacement}" | grep -v NEWS + if [[ $(grep -r '${search}' | grep -v "${replacement}" | grep -Ev 'NEWS|^test/' | wc -l) -gt 0 ]]; then + echo "Not all references to '${search}' have been replaced. Found the following matches:" + grep '${search}' -r | grep -v "${replacement}" | grep -Ev 'NEWS|^test/' exit 1 fi ''; From f5c243d6c291671d256ec12a4c6805e9cb049565 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 5 Mar 2022 21:28:08 +0100 Subject: [PATCH 185/685] systemd: drop -Defi-ld=gold As reported in https://github.com/NixOS/nixpkgs/pull/156096#pullrequestreview-900986176, this fails to build on EFI enabled RISC-V because the requested EFI linker (efi-ld=gold) is unsupported. According to Wikipedia gold only supports x86, x86-64, ARM, PowerPC, TileGX. Removing this option alltogether will cause meson to figure out the default linker by itself. --- pkgs/os-specific/linux/systemd/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 8ae68d18084..eb92224e30d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -460,7 +460,6 @@ stdenv.mkDerivation { "-Dsmack=true" "-Db_pie=true" "-Dinstall-sysconfdir=false" - "-Defi-ld=gold" "-Dsbat-distro=nixos" "-Dsbat-distro-summary=NixOS" "-Dsbat-distro-url=https://nixos.org/" From d88dc978f65b99b9cf44f851f773803631a47678 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 6 Mar 2022 00:12:20 +0000 Subject: [PATCH 186/685] expat: add python3Packages.xmltodict to passthru.tests as it has revealed compatibility issues in the past --- pkgs/development/libraries/expat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 83038918e3a..a05f3b71fb4 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit python3; + inherit (python3.pkgs) xmltodict; inherit (haskellPackages) hexpat; inherit (perlPackages) XMLSAXExpat XMLParser; inherit (luaPackages) luaexpat; From 479b1cb510b13fe5a89e5aa228b2df60d8c464ed Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Mar 2022 00:58:59 +0000 Subject: [PATCH 187/685] systemd: fix a whole bunch of typos --- pkgs/os-specific/linux/systemd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index eb92224e30d..eff7fd23274 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -65,7 +65,7 @@ , libfido2 , p11-kit - # the (optional) BPF feature requires bpftool, libbpf, clang and llmv-strip to be avilable during build time. + # the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to be available during build time. # Only libbpf should be a runtime dependency. , bpftools , libbpf @@ -176,7 +176,7 @@ stdenv.mkDerivation { # systemd. With the below patch we mitigate that effect by special casing # all our root unit dirs if they are symlinks. This does exactly what we # need (AFAICT). - # See https://github.com/systemd/systemd/pull/20479 for upsteam discussion. + # See https://github.com/systemd/systemd/pull/20479 for upstream discussion. ./0019-core-handle-lookup-paths-being-symlinks.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let @@ -224,7 +224,7 @@ stdenv.mkDerivation { "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" '' + ( let - # The folllowing patches references to dynamic libraries to ensure that + # The following patches references to dynamic libraries to ensure that # all the features that are implemented via dlopen(3) are available (or # explicitly deactivated) by pointing dlopen to the absolute store path # instead of relying on the linkers runtime lookup code. @@ -280,7 +280,7 @@ stdenv.mkDerivation { { name = "libidn.so.12"; pkg = null; } { name = "libidn.so.11"; pkg = null; } - # journalctl --grep requires libpcre so lets provide it + # journalctl --grep requires libpcre so let's provide it { name = "libpcre2-8.so.0"; pkg = pcre2; } # Support for TPM2 in systemd-cryptsetup, systemd-repart and systemd-cryptenroll @@ -311,7 +311,7 @@ stdenv.mkDerivation { # exceptional case, details: # https://github.com/systemd/systemd-stable/blob/v249-stable/src/shared/tpm2-util.c#L157 if ! [[ "${library}" =~ .*libtss2-tcti-$ ]]; then - echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`' + echo 'The shared library `${library}` does not exist but was given as substitute for `${dl.name}`' exit 1 fi fi From a0bfc8e7c1f2a138ea0453bb0502277e042afc06 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Mar 2022 01:04:13 +0000 Subject: [PATCH 188/685] systemd: update patchShebangs comment We can't remove this yet even though we're on 250.3, because some more crept in and weren't fixed in time for the release. --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index eb92224e30d..e27140b1f07 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -335,8 +335,8 @@ stdenv.mkDerivation { fi '' # Finally patch shebangs that might need patching. - # Should no longer be necessary with v250. - # https://github.com/systemd/systemd/pull/19638 + # Should no longer be necessary with v251. + # https://github.com/systemd/systemd/pull/21749 + '' patchShebangs . ''; From 35727684c8b4ed73af10ee404759c58e5a630454 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 7 Mar 2022 01:02:11 +0100 Subject: [PATCH 189/685] gnome2: rename name to pname&version --- .../desktops/gnome-2/bindings/gnome-python/default.nix | 8 ++++---- pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix | 10 ++++++---- pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 6 +++--- .../desktops/gnome-2/platform/gnome-common/default.nix | 8 ++++---- .../gnome-2/platform/gnome-mime-data/default.nix | 9 +++++---- pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 8 ++++---- pkgs/desktops/gnome-2/platform/gtkhtml/default.nix | 7 ++++--- pkgs/desktops/gnome-2/platform/libIDL/default.nix | 8 ++++---- pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix | 7 ++++--- pkgs/desktops/gnome-2/platform/libbonobo/default.nix | 8 ++++---- pkgs/desktops/gnome-2/platform/libbonoboui/default.nix | 8 ++++---- pkgs/desktops/gnome-2/platform/libglade/default.nix | 7 ++++--- pkgs/desktops/gnome-2/platform/libgnome/default.nix | 8 ++++---- .../gnome-2/platform/libgnomecanvas/default.nix | 8 ++++---- .../gnome-2/platform/libgnomecanvasmm/default.nix | 9 +++++---- .../desktops/gnome-2/platform/libgnomecups/default.nix | 7 ++++--- .../gnome-2/platform/libgnomeprint/default.nix | 5 +++-- .../gnome-2/platform/libgnomeprintui/default.nix | 9 +++++---- pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 8 ++++---- pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix | 9 +++++---- 20 files changed, 84 insertions(+), 73 deletions(-) diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 1e7d726d557..0c636ffa541 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -5,11 +5,11 @@ with lib; let inherit (python2.pkgs) python pygobject2 pygtk dbus-python; in stdenv.mkDerivation rec { - version = "2.28"; - name = "gnome-python-${version}.1"; + pname = "gnome-python"; + version = "2.28.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-python/${version}/${name}.tar.bz2"; + url = "mirror://gnome/sources/gnome-python/${lib.versions.majorMinor version}/gnome-python-${version}.tar.bz2"; sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; }; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # gnome-python expects that .pth file is already installed by PyGTK in the # same directory. This is not the case for Nix. postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth + echo "gtk-2.0" > $out/${python2.sitePackages}/gnome-python-${version}.pth ''; meta = with lib; { diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 258789140c8..521800b4aa0 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -1,9 +1,11 @@ -{stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext}: +{ lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext }: + +stdenv.mkDerivation rec { + pname = "scrollkeeper"; + version = "0.3.14"; -stdenv.mkDerivation { - name = "scrollkeeper-0.3.14"; src = fetchurl { - url = "mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2"; + url = "mirror://gnome/sources/scrollkeeper/${lib.versions.majorMinor version}/scrollkeeper-${version}.tar.bz2"; sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; }; diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index bf5ae4ebbb1..a45095ba497 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, libIDL, libintl }: stdenv.mkDerivation rec { - name = "ORBit2-${minVer}.19"; - minVer = "2.14"; + pname = "ORBit2"; + version = "2.14.19"; src = fetchurl { - url = "mirror://gnome/sources/ORBit2/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/ORBit2/${lib.versions.majorMinor version}/ORBit2-${version}.tar.bz2"; sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix index 54a2bd526a9..eba913c80c2 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, which }: +{ lib, stdenv, fetchurl, which }: stdenv.mkDerivation rec { - name = "gnome-common-${minVer}.0"; - minVer = "2.34"; + pname = "gnome-common"; + version = "2.34.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/gnome-common-${version}.tar.bz2"; sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s"; }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix index d5af0e362b4..1604dbe0cf0 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchurl, intltool}: +{ lib, stdenv, fetchurl, intltool }: -stdenv.mkDerivation { - name = "gnome-mime-data-2.18.0"; +stdenv.mkDerivation rec { + pname = "gnome-mime-data"; + version = "2.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"; + url = "mirror://gnome/sources/gnome-mime-data/${lib.versions.majorMinor version}/gnome-mime-data-${version}.tar.bz2"; sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"; }; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 4196cf21c27..4c9f28230c3 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { - name = "gnome-vfs-${minVer}.4"; - minVer = "2.24"; + pname = "gnome-vfs"; + version = "2.24.4"; src = fetchurl { - url = "mirror://gnome/sources/gnome-vfs/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/gnome-vfs-${version}.tar.bz2"; sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index ec87bafc998..4f4e0503f81 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, pkg-config, gtk2, intltool, +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, GConf, enchant, isocodes, gnome-icon-theme }: stdenv.mkDerivation rec { - name = "gtkhtml-3.32.2"; + pname = "gtkhtml"; + version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/3.32/${name}.tar.bz2"; + url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.bz2"; sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7"; }; diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix index 4e9376d5c82..61b21ba88c0 100644 --- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, flex, bison, pkg-config, glib, gettext}: +{ lib, stdenv, fetchurl, flex, bison, pkg-config, glib, gettext }: stdenv.mkDerivation rec { - name = "libIDL-${minVer}.14"; - minVer = "0.8"; + pname = "libIDL"; + version = "0.8.14"; src = fetchurl { - url = "mirror://gnome/sources/libIDL/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libIDL/${lib.versions.majorMinor version}/libIDL-${version}.tar.bz2"; sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5"; }; diff --git a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix index 7b1ccb97dc4..80ea3d02d93 100644 --- a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix +++ b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix @@ -1,9 +1,10 @@ -{stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libart_lgpl-2.3.21"; + pname = "libart_lgpl"; + version = "2.3.21"; src = fetchurl { - url = "mirror://gnome/sources/libart_lgpl/2.3/${name}.tar.bz2"; + url = "mirror://gnome/sources/libart_lgpl/${lib.versions.majorMinor version}/libart_lgpl-${version}.tar.bz2"; sha256 = "1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx"; }; } diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index 8d991d743be..e928052a476 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt +{ lib, stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt , intltool, ORBit2, procps }: stdenv.mkDerivation rec { - name = "libbonobo-${minVer}.1"; - minVer = "2.32"; + pname = "libbonobo"; + version = "2.32.1"; src = fetchurl { - url = "mirror://gnome/sources/libbonobo/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libbonobo/${lib.versions.majorMinor version}/libbonobo-${version}.tar.bz2"; sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix index 4f9176acf10..36ab293f5f1 100644 --- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool +{ lib, stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: stdenv.mkDerivation rec { - name = "libbonoboui-${minVer}.5"; - minVer = "2.24"; + pname = "libbonoboui"; + version = "2.24.5"; src = fetchurl { - url = "mirror://gnome/sources/libbonoboui/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libbonoboui/${lib.versions.majorMinor version}/libbonoboui-${version}.tar.bz2"; sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs"; }; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 3eb7b533f09..3ed162cd8d5 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -2,11 +2,12 @@ assert withLibgladeConvert -> python2 != null; -stdenv.mkDerivation { - name = "libglade-2.6.4"; +stdenv.mkDerivation rec { + pname = "libglade"; + version = "2.6.4"; src = fetchurl { - url = "mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2"; + url = "mirror://gnome/sources/libglade/${lib.versions.majorMinor version}/libglade-${version}.tar.bz2"; sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index ee477cb63c1..2c70338a900 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2 +{ lib, stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2 , intltool, libbonobo, GConf, gnome_vfs, libtool, libogg }: stdenv.mkDerivation rec { - name = "libgnome-${minVer}.1"; - minVer = "2.32"; + pname = "libgnome"; + version = "2.32.1"; src = fetchurl { - url = "mirror://gnome/sources/libgnome/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnome/${lib.versions.majorMinor version}/libgnome-${version}.tar.bz2"; sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index eb40c5ec0b5..b856442290a 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, libart_lgpl, libglade }: stdenv.mkDerivation rec { - name = "libgnomecanvas-${minVer}.3"; - minVer = "2.30"; + pname = "libgnomecanvas"; + version = "2.30.3"; src = fetchurl { - url = "mirror://gnome/sources/libgnomecanvas/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnomecanvas/${lib.versions.majorMinor version}/libgnomecanvas-${version}.tar.bz2"; sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix index 2811a138cb6..9cc2d169b7c 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }: +{ lib, stdenv, fetchurl, pkg-config, libgnomecanvas, gtkmm2 }: -stdenv.mkDerivation { - name = "libgnomecanvasmm-2.26.0"; +stdenv.mkDerivation rec { + pname = "libgnomecanvasmm"; + version = "2.26.0"; src = fetchurl { - url = "mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2"; + url = "mirror://gnome/sources/libgnomecanvasmm/${lib.versions.majorMinor version}/libgnomecanvasmm-${version}.tar.bz2"; sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 7e33ee91285..42de8c2471a 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2, intltool, libart_lgpl }: stdenv.mkDerivation rec { - name = "libgnomecups-0.2.3"; + pname = "libgnomecups"; + version = "0.2.3"; src = fetchurl { - url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnomecups/${lib.versions.majorMinor version}/libgnomecups-${version}.tar.bz2"; sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index b67be2b7f5b..bb2e435f422 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -2,10 +2,11 @@ , libgnomecups, bison, flex }: stdenv.mkDerivation rec { - name = "libgnomeprint-2.18.8"; + pname = "libgnomeprint"; + version = "2.18.8"; src = fetchurl { - url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnomeprint/${lib.versions.majorMinor version}/libgnomeprint-${version}.tar.bz2"; sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index 80d2c2050af..a95ee70bca1 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}: +{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme }: -stdenv.mkDerivation { - name = "libgnomeprintui-2.18.6"; +stdenv.mkDerivation rec { + pname = "libgnomeprintui"; + version = "2.18.6"; src = fetchurl { - url = "mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2"; + url = "mirror://gnome/sources/libgnomeprintui/${lib.versions.majorMinor version}/libgnomeprintui-${version}.tar.bz2"; sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 0fa3847d9bd..0a84e0ea3ec 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome-keyring, libglade }: stdenv.mkDerivation rec { - name = "libgnomeui-${minVer}.5"; - minVer = "2.24"; + pname = "libgnomeui"; + version = "2.24.5"; src = fetchurl { - url = "mirror://gnome/sources/libgnomeui/${minVer}/${name}.tar.bz2"; + url = "mirror://gnome/sources/libgnomeui/${lib.versions.majorMinor version}/libgnomeui-${version}.tar.bz2"; sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix index e7cf117ecdb..9c7189c117a 100644 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, gettext, libxml2 }: -stdenv.mkDerivation { - name = "libgtkhtml-2.11.1"; +stdenv.mkDerivation rec { + pname = "libgtkhtml"; + version = "2.11.1"; src = fetchurl { - url = "mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2"; + url = "mirror://gnome/sources/libgtkhtml/${lib.versions.majorMinor version}/libgtkhtml-${version}.tar.bz2"; sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; }; From 0067dbbf632610eb1e9253d7ce8f5e79e82ad0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Sun, 6 Mar 2022 21:18:13 -0300 Subject: [PATCH 190/685] kde/gear: 21.12.2 -> 21.12.3 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1840 ++++++++++++++++---------------- 2 files changed, 921 insertions(+), 921 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 72b76131f64..a24ef563f3e 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.2/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index af8e47dd749..3d5948c290d 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1843 +4,1843 @@ { akonadi = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadi-21.12.2.tar.xz"; - sha256 = "1i1q8zda3hl564w02478wyqv35wj8npkqayy7b13shkq9b9j3nj8"; - name = "akonadi-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadi-21.12.3.tar.xz"; + sha256 = "026srxk7da20vfhbj7jh8aip3sylpm61czwblj3wxxps0vbxxs2g"; + name = "akonadi-21.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadi-calendar-21.12.2.tar.xz"; - sha256 = "001ndvgqn6x70s7gdya1f1vr080mfkypam3k6z0i2ivlpymc3wly"; - name = "akonadi-calendar-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-21.12.3.tar.xz"; + sha256 = "0hzy6y9pxa06k0pp5yr84i0sv15qgzjn7nrlmsylm6iy7fspqqbq"; + name = "akonadi-calendar-21.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadi-calendar-tools-21.12.2.tar.xz"; - sha256 = "0f0l6wj3h2afbmvnq60cg0x03a412849dg4l9dwgdn8yxvnxkhw6"; - name = "akonadi-calendar-tools-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-tools-21.12.3.tar.xz"; + sha256 = "1idh6kf8h9158rgw3b5lld7z9mvvif00jrvpz891cziblvr19p4a"; + name = "akonadi-calendar-tools-21.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadi-contacts-21.12.2.tar.xz"; - sha256 = "1aq81569kz529n66dl5jjzamy6kxw0xk5bcmjfvb3wpxznhiigqm"; - name = "akonadi-contacts-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadi-contacts-21.12.3.tar.xz"; + sha256 = "04ixj09s27q8pbmfrb1475bc0h84sb5ikfxzpc4i5b3whx40g9dm"; + name = "akonadi-contacts-21.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadi-import-wizard-21.12.2.tar.xz"; - sha256 = "0b4mphxbqzf3akhafxc4fvil83l3z4qcf8xnblw23ficqqs8s0di"; - name = "akonadi-import-wizard-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadi-import-wizard-21.12.3.tar.xz"; + sha256 = "1fbxx53zdcqp98mzdx45ccncppnxqfhc7j9qwwxcik0ygrmg9wcj"; + name = "akonadi-import-wizard-21.12.3.tar.xz"; }; }; akonadi-mime = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadi-mime-21.12.2.tar.xz"; - sha256 = "1nd6bf26lb5wfhzh4kn37iwmb6savcq9wsaph5c7jg6m0bdix1fn"; - name = "akonadi-mime-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadi-mime-21.12.3.tar.xz"; + sha256 = "1bcrbf5z9175p206cvm5s6zq882nb32cf9akdcbnadqiibrpxkxv"; + name = "akonadi-mime-21.12.3.tar.xz"; }; }; akonadi-notes = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadi-notes-21.12.2.tar.xz"; - sha256 = "1s3bxnqsjnlgsnia0nvqyc3m1ppzanzna9598lgwbmz053rgn7ck"; - name = "akonadi-notes-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadi-notes-21.12.3.tar.xz"; + sha256 = "0xkcw9izgxfzglciig2i4wiz6iflzjg0d6dp1nq6p1kwxwc899sb"; + name = "akonadi-notes-21.12.3.tar.xz"; }; }; akonadi-search = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadi-search-21.12.2.tar.xz"; - sha256 = "1hp2x8y59azl59znrqhrjn4n1bs2iqnkdsldv1f2k1ima6z5f4qy"; - name = "akonadi-search-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadi-search-21.12.3.tar.xz"; + sha256 = "1id6zzjxc9zvpz1ryj2zn1yff5ak04r1mlk9cklbj99frzf0wv6p"; + name = "akonadi-search-21.12.3.tar.xz"; }; }; akonadiconsole = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akonadiconsole-21.12.2.tar.xz"; - sha256 = "1rqfmhi1mzh6yzjg7jf6adf1xqvpbhcxgld2pp4rd9g5mi9rlxlk"; - name = "akonadiconsole-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akonadiconsole-21.12.3.tar.xz"; + sha256 = "1chb0ars9w05pq6ij2l8qfj1ac7pmzwg2mq1i4z8syhdklyryir1"; + name = "akonadiconsole-21.12.3.tar.xz"; }; }; akregator = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/akregator-21.12.2.tar.xz"; - sha256 = "1srsm25qvbww0hl7r878n32b71g0p222zxyys7chzrg8izrh12b8"; - name = "akregator-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/akregator-21.12.3.tar.xz"; + sha256 = "1yy5c29zxpli4cddknmdvjkgii3j7pvw6lhwqfrqjc8jh83gm8f8"; + name = "akregator-21.12.3.tar.xz"; }; }; analitza = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/analitza-21.12.2.tar.xz"; - sha256 = "1ak2wyfx67cwx85d5053f6flxwas973mhnm25mf4jw0qll72vid4"; - name = "analitza-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/analitza-21.12.3.tar.xz"; + sha256 = "0rgims4c80nficibg3lh764csh0kjsfnf7h303kyfd9yk59xa3in"; + name = "analitza-21.12.3.tar.xz"; }; }; ark = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ark-21.12.2.tar.xz"; - sha256 = "1g05lyv8ll85myw0i62bxr4kmfd3dhldvmbgpgym9r1rgan12q90"; - name = "ark-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ark-21.12.3.tar.xz"; + sha256 = "1p30bgnb3aw0f2jnaksz7jfqqcz45b2x3bjrri0w5w580204a5s8"; + name = "ark-21.12.3.tar.xz"; }; }; artikulate = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/artikulate-21.12.2.tar.xz"; - sha256 = "1g0h0dqqsf3x8q292hfhrizl9dlqzm8gjynzcyrzx0gvbfadj2l1"; - name = "artikulate-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/artikulate-21.12.3.tar.xz"; + sha256 = "0fbgmd3yfyv1pzz24874a0v7cl4yk6wlfryn8sn21smi054wqz6z"; + name = "artikulate-21.12.3.tar.xz"; }; }; audiocd-kio = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/audiocd-kio-21.12.2.tar.xz"; - sha256 = "07nk060vkyn94ihs9v054zhsckfwpn8z911gy3hnyf1wdmnpfh2n"; - name = "audiocd-kio-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/audiocd-kio-21.12.3.tar.xz"; + sha256 = "1alyn7w0v1by3fkb6xfnwj0hayjrrnmwnajnrnpvn8skbqsbzlgc"; + name = "audiocd-kio-21.12.3.tar.xz"; }; }; baloo-widgets = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/baloo-widgets-21.12.2.tar.xz"; - sha256 = "1ax7pak9qb60yzdca8frkb8qs4khs6f2wbkwyb48s7zmdxqyw1bj"; - name = "baloo-widgets-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/baloo-widgets-21.12.3.tar.xz"; + sha256 = "0cfcfmsgbaxi53a3r0f013lskm5yll7zaxw98nlj6r8fsq2slrhv"; + name = "baloo-widgets-21.12.3.tar.xz"; }; }; blinken = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/blinken-21.12.2.tar.xz"; - sha256 = "0h0nw79zr891f54y2r3d3n837bzn24pfvkxsab1f0a228kjakw09"; - name = "blinken-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/blinken-21.12.3.tar.xz"; + sha256 = "1pbwb7q4p705k31kd62gira0x9qccjsn07d6h1w44wydc3lfdjnc"; + name = "blinken-21.12.3.tar.xz"; }; }; bomber = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/bomber-21.12.2.tar.xz"; - sha256 = "1348mdiykfg1c3gr5fkcf71mxf7lyapwg5ym3jqp9vyc56vhwfjs"; - name = "bomber-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/bomber-21.12.3.tar.xz"; + sha256 = "1mlxs2dbsycq7mw9g1hl2l17gl0z33mrry5r0zmz74i67nfijg8w"; + name = "bomber-21.12.3.tar.xz"; }; }; bovo = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/bovo-21.12.2.tar.xz"; - sha256 = "0i2i5ici9v402lrh83mhfsrxmqi0fs75rkfvhsbza3wab7b165kc"; - name = "bovo-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/bovo-21.12.3.tar.xz"; + sha256 = "1jzvazqy5vcwkyhnbzw7sh8ngff5clclq98vbbhzd9dmnacirdbq"; + name = "bovo-21.12.3.tar.xz"; }; }; calendarsupport = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/calendarsupport-21.12.2.tar.xz"; - sha256 = "021rr06ln7l0v2xjzsij4r71jwpy1w1r761bjad0ywprwkdc93bm"; - name = "calendarsupport-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/calendarsupport-21.12.3.tar.xz"; + sha256 = "0annni037cp1ga2lj2gkjxlkygnaxna4fs095lbaqp5zljz3g8vp"; + name = "calendarsupport-21.12.3.tar.xz"; }; }; cantor = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/cantor-21.12.2.tar.xz"; - sha256 = "0vq8yvdglf43y5r2f9bvamm9bp82q92hw9sr8xmgb5hqz5mkap78"; - name = "cantor-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/cantor-21.12.3.tar.xz"; + sha256 = "0v0xcgaz3rag044wmpiq8gs7pp6n7wcca0q1hzav7i651pgqjjks"; + name = "cantor-21.12.3.tar.xz"; }; }; cervisia = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/cervisia-21.12.2.tar.xz"; - sha256 = "1vpm3cjknpa4s9mjdfngpvidqihfh5sb427yhnydr1q2dmllr9nn"; - name = "cervisia-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/cervisia-21.12.3.tar.xz"; + sha256 = "106x0xrscc6xvgijmqy892r1hrirjh32nj8lqhc7g7dzjaa7lhsj"; + name = "cervisia-21.12.3.tar.xz"; }; }; dolphin = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/dolphin-21.12.2.tar.xz"; - sha256 = "0c0gk1djgl1d1qzibw5f1w29cnlxl6kan8pkg0izaqvnbmmx53wn"; - name = "dolphin-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/dolphin-21.12.3.tar.xz"; + sha256 = "0m5nqa8j0mcsrx9wxfcf8z39kxas51k03lschr721vm4x65j64jq"; + name = "dolphin-21.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/dolphin-plugins-21.12.2.tar.xz"; - sha256 = "1mrsampq1zq5rri1kx77dz0afz4a6s8pvb1255q0pl7imgxhiaqc"; - name = "dolphin-plugins-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/dolphin-plugins-21.12.3.tar.xz"; + sha256 = "0rbz6fw98c71h10ry1xjc0pgzvphajmj18lnjm4hf7bbrizsmdb5"; + name = "dolphin-plugins-21.12.3.tar.xz"; }; }; dragon = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/dragon-21.12.2.tar.xz"; - sha256 = "07zn4ishffh9g8hvkpfgm7j9cimw3plcabzk9p157nhgxr62z4sb"; - name = "dragon-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/dragon-21.12.3.tar.xz"; + sha256 = "09iwwlbv4jmxs92dz20z9fqg1sfnqih54izz8459ibl8vydfgfp1"; + name = "dragon-21.12.3.tar.xz"; }; }; elisa = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/elisa-21.12.2.tar.xz"; - sha256 = "0zwy0bi4s25y6adgjhrhw992i2c1kjwpgvp9yg902h8zpsdynwh5"; - name = "elisa-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/elisa-21.12.3.tar.xz"; + sha256 = "0cg9v438fclqnv1rgx2k86mzfp5ggfcp7d5kr8xh4kjbmy17rzca"; + name = "elisa-21.12.3.tar.xz"; }; }; eventviews = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/eventviews-21.12.2.tar.xz"; - sha256 = "1v3bpd0b3ph7v0kg8pyp4rr4j8cxy7y4csym5dlqn6l81db7d3gr"; - name = "eventviews-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/eventviews-21.12.3.tar.xz"; + sha256 = "01x9ccwspn1dwkmcxcr8p6pazj6w31pxhx0bzlfr6bgpccicp2w2"; + name = "eventviews-21.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ffmpegthumbs-21.12.2.tar.xz"; - sha256 = "17cyrimlnf1npffmxinnj3q5ynqg3agx35b55iqnw3xixrz4snzr"; - name = "ffmpegthumbs-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ffmpegthumbs-21.12.3.tar.xz"; + sha256 = "0x2gpx30azkz61p3xj1nm7hckyrmyh0qhs29ah30z6a5xw7336ws"; + name = "ffmpegthumbs-21.12.3.tar.xz"; }; }; filelight = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/filelight-21.12.2.tar.xz"; - sha256 = "0khhwnms2ysy9ijpmmagm68w1zixmxs7svaaldd30xb3w52f78v2"; - name = "filelight-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/filelight-21.12.3.tar.xz"; + sha256 = "1w3q0l9p5ry2crwdzcyb1d4ms2y4gp3y0a3j5drpy8clmxn0gz18"; + name = "filelight-21.12.3.tar.xz"; }; }; granatier = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/granatier-21.12.2.tar.xz"; - sha256 = "0j7yizbljqx1a4wd4prmb3463r67f3lk5gv5x8j1yx2zmiaq0qki"; - name = "granatier-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/granatier-21.12.3.tar.xz"; + sha256 = "16yriharl66frglmdy6750nixczh0l4c19nnr6dav15m8qfb3g6b"; + name = "granatier-21.12.3.tar.xz"; }; }; grantlee-editor = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/grantlee-editor-21.12.2.tar.xz"; - sha256 = "0wxkg56s83i61i17cb2y6ziminaq2gammynrwm5jvkpi5vqwvi2s"; - name = "grantlee-editor-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/grantlee-editor-21.12.3.tar.xz"; + sha256 = "00qy1ncgwylc995g051x5l679s16wjpcj7il62ck7d0j02rah0n2"; + name = "grantlee-editor-21.12.3.tar.xz"; }; }; grantleetheme = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/grantleetheme-21.12.2.tar.xz"; - sha256 = "0z1p0s7fakfbscppmrgp1irf3dm2ayadyd3yb5zdsr9xahs0b9md"; - name = "grantleetheme-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/grantleetheme-21.12.3.tar.xz"; + sha256 = "1w83slbkj2y1wk78srq2k95ybs66sb4mbaa0zm7fl9pkwhqxbnb7"; + name = "grantleetheme-21.12.3.tar.xz"; }; }; gwenview = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/gwenview-21.12.2.tar.xz"; - sha256 = "1jkv34llga981dq08npk8alrg9h27prdpffcxkm368i77mvp9hv6"; - name = "gwenview-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/gwenview-21.12.3.tar.xz"; + sha256 = "0zbsyrwlwbc9zmdxcgk02dvcb0f8izhlcbbzqw8cgr4l2c90xl98"; + name = "gwenview-21.12.3.tar.xz"; }; }; incidenceeditor = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/incidenceeditor-21.12.2.tar.xz"; - sha256 = "151jhn84d5amv3abvp6cd2q10mf4mmv3q5hn0inqrmapy3v6bn8i"; - name = "incidenceeditor-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/incidenceeditor-21.12.3.tar.xz"; + sha256 = "1sbflfggpqhwhg3iw46462z3p83sjhlx6f1fvgz251m020vqq9xa"; + name = "incidenceeditor-21.12.3.tar.xz"; }; }; itinerary = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/itinerary-21.12.2.tar.xz"; - sha256 = "02w6696kdzgz2r9677nr1jyhd9mfhc2zhmasy70nblz0jn22bcq7"; - name = "itinerary-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/itinerary-21.12.3.tar.xz"; + sha256 = "0gvkhwnxichvpwrsb6wjiv5q80v8k2yqvgpvfdapxnd7sx6qp7fp"; + name = "itinerary-21.12.3.tar.xz"; }; }; juk = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/juk-21.12.2.tar.xz"; - sha256 = "1qgxpy1ksrgvdik69vppzdl1crscn69284q4wvwc5qh9v6rhv1xn"; - name = "juk-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/juk-21.12.3.tar.xz"; + sha256 = "1ipzx031996h83f9w3fzbx5vf5nnskq9kf71a6aypqckk65vcqcs"; + name = "juk-21.12.3.tar.xz"; }; }; k3b = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/k3b-21.12.2.tar.xz"; - sha256 = "0rjg3zs85gw62r3z3msp438jnf0ghc6y577br59ig19m10x33rz9"; - name = "k3b-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/k3b-21.12.3.tar.xz"; + sha256 = "0igqb6zw76j2hl9xclcwfny2831phdg9s2msa1y87zyc3c7g9nxc"; + name = "k3b-21.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kaccounts-integration-21.12.2.tar.xz"; - sha256 = "0c4yxrhbas0wsmrxr0pwkpgw9gzdvvf5r5nxd15f656bwwhmqlwy"; - name = "kaccounts-integration-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-integration-21.12.3.tar.xz"; + sha256 = "13q4d7ln98vdpb6ryk49zakx5bysdnjxifi7cma10fgk9gcqqhpb"; + name = "kaccounts-integration-21.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kaccounts-providers-21.12.2.tar.xz"; - sha256 = "1srz43xf6kz7xfz8np94pdnhmvashk7y2f2a275rwpnlrl0yw1yd"; - name = "kaccounts-providers-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-providers-21.12.3.tar.xz"; + sha256 = "0kcyvpa0b872q7s4amagqcrzpl8cxlb91nwc9yg91wg56mmfv7m0"; + name = "kaccounts-providers-21.12.3.tar.xz"; }; }; kaddressbook = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kaddressbook-21.12.2.tar.xz"; - sha256 = "04ac5z9603lxylc6x55chnc0w59mx3z92nyvfnvjvp1ga77si36b"; - name = "kaddressbook-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kaddressbook-21.12.3.tar.xz"; + sha256 = "1hzq0fdy99l1kqw14d582l0s56gvrw86abihib6k4az4c6g3c0md"; + name = "kaddressbook-21.12.3.tar.xz"; }; }; kajongg = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kajongg-21.12.2.tar.xz"; - sha256 = "04s3f8nj0rh1zy7sfa5kq0smbfsyylz9w3lxm2z69g7x5sb08k53"; - name = "kajongg-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kajongg-21.12.3.tar.xz"; + sha256 = "1sffssfpzsd83ippkwpmqdx8rfh9cpd7i22nsv8asnaylylvy3zd"; + name = "kajongg-21.12.3.tar.xz"; }; }; kalarm = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kalarm-21.12.2.tar.xz"; - sha256 = "0f3hcsql20lim9nqb0ha5lpsrbh131rwcla9i6aax5sgw4m6nyfh"; - name = "kalarm-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kalarm-21.12.3.tar.xz"; + sha256 = "1miwcxim46hiabp2rbs874np544ip4x5nl1dc62h9li9784a9k3i"; + name = "kalarm-21.12.3.tar.xz"; }; }; kalarmcal = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kalarmcal-21.12.2.tar.xz"; - sha256 = "15l893iv4smlppk7k682m9hwrph84p5chx5mgxixjxl28c1blcc8"; - name = "kalarmcal-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kalarmcal-21.12.3.tar.xz"; + sha256 = "160pmr702b68hys9l02azvrv6pagy1r2whw0zp3jlf6863p9fkqr"; + name = "kalarmcal-21.12.3.tar.xz"; }; }; kalgebra = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kalgebra-21.12.2.tar.xz"; - sha256 = "0w1h3as6dip4hrp2ay61sz9gixf4s887jp42v7zjajwwhjs6xs1m"; - name = "kalgebra-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kalgebra-21.12.3.tar.xz"; + sha256 = "0870kdqha0nk2cm8hq8d9l2fqfw6hn0rx2qc9f9w8l4014rcn127"; + name = "kalgebra-21.12.3.tar.xz"; }; }; kalzium = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kalzium-21.12.2.tar.xz"; - sha256 = "0kvrmvd2vgl6fklxq9sr46p6nnh0fk0l6licj9b5q9rz82xwbr50"; - name = "kalzium-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kalzium-21.12.3.tar.xz"; + sha256 = "1qha1dh638ms785j1b73j19pj8y3c7v1n4jd1m93026a292m8jll"; + name = "kalzium-21.12.3.tar.xz"; }; }; kamera = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kamera-21.12.2.tar.xz"; - sha256 = "07n1xlmg7m6p5ca0i4hjjyv564cqrn4p6h5yqx4pw3pcq8nizqfz"; - name = "kamera-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kamera-21.12.3.tar.xz"; + sha256 = "1xwxmlnra9qdhvf1hhy04v72ar02pqxkg0l16a53809ilyss2wrm"; + name = "kamera-21.12.3.tar.xz"; }; }; kamoso = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kamoso-21.12.2.tar.xz"; - sha256 = "09qn1px0mmcjhw9ikaz8xcjbdabh657ij3sa4ps37jbfzyyv45fb"; - name = "kamoso-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kamoso-21.12.3.tar.xz"; + sha256 = "1q98f6ni4p19pk0svbfw4mbfwnc9i5p9csms2aj76mp2dn78xpib"; + name = "kamoso-21.12.3.tar.xz"; }; }; kanagram = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kanagram-21.12.2.tar.xz"; - sha256 = "1l4j2fy8mwdywp0prswng1f06rpwkfi54dc8z5z02b13p47hz5cy"; - name = "kanagram-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kanagram-21.12.3.tar.xz"; + sha256 = "131flw9pjvin4w1m36qkwgzna3llvxp1vq0ynzwfnvhs49i3g5gc"; + name = "kanagram-21.12.3.tar.xz"; }; }; kapman = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kapman-21.12.2.tar.xz"; - sha256 = "0n1iz9jfgzpcpavb4ijfqp3hym7z53wzp5a5hiad8i6nws408grn"; - name = "kapman-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kapman-21.12.3.tar.xz"; + sha256 = "1974z7g3ylvf48xh3xhf3gr7iphgmj83ir9hss1a2ba0hpgg463k"; + name = "kapman-21.12.3.tar.xz"; }; }; kapptemplate = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kapptemplate-21.12.2.tar.xz"; - sha256 = "1sjyji533x9ph9l63zf0llsb0m5fzb1lka03h5blm7fdyw570bad"; - name = "kapptemplate-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kapptemplate-21.12.3.tar.xz"; + sha256 = "16jgybcq3ixqwi7wli11ns7w4zdlj8rgw4chzsjcqxn6c0sqy8zq"; + name = "kapptemplate-21.12.3.tar.xz"; }; }; kate = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kate-21.12.2.tar.xz"; - sha256 = "0r59rfyrbs50w9brl4rrq1wdfmrr3sz7plw2pqlc5xpzngrdlhs1"; - name = "kate-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kate-21.12.3.tar.xz"; + sha256 = "1pp0k00kvih0xkkv1q1gha4na2bwqc7dhyyrla7c2vvln8gi99dg"; + name = "kate-21.12.3.tar.xz"; }; }; katomic = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/katomic-21.12.2.tar.xz"; - sha256 = "123ls2p6az9bpy741xg85azs0p1qbssgcg4fh8cqazkz0kgzr0hf"; - name = "katomic-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/katomic-21.12.3.tar.xz"; + sha256 = "1y4mnvkd6ajk0m0j2xph5zbw3a14clm2sswc4y8c9r4ipk3hqsgh"; + name = "katomic-21.12.3.tar.xz"; }; }; kbackup = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kbackup-21.12.2.tar.xz"; - sha256 = "1yadxlqfz2a4lirxf2xmivggvdpbjiaw5zn7aw72jb3yjs7x6j03"; - name = "kbackup-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kbackup-21.12.3.tar.xz"; + sha256 = "0r1cqkfzpdqpwv5pds8l0p7lxlwpv0mr7rjys1icsp8gl4hbpv60"; + name = "kbackup-21.12.3.tar.xz"; }; }; kblackbox = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kblackbox-21.12.2.tar.xz"; - sha256 = "1y5l5l5p3s2gf69rih3mjdv42h9ydfk66v10ad5na3b4sqbi2qi7"; - name = "kblackbox-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kblackbox-21.12.3.tar.xz"; + sha256 = "10j8rnpr3gjaqspx4mxqj9cncqj6v2jn5rkldr46bv7yxgjb5rw3"; + name = "kblackbox-21.12.3.tar.xz"; }; }; kblocks = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kblocks-21.12.2.tar.xz"; - sha256 = "13anvyy3br7ybl74jcrnjmw5qjfyk4z6s7ncziw8l37ggg4k7n91"; - name = "kblocks-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kblocks-21.12.3.tar.xz"; + sha256 = "1n3jc96ws8078gk1il61dc96p3pzvj3z9brnwi274pk4cif63bli"; + name = "kblocks-21.12.3.tar.xz"; }; }; kbounce = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kbounce-21.12.2.tar.xz"; - sha256 = "07k5vmfkh9l4b4sb4an5qlnq0b9hmhh6dax0bjgia0ng9vxd011q"; - name = "kbounce-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kbounce-21.12.3.tar.xz"; + sha256 = "1am4j11cjzlmav2zh5802kasy0kdcx78slycadnf96bmhxs8hvyv"; + name = "kbounce-21.12.3.tar.xz"; }; }; kbreakout = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kbreakout-21.12.2.tar.xz"; - sha256 = "08rykfi82hgzg5l2bhs8nvh8si06nisy60653n6r7m8g327yyn1m"; - name = "kbreakout-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kbreakout-21.12.3.tar.xz"; + sha256 = "0vqlxaggzvvrb439ybsvd5kr9j2jzpwk4xy3yni83y830h1mmhhc"; + name = "kbreakout-21.12.3.tar.xz"; }; }; kbruch = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kbruch-21.12.2.tar.xz"; - sha256 = "0vvl2rk636zpg27hj2jly1awg4z3fm6mk75qrda3hl6gm8rddw1v"; - name = "kbruch-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kbruch-21.12.3.tar.xz"; + sha256 = "1kcwbpa5lawkqqwn40r6d7savwvi7kkdgdxfxqxkviwnif2qkssx"; + name = "kbruch-21.12.3.tar.xz"; }; }; kcachegrind = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kcachegrind-21.12.2.tar.xz"; - sha256 = "1fg7fn8a3bjbjr6bi298gqr4mr838v96bz9773pd7rnhffvvip8z"; - name = "kcachegrind-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kcachegrind-21.12.3.tar.xz"; + sha256 = "1cssjywnhfbnsvly4mralpx3af2pqkmhg1jj2q3cjiqx44i3gkyx"; + name = "kcachegrind-21.12.3.tar.xz"; }; }; kcalc = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kcalc-21.12.2.tar.xz"; - sha256 = "037xk57gjfbjpw1q4gm9k1xkc3x5xxjr4d8xmnrnc6ni090648q4"; - name = "kcalc-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kcalc-21.12.3.tar.xz"; + sha256 = "15yqzhrlzcix8wvgaah8wf12msylgzyqwk58f58k5agxh97ahv4q"; + name = "kcalc-21.12.3.tar.xz"; }; }; kcalutils = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kcalutils-21.12.2.tar.xz"; - sha256 = "0i474by8pyv64b7i807kym2q4wkhnyyn21vn56dbgp1awpi198i8"; - name = "kcalutils-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kcalutils-21.12.3.tar.xz"; + sha256 = "006sfkjzyid8byl2mmyn1is4nra9wjqh21ksd5g1kv948hf1jdcs"; + name = "kcalutils-21.12.3.tar.xz"; }; }; kcharselect = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kcharselect-21.12.2.tar.xz"; - sha256 = "1czkni7wrl2l5v0zpvxfwdaqd5i0x6knzbjhzh8shdg3h19sgqrm"; - name = "kcharselect-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kcharselect-21.12.3.tar.xz"; + sha256 = "1aaiz9f9y2fmf284617pfnncgxjjjyfvdv08h900sc0bdlfmh4y7"; + name = "kcharselect-21.12.3.tar.xz"; }; }; kcolorchooser = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kcolorchooser-21.12.2.tar.xz"; - sha256 = "12s2vfa3i7b5dh8c10xbqsy1xi9pq13vdj2xcpm5chkgw22595hv"; - name = "kcolorchooser-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kcolorchooser-21.12.3.tar.xz"; + sha256 = "0jnnbwaj9xb0ifcc95xay8yc4bx9f29wqkj3h4kffzdlwvw3vp7s"; + name = "kcolorchooser-21.12.3.tar.xz"; }; }; kcron = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kcron-21.12.2.tar.xz"; - sha256 = "0ddgl61vw4mj8sa6zg1m4s6qagwygdkvw9pjmfs8fsa1anhlillk"; - name = "kcron-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kcron-21.12.3.tar.xz"; + sha256 = "0ffc71inp1kyd4xh39x6vbfggz0kpipd6r6vabfn187lpnpwcmpm"; + name = "kcron-21.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kde-dev-scripts-21.12.2.tar.xz"; - sha256 = "1vdssqwyi25j3saz5cw8n40y2i6bhq5l0rxbarh8m3iwcvx4ki3c"; - name = "kde-dev-scripts-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-scripts-21.12.3.tar.xz"; + sha256 = "04w4kk7vpfkjj2fzylmq590kk7xskw3a0id3wndw8066pfafsfg3"; + name = "kde-dev-scripts-21.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kde-dev-utils-21.12.2.tar.xz"; - sha256 = "0flzc0kl252imng2mpg9mp71k8jrxc3yy7dzqlfdnpjz36dwpaqf"; - name = "kde-dev-utils-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-utils-21.12.3.tar.xz"; + sha256 = "1jdqv5zdigwazh3m580rmnylr6h6a6l5g2cpxy54v9sdvh3qb1yr"; + name = "kde-dev-utils-21.12.3.tar.xz"; }; }; kdebugsettings = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdebugsettings-21.12.2.tar.xz"; - sha256 = "0cimipq45c36nwk3alg738jl93zxja3xi77zjqk0k28ffn6qn7c2"; - name = "kdebugsettings-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdebugsettings-21.12.3.tar.xz"; + sha256 = "19ng7hvqpyh3kh0pahrknh89c113mqx1kxjq4r26xbww1ypkz8zq"; + name = "kdebugsettings-21.12.3.tar.xz"; }; }; kdeconnect-kde = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdeconnect-kde-21.12.2.tar.xz"; - sha256 = "0crw0navhdsix0rpsya4vhffj35vlascpcflrs04vyws3v8xr026"; - name = "kdeconnect-kde-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdeconnect-kde-21.12.3.tar.xz"; + sha256 = "1n9km7czif19cvrsdfcjbb02i1xgpa1z4ycn20d3g8azmli4zj4g"; + name = "kdeconnect-kde-21.12.3.tar.xz"; }; }; kdeedu-data = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdeedu-data-21.12.2.tar.xz"; - sha256 = "1cpbi5gkbq7xrv276vm0jlcjc5y9x1kw8l8x0z7syy06s4s3pvg9"; - name = "kdeedu-data-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdeedu-data-21.12.3.tar.xz"; + sha256 = "11mxxcca6jxz4qcmba12p6xbv845xa16b8ag529409f3276w4915"; + name = "kdeedu-data-21.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdegraphics-mobipocket-21.12.2.tar.xz"; - sha256 = "0zbiz47mqa176gcina8v03fw2qqrc5v1l8mg2fcpnl5dxc9d56c4"; - name = "kdegraphics-mobipocket-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-mobipocket-21.12.3.tar.xz"; + sha256 = "091ix343p9vs4iyj8abq6mw9lbm1fx5167gykhm4g8bjk5vdri2q"; + name = "kdegraphics-mobipocket-21.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdegraphics-thumbnailers-21.12.2.tar.xz"; - sha256 = "09adinkdfbn5hfic92zbdhq9ldxpnbgf9pybsp4ibpw2097l2k5f"; - name = "kdegraphics-thumbnailers-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-thumbnailers-21.12.3.tar.xz"; + sha256 = "0shdrl6n1724i8jrkmy8z6ayhflg93401jia87mcc1apaw9s8y83"; + name = "kdegraphics-thumbnailers-21.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdenetwork-filesharing-21.12.2.tar.xz"; - sha256 = "0q7gndwvki3r9vhkxmwr8xzc54cjpk9nzhk2665wsk1msfp3xqw6"; - name = "kdenetwork-filesharing-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdenetwork-filesharing-21.12.3.tar.xz"; + sha256 = "1y6sa22j2165j3x6ql1cfm30vv9ifb94mczbqbcjzmhqsypp5pw2"; + name = "kdenetwork-filesharing-21.12.3.tar.xz"; }; }; kdenlive = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdenlive-21.12.2.tar.xz"; - sha256 = "1h668q91pcq3km7pq75krgq06x8gglmp8al52b0imyc9g9wy28z6"; - name = "kdenlive-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdenlive-21.12.3.tar.xz"; + sha256 = "1hamdi2v3rx5zjmvpx1bximdppmzgsk9gbjxwgr691lkybkgx8vs"; + name = "kdenlive-21.12.3.tar.xz"; }; }; kdepim-addons = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdepim-addons-21.12.2.tar.xz"; - sha256 = "00j67rvkvm1sri6ij5ziqjh340cmpsyfwwmw8hr1dsi3vlva4gk1"; - name = "kdepim-addons-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdepim-addons-21.12.3.tar.xz"; + sha256 = "1pv780z29ccx05z12l2w5zdmby9d1q993jr0cyzvpapnmck9146h"; + name = "kdepim-addons-21.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdepim-runtime-21.12.2.tar.xz"; - sha256 = "0y1hgab16h9ypqh9isabbb4km2907vzdydfkd1m5b63vfbambz0j"; - name = "kdepim-runtime-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdepim-runtime-21.12.3.tar.xz"; + sha256 = "1ahrnnc9vn0556s4nrsjgc9vbf5rb6yby7fn33p3jjnpgja0mc7m"; + name = "kdepim-runtime-21.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdesdk-kioslaves-21.12.2.tar.xz"; - sha256 = "0vz6dk5an0bhnyglyqdgf3lqxdlc61k4vsbh8a4fky1zpvpwya84"; - name = "kdesdk-kioslaves-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-kioslaves-21.12.3.tar.xz"; + sha256 = "1nhsvx5pznm3adf0scrcqqb2ibl52a241ki2gbwvxk2qpwwwx6jd"; + name = "kdesdk-kioslaves-21.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdesdk-thumbnailers-21.12.2.tar.xz"; - sha256 = "1w90zjnwnqh1a47kgmijr8xp6z096f6ij250qfcl3bwvhxqmsrb0"; - name = "kdesdk-thumbnailers-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-thumbnailers-21.12.3.tar.xz"; + sha256 = "0337rhgil42wychi5anq2v61xq8mbcvma4gb50smapcrjfl7fkdy"; + name = "kdesdk-thumbnailers-21.12.3.tar.xz"; }; }; kdev-php = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdev-php-21.12.2.tar.xz"; - sha256 = "0ghxfllh8pkyrvsaz4iwc9bm98mkq6z3wr558w4wjykgjp69r08j"; - name = "kdev-php-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdev-php-21.12.3.tar.xz"; + sha256 = "0z5iqgsh7w0hw0pw2522zlh5sd88zlplrxm3vjp3yvmza65471aa"; + name = "kdev-php-21.12.3.tar.xz"; }; }; kdev-python = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdev-python-21.12.2.tar.xz"; - sha256 = "05jj7q7agkgpbrxzwh0n2ipc854cgm8skjyjkqmxp2kdf3fdm8lj"; - name = "kdev-python-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdev-python-21.12.3.tar.xz"; + sha256 = "1iyg1cfldf5mk62anw8schiw3ii0gp20qwg6ljk1r9hv583iwrq6"; + name = "kdev-python-21.12.3.tar.xz"; }; }; kdevelop = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdevelop-21.12.2.tar.xz"; - sha256 = "13kgkxvbjcb60ckapqrcr4m0y5kyag948xx6gwrvzhrhn46ynfgz"; - name = "kdevelop-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdevelop-21.12.3.tar.xz"; + sha256 = "1shp8zlxr7iyysn1c8d3fp6rg6g2krj2v3zw5apalxcnal16bww6"; + name = "kdevelop-21.12.3.tar.xz"; }; }; kdf = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdf-21.12.2.tar.xz"; - sha256 = "1fs8bab6q7imfpqqgasvr98k57nm68ignfch2i76rdcywhx3q268"; - name = "kdf-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdf-21.12.3.tar.xz"; + sha256 = "179ygy4kxkapfyxqj8h5xlvp1160vd72af34vd0a4r5az7wfd1m7"; + name = "kdf-21.12.3.tar.xz"; }; }; kdialog = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdialog-21.12.2.tar.xz"; - sha256 = "1k6zlh1gbpj0y40h1i8pan28d8chqjsnhd6pvsvr95b91d0pj2xn"; - name = "kdialog-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdialog-21.12.3.tar.xz"; + sha256 = "04d1dqc5f02s867lllx1ix0nc55xw9hrpg7jxiy3v4c8vlzg0w53"; + name = "kdialog-21.12.3.tar.xz"; }; }; kdiamond = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kdiamond-21.12.2.tar.xz"; - sha256 = "08b2a13bmxw3h6rhip619jvzgjrjgpz2v83i2azbqccfynisjnyh"; - name = "kdiamond-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kdiamond-21.12.3.tar.xz"; + sha256 = "1d3c4pckddnri9i19g2pi2ygpqakllrgy6azgvnh5hn20kgsw7d9"; + name = "kdiamond-21.12.3.tar.xz"; }; }; keditbookmarks = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/keditbookmarks-21.12.2.tar.xz"; - sha256 = "1fxm0mm3sqp2frk2fcs2jw86wjxb2j5z9vyb34x7g80k5j17j57m"; - name = "keditbookmarks-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/keditbookmarks-21.12.3.tar.xz"; + sha256 = "0wfb7j1lhhdfw2x03p692mglmy9i9qys8mn4f3gxlb5imrd2hmnk"; + name = "keditbookmarks-21.12.3.tar.xz"; }; }; kfind = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kfind-21.12.2.tar.xz"; - sha256 = "0kx6p4hyyalx5i8g4aq81aj30c9ac0380xvia9130g95pgkzd96c"; - name = "kfind-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kfind-21.12.3.tar.xz"; + sha256 = "1v1yxsbmzv4q5m5rbvl9n095d9fq0b1zphnl6vrzff5r8i53pzx0"; + name = "kfind-21.12.3.tar.xz"; }; }; kfloppy = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kfloppy-21.12.2.tar.xz"; - sha256 = "10245c87379576n11xcjkll3rkvzv815qsavr4alsj1jr8w6zyg8"; - name = "kfloppy-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kfloppy-21.12.3.tar.xz"; + sha256 = "1phkigxd6bkwlcjrsfhlhn44ra9imfq0flcvp4vmza6c9ylsx6m8"; + name = "kfloppy-21.12.3.tar.xz"; }; }; kfourinline = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kfourinline-21.12.2.tar.xz"; - sha256 = "1kz7ff31h8lvz7snqmjs6cma9i3py7dyd91i6ik2pwiar80sin1x"; - name = "kfourinline-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kfourinline-21.12.3.tar.xz"; + sha256 = "0rb5jcmmf19bidwywj56dn0wfrnrfi5kc75c20d7mxnlgygfdnkg"; + name = "kfourinline-21.12.3.tar.xz"; }; }; kgeography = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kgeography-21.12.2.tar.xz"; - sha256 = "09h5zp8pxzr47s7j50l6xfssvk9zk56cqgnsjx75yh1n077z1d0j"; - name = "kgeography-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kgeography-21.12.3.tar.xz"; + sha256 = "1s1xyfffqkhmf4n74a4ksjz62rdiyl1fk1v57s9gnr6qw71wqql0"; + name = "kgeography-21.12.3.tar.xz"; }; }; kget = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kget-21.12.2.tar.xz"; - sha256 = "0jmy2yxzrgq592dq075k7gp7ynk42i899jsbw0gbn79x69cxlkmv"; - name = "kget-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kget-21.12.3.tar.xz"; + sha256 = "1w249gvzz47ac7n1mnxxf20d9l7jmbh18m5dijy55ck61s4zcq4l"; + name = "kget-21.12.3.tar.xz"; }; }; kgoldrunner = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kgoldrunner-21.12.2.tar.xz"; - sha256 = "0by6cq31jsls3qaqn4agrdhvd9jqg84plm6nbgh3rc85pnj5h22p"; - name = "kgoldrunner-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kgoldrunner-21.12.3.tar.xz"; + sha256 = "0gzz58407zjmk311kyyj5l2c1ciczcq9i8ckpwbd341dvwaww27q"; + name = "kgoldrunner-21.12.3.tar.xz"; }; }; kgpg = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kgpg-21.12.2.tar.xz"; - sha256 = "1f193fyn1azwhm7b8gd5ffyb11acg1269mh1d2ly60ax83qjs48c"; - name = "kgpg-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kgpg-21.12.3.tar.xz"; + sha256 = "1mzq3g4xwg459k0mp9xvg8bhilizadbh4gck1764wq69bxlcyav3"; + name = "kgpg-21.12.3.tar.xz"; }; }; khangman = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/khangman-21.12.2.tar.xz"; - sha256 = "0xih54w33vigvm3x2xp5lf29k4aga4yil0qv263965nxn9djnlaw"; - name = "khangman-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/khangman-21.12.3.tar.xz"; + sha256 = "000vn11pp4hwfh2689rmnwrrssrmrhx5569k02h4ynswkiykvbv6"; + name = "khangman-21.12.3.tar.xz"; }; }; khelpcenter = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/khelpcenter-21.12.2.tar.xz"; - sha256 = "09ddkc7kiayx852mpgdmv04l19vrrc0yrf30hnyzkci58kbavvcq"; - name = "khelpcenter-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/khelpcenter-21.12.3.tar.xz"; + sha256 = "1fj1c57bqs009rx9db4ifvfmhhl4b35r5sfly3wvbfr4dapjqfqr"; + name = "khelpcenter-21.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kidentitymanagement-21.12.2.tar.xz"; - sha256 = "00fwjax3kfvr8jsy04hp1jyihvskvprbg83z2avhcy6lvr7g25kk"; - name = "kidentitymanagement-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kidentitymanagement-21.12.3.tar.xz"; + sha256 = "18xwvlmqhih5jmig2mj3a6mc5awlxdv8f81da6cgm123imhrirk4"; + name = "kidentitymanagement-21.12.3.tar.xz"; }; }; kig = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kig-21.12.2.tar.xz"; - sha256 = "100ds4728lfnb6r6c52rdzk2n4rcpc5jiv35q5qd7d6cszmxvhvx"; - name = "kig-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kig-21.12.3.tar.xz"; + sha256 = "0rl0z1djsf9ha0q94v0cnj5qm4ij6yjsil2s57r3v666h64yradn"; + name = "kig-21.12.3.tar.xz"; }; }; kigo = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kigo-21.12.2.tar.xz"; - sha256 = "0g1sl7bw9aln7fm2786sgh0m44da6vfxc9g0rizw31ff8papnyb8"; - name = "kigo-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kigo-21.12.3.tar.xz"; + sha256 = "14pp73b9mbf0ny75b90vs7z9l61m7zp8cll7hl4bplqh1kig1szf"; + name = "kigo-21.12.3.tar.xz"; }; }; killbots = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/killbots-21.12.2.tar.xz"; - sha256 = "1qryy2g2i6iqc6rsw8jz4c14x67glpm3zvcx2dghyll6q9hns43z"; - name = "killbots-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/killbots-21.12.3.tar.xz"; + sha256 = "1ncr55xq04vrx6bss1ahk86c3l9ckhv4zjbc6gq4krhjw0lkdfiv"; + name = "killbots-21.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kimagemapeditor-21.12.2.tar.xz"; - sha256 = "11j55jvfxdpam3gkfv7355av9d6mz8z6djhplhmfd56llkmvw4n2"; - name = "kimagemapeditor-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kimagemapeditor-21.12.3.tar.xz"; + sha256 = "0qdmyrlf0jp3737p7x31wk428676xv77lx0mgyd9h2hdl0ipnbvr"; + name = "kimagemapeditor-21.12.3.tar.xz"; }; }; kimap = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kimap-21.12.2.tar.xz"; - sha256 = "0sdas8knk6wa8hhgc3w62famdpq6pcxfhl4vmpw0r3aqskaci4q3"; - name = "kimap-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kimap-21.12.3.tar.xz"; + sha256 = "11jd9zkvflfh3gqs36fhj8mla3k44xf7zdb0z4nl9sk5nhhgm5px"; + name = "kimap-21.12.3.tar.xz"; }; }; kio-extras = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kio-extras-21.12.2.tar.xz"; - sha256 = "0133cww4k2svn7cvw0fbdcwwv0zg09d27gz59gkpfswjmpsxdqj4"; - name = "kio-extras-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kio-extras-21.12.3.tar.xz"; + sha256 = "11zpnjdri7z4sz6zx26d9iv52aj4vf5lr9c114gg4pvz2l4h4h5i"; + name = "kio-extras-21.12.3.tar.xz"; }; }; kio-gdrive = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kio-gdrive-21.12.2.tar.xz"; - sha256 = "1n3khrx5fczffwzg4bzxjhzy2kxf72dmb7fqs9hqfn1qkaahfv49"; - name = "kio-gdrive-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kio-gdrive-21.12.3.tar.xz"; + sha256 = "0bm3c7g6q7z2ydnha2x5c456x9wlgachi9453mlrd2zcsc7c5h87"; + name = "kio-gdrive-21.12.3.tar.xz"; }; }; kipi-plugins = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kipi-plugins-21.12.2.tar.xz"; - sha256 = "11f3qmgqxdlzvv2zldjawn7a3kdigj5pb535rc9v9a8fp8mjvk88"; - name = "kipi-plugins-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kipi-plugins-21.12.3.tar.xz"; + sha256 = "1h6107d2a6jcyjsd191cg2ykgwm580j7wr0blg328ff6wwk1aizy"; + name = "kipi-plugins-21.12.3.tar.xz"; }; }; kirigami-gallery = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kirigami-gallery-21.12.2.tar.xz"; - sha256 = "0rg9lg4iqxycfbhs62qs4ms4qadz1ii1dcv3ykkgn3w2brx77wad"; - name = "kirigami-gallery-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kirigami-gallery-21.12.3.tar.xz"; + sha256 = "0pjd9bq965v9x433p8rbhd7w3fj0808qd7x4c11ziyhy4cg9gwml"; + name = "kirigami-gallery-21.12.3.tar.xz"; }; }; kiriki = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kiriki-21.12.2.tar.xz"; - sha256 = "1blj3vl87jdrr8qv2cyng20nr4d54gbk7w72z9rl02l62c9gkw5j"; - name = "kiriki-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kiriki-21.12.3.tar.xz"; + sha256 = "0qbm0zjjqnbcdm39zi8h240nblpa1pa7g1ls9mghzbqrdrh7n3a0"; + name = "kiriki-21.12.3.tar.xz"; }; }; kiten = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kiten-21.12.2.tar.xz"; - sha256 = "18kxqrhfgch32583ra4422h7csd5ajijf9989bxz9hwi9mn3r2vl"; - name = "kiten-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kiten-21.12.3.tar.xz"; + sha256 = "0z0haqxxkh7m2510b5qfwbx8s45vcahbk503jp1x0bwz03mrwflw"; + name = "kiten-21.12.3.tar.xz"; }; }; kitinerary = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kitinerary-21.12.2.tar.xz"; - sha256 = "0g7z6408nhrv54h6xxd2rd9wj2hmwzc3lg5risyqbg2zii9j0sp2"; - name = "kitinerary-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kitinerary-21.12.3.tar.xz"; + sha256 = "0kccrjiyib2zljr6rnc89y29jgi8cnhwfh1yq8psyzmca2n8lpxi"; + name = "kitinerary-21.12.3.tar.xz"; }; }; kjumpingcube = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kjumpingcube-21.12.2.tar.xz"; - sha256 = "1abv3yi716n88b19rmimhw0vnnwyw28ab6fbcy9g1lgpbi69g5ax"; - name = "kjumpingcube-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kjumpingcube-21.12.3.tar.xz"; + sha256 = "1wlk6my6pawmdv3zgcpnyyzpjwz0wii0h8i1z0gxhbpg9nc8iy1r"; + name = "kjumpingcube-21.12.3.tar.xz"; }; }; kldap = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kldap-21.12.2.tar.xz"; - sha256 = "1xda42f1q5ih3hdhmcbdz0fx2nchirlwips3gq0jb6lfzi5dbqpl"; - name = "kldap-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kldap-21.12.3.tar.xz"; + sha256 = "13llsfhx9lfvhf90a3vmpkyh02fjg5sp4fmrwrqyx9hjrbmy1g0a"; + name = "kldap-21.12.3.tar.xz"; }; }; kleopatra = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kleopatra-21.12.2.tar.xz"; - sha256 = "1b2nq823gq1v20dnh3hm298fva7cmbn9hh0kmbq22kh98kv8chhh"; - name = "kleopatra-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kleopatra-21.12.3.tar.xz"; + sha256 = "10f61m0qrs0qipn94jd32gibyj8pcvprs8j7gmac0mym0b3djjls"; + name = "kleopatra-21.12.3.tar.xz"; }; }; klettres = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/klettres-21.12.2.tar.xz"; - sha256 = "1wi1byr36x7z9scsy1gffna36m8x9vyfcqzndvx6042i2y0smhwz"; - name = "klettres-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/klettres-21.12.3.tar.xz"; + sha256 = "0l4zgfqd6l2bk67s2a0zldbcy8v7nwbv7yahvnyw4jf4jyv9q9rv"; + name = "klettres-21.12.3.tar.xz"; }; }; klickety = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/klickety-21.12.2.tar.xz"; - sha256 = "19rn9p7cbxhn471b65nhwhpnfnhykjwj6n5lrsd431391dyhvshc"; - name = "klickety-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/klickety-21.12.3.tar.xz"; + sha256 = "03liv3fax764ngfkwp3ga96irn8qb509b08ljnhz5aw5v9yrssnk"; + name = "klickety-21.12.3.tar.xz"; }; }; klines = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/klines-21.12.2.tar.xz"; - sha256 = "1r004rsy98lxh5vd3r4bc0l4d7ymija13barg9xglj53xzbyij3k"; - name = "klines-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/klines-21.12.3.tar.xz"; + sha256 = "1ypi64wdsw1zsj03wcxj02v27y1by113v89as8dyk9wr0pfmbpqf"; + name = "klines-21.12.3.tar.xz"; }; }; kmag = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmag-21.12.2.tar.xz"; - sha256 = "03kzahsr80wnbx6ky112ka3zm01pnc5h85l28a4186617swx344l"; - name = "kmag-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmag-21.12.3.tar.xz"; + sha256 = "067x65gmip89rdgii2nwnxn7zi96cf7vfbhqzg0499pd2d69p3sl"; + name = "kmag-21.12.3.tar.xz"; }; }; kmahjongg = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmahjongg-21.12.2.tar.xz"; - sha256 = "1w8v6fchrkvsbyvnx8vvs801cvg52pr78ihvdjv6c0vpd0q7z9rz"; - name = "kmahjongg-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmahjongg-21.12.3.tar.xz"; + sha256 = "02yvvpwkk5gbj445zv5xhfragk8220rlx0pkxf32pj0jsv7dnz1x"; + name = "kmahjongg-21.12.3.tar.xz"; }; }; kmail = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmail-21.12.2.tar.xz"; - sha256 = "003bnp00figa09qcp2hl45sivdk3d0j3amxdidyrn47q9vy40554"; - name = "kmail-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmail-21.12.3.tar.xz"; + sha256 = "1knh6cf72hidc6jyiw250b708b410fla0c5w83zaavmwv37ah8z0"; + name = "kmail-21.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmail-account-wizard-21.12.2.tar.xz"; - sha256 = "1nmg8qns3iglcc4l4g5nffnji1vgg43a9fa9rz1hacvlkarm98m4"; - name = "kmail-account-wizard-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmail-account-wizard-21.12.3.tar.xz"; + sha256 = "0ar2rm6viissfipbak07fxivrgqgsdfilsprsqmvab44inw2g4pg"; + name = "kmail-account-wizard-21.12.3.tar.xz"; }; }; kmailtransport = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmailtransport-21.12.2.tar.xz"; - sha256 = "0rs6qihzy8q2n204zkhakgnjxwqy9pz9i0kv1j3amw2xv3f51rvw"; - name = "kmailtransport-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmailtransport-21.12.3.tar.xz"; + sha256 = "0l3pgs781a6is937i0bkz9ykr40l36rwlrirsr4g8wh0gkc3ifi6"; + name = "kmailtransport-21.12.3.tar.xz"; }; }; kmbox = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmbox-21.12.2.tar.xz"; - sha256 = "1mfwaw4d480kbb60wb0kvl5z35ly2hn6h73kx9wdb5y7mz05rvn1"; - name = "kmbox-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmbox-21.12.3.tar.xz"; + sha256 = "04cl2khj3a7n81nlmxsg8kgszrl22qm6s2kvbrhz39yfzi31cwqr"; + name = "kmbox-21.12.3.tar.xz"; }; }; kmime = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmime-21.12.2.tar.xz"; - sha256 = "0qxb0gf4pqfa0540fsbnf24nh9qwiamwl65q7vaanb80b211qp2g"; - name = "kmime-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmime-21.12.3.tar.xz"; + sha256 = "03s7l4lywdvp97h4qjgq06qqcclvnhy83qsrfzv0w2wcl631nnpw"; + name = "kmime-21.12.3.tar.xz"; }; }; kmines = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmines-21.12.2.tar.xz"; - sha256 = "0dsqlqmbaggab38zzjyhnx318sn2mw6y51k52c7blm2l53a8zp3j"; - name = "kmines-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmines-21.12.3.tar.xz"; + sha256 = "1wxy0cyz733wvnxfjhirqf41wnda4f6aqdiqmb5r1ngzzllgbglc"; + name = "kmines-21.12.3.tar.xz"; }; }; kmix = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmix-21.12.2.tar.xz"; - sha256 = "0fyjzzv6x9xf0g222jjsvrywnm3blhbzm2zwhxagrfkjvjpb2cvk"; - name = "kmix-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmix-21.12.3.tar.xz"; + sha256 = "1zk2xljis1pv3m4vs5zr6wza6iv5y6wmh1csx3rn8ylfkrpk7h8k"; + name = "kmix-21.12.3.tar.xz"; }; }; kmousetool = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmousetool-21.12.2.tar.xz"; - sha256 = "1hh7sql04hpwvb8hbi7snvh2d6922a2yraah9hd1jiwniv3cv175"; - name = "kmousetool-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmousetool-21.12.3.tar.xz"; + sha256 = "013qr1md3gbin7hcahnv14y9i2cg35r433s2w81fvgcakd38qvkj"; + name = "kmousetool-21.12.3.tar.xz"; }; }; kmouth = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmouth-21.12.2.tar.xz"; - sha256 = "0vxssxchh23bl237qw9pznbrkwyqx1bhbnp2fq9baw1bn88d18i5"; - name = "kmouth-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmouth-21.12.3.tar.xz"; + sha256 = "0xvkp2pm2szbgzdsfmwrykma8npmlwmx2pb1iakbx3x1wyyjsbim"; + name = "kmouth-21.12.3.tar.xz"; }; }; kmplot = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kmplot-21.12.2.tar.xz"; - sha256 = "025n51s7i5nr63knsd78pg48wfs4cldhplr68jmwv2k8pb5w9kxs"; - name = "kmplot-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kmplot-21.12.3.tar.xz"; + sha256 = "1vmrzfcdyaxgvyp9la2gvy3h5fhksmn24lsnrpvr6alj880mh8bq"; + name = "kmplot-21.12.3.tar.xz"; }; }; knavalbattle = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/knavalbattle-21.12.2.tar.xz"; - sha256 = "1z1qqr5jjinm49p7rhr0pzf8ir2nvdq157zqxnnr6i11xqk2mnkj"; - name = "knavalbattle-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/knavalbattle-21.12.3.tar.xz"; + sha256 = "1mpj1783za6b7a7cjawy4v0z24dvcd34gdb25qch4gi9cx1lc28z"; + name = "knavalbattle-21.12.3.tar.xz"; }; }; knetwalk = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/knetwalk-21.12.2.tar.xz"; - sha256 = "1gnir7h1iam51frdajp4h6xw4biz545nljdfcck17jiw6ad9py4j"; - name = "knetwalk-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/knetwalk-21.12.3.tar.xz"; + sha256 = "0ahms3imvkdknp1z2h6j42k9g1i20ygd2633icjv37d2cbij128m"; + name = "knetwalk-21.12.3.tar.xz"; }; }; knights = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/knights-21.12.2.tar.xz"; - sha256 = "0k9hqgz3zw7vhrgbwnmy0v3j9kflz6wx8wavckg1i2l4qadprc1y"; - name = "knights-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/knights-21.12.3.tar.xz"; + sha256 = "1m2big16rdw3w347m5vi0qhypnb2rgz6804kkxs7ln0yx658y4x4"; + name = "knights-21.12.3.tar.xz"; }; }; knotes = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/knotes-21.12.2.tar.xz"; - sha256 = "0f8ra6nkgndgkfnw194y5976kkrm7qdj1w7l27znwalzaydnxvjg"; - name = "knotes-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/knotes-21.12.3.tar.xz"; + sha256 = "07pj0aqwsy1xi5mx7x0h3zmxfg0n4afgjax9a9ihc553xs6k48d7"; + name = "knotes-21.12.3.tar.xz"; }; }; kolf = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kolf-21.12.2.tar.xz"; - sha256 = "0as18rc45daak3xsmwn6k789yni46nsdkv83bfmbj3jcjhzv9x5k"; - name = "kolf-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kolf-21.12.3.tar.xz"; + sha256 = "00dhjy82d9964z94nn4vkkwynql3bfa6djwrgsq93f9d7grgkd7g"; + name = "kolf-21.12.3.tar.xz"; }; }; kollision = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kollision-21.12.2.tar.xz"; - sha256 = "1ycim9gjn9p6w6yyzsipqn7zpvi946s287mp4br35zavsf25gzn0"; - name = "kollision-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kollision-21.12.3.tar.xz"; + sha256 = "0avin6s1lglfps6qlvz19i27nb0x0hgrl4q2brpq4kax7azs1nc3"; + name = "kollision-21.12.3.tar.xz"; }; }; kolourpaint = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kolourpaint-21.12.2.tar.xz"; - sha256 = "0z53hp31sq4ksarvpzqmx9f3gac8ygrcj0ncppgbwwjkq63wr6v1"; - name = "kolourpaint-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kolourpaint-21.12.3.tar.xz"; + sha256 = "0kbz8jz33bk4zr7kk6mb1y42mdq6nykdfqm2cs08sxldd3nrs6fj"; + name = "kolourpaint-21.12.3.tar.xz"; }; }; kompare = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kompare-21.12.2.tar.xz"; - sha256 = "0ps6ng77kzcqf6b2sh8xmqh5d4jwkmj3qnbyxh4v4xxjbwy0mrwm"; - name = "kompare-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kompare-21.12.3.tar.xz"; + sha256 = "097aawmziplsndj42bdjf3x3smal1fy67c2y7cik9p1qw9wgn24h"; + name = "kompare-21.12.3.tar.xz"; }; }; konqueror = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/konqueror-21.12.2.tar.xz"; - sha256 = "0ia8qqas9x261ixa6jzih273ypqhdv5hijk042bcdmqd1z1s4n55"; - name = "konqueror-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/konqueror-21.12.3.tar.xz"; + sha256 = "0z3zq71n0lnpx5ggfg835zbmgf2ly4zsmz01yyyxn9n9d9b6d3px"; + name = "konqueror-21.12.3.tar.xz"; }; }; konquest = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/konquest-21.12.2.tar.xz"; - sha256 = "1arxp4x8pcmv8yqg1xy5b23avh5a7x660vvh6kaviimysad5wmc5"; - name = "konquest-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/konquest-21.12.3.tar.xz"; + sha256 = "0lrahq9s70rx24dw4cgpvchr4s6pcl565vh343ggg24s1rd3ly80"; + name = "konquest-21.12.3.tar.xz"; }; }; konsole = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/konsole-21.12.2.tar.xz"; - sha256 = "00gyzhcacd3467sv5ijihqva7pnvcy1chywfpy8qh2hcdkkvyfxa"; - name = "konsole-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/konsole-21.12.3.tar.xz"; + sha256 = "06sqm2xmairicrdcxnf7imvyvw0wyknrrym334scx2w7mfhjg5qs"; + name = "konsole-21.12.3.tar.xz"; }; }; kontact = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kontact-21.12.2.tar.xz"; - sha256 = "16ld08sx5lvrm9r0ync7r8bpd540gxsssvhxj5p43chq6b9hr5lm"; - name = "kontact-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kontact-21.12.3.tar.xz"; + sha256 = "16p17b4llral0g48l3s9yg838x6hhc4dprlcpd00b8sy58c27f90"; + name = "kontact-21.12.3.tar.xz"; }; }; kontactinterface = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kontactinterface-21.12.2.tar.xz"; - sha256 = "1qvjm27v797hcdqbr6jwdkwn3vpsy3f1i92slrwks03zj498ydlj"; - name = "kontactinterface-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kontactinterface-21.12.3.tar.xz"; + sha256 = "1qwx0q4bbk3d720ij37wbd54g9alw6ispjl1mq19hkk3gs5l1c78"; + name = "kontactinterface-21.12.3.tar.xz"; }; }; kontrast = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kontrast-21.12.2.tar.xz"; - sha256 = "0mk2i2x1yz0ykbnqvdbdpi9kplyzjxlwhhsvl4rbq0726g3q6pas"; - name = "kontrast-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kontrast-21.12.3.tar.xz"; + sha256 = "1rp279mfq18p5kzw3788m8w6kkj8w7zfdv97rnl3n5jir4j94yxl"; + name = "kontrast-21.12.3.tar.xz"; }; }; konversation = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/konversation-21.12.2.tar.xz"; - sha256 = "0lpkah6z12c4f77z6r5z31q5np3xwyb3y6xnsv1iq1rdzj0daxch"; - name = "konversation-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/konversation-21.12.3.tar.xz"; + sha256 = "05dxzkpadz29b5fm6pf225xqq0gaz9w50paz9341kzz4k3rnzq80"; + name = "konversation-21.12.3.tar.xz"; }; }; kopeninghours = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kopeninghours-21.12.2.tar.xz"; - sha256 = "1s4wcnk7p0vjqdhyf8131l3s6bn86gfkwl45zwpi7lpyacwgdf6k"; - name = "kopeninghours-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kopeninghours-21.12.3.tar.xz"; + sha256 = "0pfkrns576ll6wc33c8i6pgzd9wf543w2isbvh393zyb1rr3bzgd"; + name = "kopeninghours-21.12.3.tar.xz"; }; }; kopete = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kopete-21.12.2.tar.xz"; - sha256 = "1py45nk6bv5x2hnfzh5srq17lprkqrmpqr2h0fpmkmffx66njz5q"; - name = "kopete-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kopete-21.12.3.tar.xz"; + sha256 = "1v519sw2lzlap6xci3j55k8c48755sc9p3mgvj566b6jjq64xi5k"; + name = "kopete-21.12.3.tar.xz"; }; }; korganizer = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/korganizer-21.12.2.tar.xz"; - sha256 = "1kablp0x65jmdz5n3y19rgplcvvmq8vxz0ljw7lkrwr3pvvhyv3q"; - name = "korganizer-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/korganizer-21.12.3.tar.xz"; + sha256 = "072pyzs38dv07mwi4hlfb4rh9jx40dpxac3ywy7kj6nyvbfjmh0r"; + name = "korganizer-21.12.3.tar.xz"; }; }; kosmindoormap = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kosmindoormap-21.12.2.tar.xz"; - sha256 = "0max3mfwd5x8m3kqybnkrb4v93rdk1r007xw31l52j2rq2gh8pj2"; - name = "kosmindoormap-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kosmindoormap-21.12.3.tar.xz"; + sha256 = "06i616c873lkkpy2iwdjcgwnm6adjrr6rcain2rrb1j4pgzmmbvw"; + name = "kosmindoormap-21.12.3.tar.xz"; }; }; kpat = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kpat-21.12.2.tar.xz"; - sha256 = "0vra8n9xsba67as0ybmbjy235v3s7dmrwlf18avnb3ygxy0h8swf"; - name = "kpat-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kpat-21.12.3.tar.xz"; + sha256 = "1jd9457hf15d2l6njkfyj9a7lfyabcm80vz3zjb2cykm16x3sdb8"; + name = "kpat-21.12.3.tar.xz"; }; }; kpimtextedit = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kpimtextedit-21.12.2.tar.xz"; - sha256 = "06d42k433dvkfrnzfdx0b1qarrnmhnb4gyq7vgy6251ah8smild8"; - name = "kpimtextedit-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kpimtextedit-21.12.3.tar.xz"; + sha256 = "19hrqbjcmpi81vmnggrkrv0fcc9inhz5aa5klx0141aylnzfgwsl"; + name = "kpimtextedit-21.12.3.tar.xz"; }; }; kpkpass = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kpkpass-21.12.2.tar.xz"; - sha256 = "0p2l1z4blfq1iz3x9cnwwx2p9cs6bb4vw1csj29s09i6237ippzx"; - name = "kpkpass-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kpkpass-21.12.3.tar.xz"; + sha256 = "05f88hlqxfak94jy8afiv91dgzxd9qgrkarnqi9rv1f5a3j7k3k7"; + name = "kpkpass-21.12.3.tar.xz"; }; }; kpmcore = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kpmcore-21.12.2.tar.xz"; - sha256 = "1iyirvf04br0r8vclcpx0qrlm8wgqm9ww6xds3h9qjyqj1w8ng41"; - name = "kpmcore-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kpmcore-21.12.3.tar.xz"; + sha256 = "19h0ag54xzv4hwh950hshjghd4fb9xkdg8rlx6lvqa0w9b8admva"; + name = "kpmcore-21.12.3.tar.xz"; }; }; kpublictransport = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kpublictransport-21.12.2.tar.xz"; - sha256 = "02ffpgki4mdyczxa5bqb9wmg2c6anwxnsmlfdn1k47ry7ny2k9sl"; - name = "kpublictransport-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kpublictransport-21.12.3.tar.xz"; + sha256 = "1jcba5bq320afzfs5ly3vyyicdix8fprpr02x67v8p7mdzg58cq6"; + name = "kpublictransport-21.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kqtquickcharts-21.12.2.tar.xz"; - sha256 = "1sjm1vaksvp73866w09xadd1d0lakh00fwiic498siws4dvhhpif"; - name = "kqtquickcharts-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kqtquickcharts-21.12.3.tar.xz"; + sha256 = "0gl9c8zfn440202l82y4nfng0hyhivby8a4hf91rphi8f1xfxxmr"; + name = "kqtquickcharts-21.12.3.tar.xz"; }; }; krdc = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/krdc-21.12.2.tar.xz"; - sha256 = "005i3a7l9aq63nxsivj28kzjy2zdl759snwm56cgwq9rgc6sc003"; - name = "krdc-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/krdc-21.12.3.tar.xz"; + sha256 = "09np9clvmdll7v2p9aswnlhz4cgsnly82za7k3k9fs66h5c8q20j"; + name = "krdc-21.12.3.tar.xz"; }; }; kreversi = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kreversi-21.12.2.tar.xz"; - sha256 = "03b4c28297dzdzplmg818r27r9gpqj48rha9884h22fz9davgmhw"; - name = "kreversi-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kreversi-21.12.3.tar.xz"; + sha256 = "0lbypkh6lc5af43c2p19gs2c53icxd26abxf5rhs2c8182gr39b8"; + name = "kreversi-21.12.3.tar.xz"; }; }; krfb = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/krfb-21.12.2.tar.xz"; - sha256 = "1989q0mig516hz0lbq2m8p85x8ikpyrhj36cvq4c32sd2nasxkvc"; - name = "krfb-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/krfb-21.12.3.tar.xz"; + sha256 = "1r8lvvh2z8xi0l3pizlpl12nm4fnbpgiwqmx18w8i51x4j27dv0n"; + name = "krfb-21.12.3.tar.xz"; }; }; kross-interpreters = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kross-interpreters-21.12.2.tar.xz"; - sha256 = "14j7z6lwl0j7zdz29c1kjyhw0my6qfgnyxibwn9z87paxl8nv6z0"; - name = "kross-interpreters-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kross-interpreters-21.12.3.tar.xz"; + sha256 = "0wyr3xwdkb2fiadzh5lhjli1g0mbxjw353q7k1vbi2wxg5b9042g"; + name = "kross-interpreters-21.12.3.tar.xz"; }; }; kruler = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kruler-21.12.2.tar.xz"; - sha256 = "1w5dw3qda69d4ycbiaj18gfn6w28dj2lc37x2d86kx5skv8adxbw"; - name = "kruler-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kruler-21.12.3.tar.xz"; + sha256 = "0jmb3a907jx0s80865lmd7in8ggdf30gdbgykpalzfrv7nkjamzr"; + name = "kruler-21.12.3.tar.xz"; }; }; kshisen = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kshisen-21.12.2.tar.xz"; - sha256 = "0wjr9fnkmbylfq13zy3hifr4byj4y46f8cwh0w61ypgc0wjxnhhg"; - name = "kshisen-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kshisen-21.12.3.tar.xz"; + sha256 = "1i11gh87gfza58rpdd44pjb423an9a44cls117ba9gznxm67cph5"; + name = "kshisen-21.12.3.tar.xz"; }; }; ksirk = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ksirk-21.12.2.tar.xz"; - sha256 = "1lif8n8n2pj4vaf7zifqj7mjv5dbhki75wbwjd4q061wpr434vfj"; - name = "ksirk-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ksirk-21.12.3.tar.xz"; + sha256 = "1ipnkg2mgj37g5s5ihlys176kn2c11f3d57xr9zhqf8fvkvrkfm0"; + name = "ksirk-21.12.3.tar.xz"; }; }; ksmtp = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ksmtp-21.12.2.tar.xz"; - sha256 = "0hg5g401map67kjcgrd1a07iwyss5jnryhpsajffwz19sra855jp"; - name = "ksmtp-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ksmtp-21.12.3.tar.xz"; + sha256 = "0kdy5gsg1sgccvdk1fpf866xl9m8v8z034jpgf6s7n2pr5r5mni2"; + name = "ksmtp-21.12.3.tar.xz"; }; }; ksnakeduel = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ksnakeduel-21.12.2.tar.xz"; - sha256 = "0rdbsyfd3bink5cb0k5l713jw4syhz82kchn95cbg5zgc2iclfw4"; - name = "ksnakeduel-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ksnakeduel-21.12.3.tar.xz"; + sha256 = "06rill73xhhxra7kmbvwwriv9vbi91641z334ry1m4rr1qm2cdd6"; + name = "ksnakeduel-21.12.3.tar.xz"; }; }; kspaceduel = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kspaceduel-21.12.2.tar.xz"; - sha256 = "1kmwn55a4555g5m21jcr88k3f9aj87yifgrab6sx6gcw5q51d7vz"; - name = "kspaceduel-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kspaceduel-21.12.3.tar.xz"; + sha256 = "0dv539jlpkj8hr4cz0ncqm3scg6ja3s41p37bpqd94zicfvzxw84"; + name = "kspaceduel-21.12.3.tar.xz"; }; }; ksquares = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ksquares-21.12.2.tar.xz"; - sha256 = "12k09lasxyaxq4bp4fhczj8bpi8l6h1gn4nj6ka3zbc4mxxz34yc"; - name = "ksquares-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ksquares-21.12.3.tar.xz"; + sha256 = "1wbrakq1wnwp558y140j9vbid3g0k332rwbilky7z11c0giiv76x"; + name = "ksquares-21.12.3.tar.xz"; }; }; ksudoku = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ksudoku-21.12.2.tar.xz"; - sha256 = "1din2i3d9lhca5kw06ivixgk2prh1kfy8ikm0byl8qaqj4v89lji"; - name = "ksudoku-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ksudoku-21.12.3.tar.xz"; + sha256 = "1gw0ybwhvg1z8pcs72f73y52jvzvrw367g275axf2rw50iik6jwv"; + name = "ksudoku-21.12.3.tar.xz"; }; }; ksystemlog = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ksystemlog-21.12.2.tar.xz"; - sha256 = "0cvx13859bm4kfz75iia3chzi5pbbv70lkmspvjpa6cpsn05zy53"; - name = "ksystemlog-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ksystemlog-21.12.3.tar.xz"; + sha256 = "0jkd0rx0xlzwsxa3s40sp5x4r19a9rg1x9klpnjfw0b326vgf2m9"; + name = "ksystemlog-21.12.3.tar.xz"; }; }; kteatime = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kteatime-21.12.2.tar.xz"; - sha256 = "1m7ni3w82lqykgs5qfi0a43p9973244k8lr6rk30x7w551rc7yyw"; - name = "kteatime-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kteatime-21.12.3.tar.xz"; + sha256 = "0i3ps1a8y8crmxf1631q4zjfa0zglqhq1rk6id5v2xx8f10rkh54"; + name = "kteatime-21.12.3.tar.xz"; }; }; ktimer = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktimer-21.12.2.tar.xz"; - sha256 = "0jprayxn54pw7brrcb1b70y5sal9j6pfpwrphd2nyw5rkb2a484l"; - name = "ktimer-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktimer-21.12.3.tar.xz"; + sha256 = "0s6zbygxnk69dciyz1iv1d6whfcv637licsd07n7fc8bsygqjl5p"; + name = "ktimer-21.12.3.tar.xz"; }; }; ktnef = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktnef-21.12.2.tar.xz"; - sha256 = "0cl589z0v6h1z3aszk4160y99gpihpk203rn73dmb7c6qsk11cbl"; - name = "ktnef-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktnef-21.12.3.tar.xz"; + sha256 = "1in991n8alkxf40p0wvkr7gdaaz8w4kdw1rsq6sbjil6cs4cr5nl"; + name = "ktnef-21.12.3.tar.xz"; }; }; ktorrent = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktorrent-21.12.2.tar.xz"; - sha256 = "1zwakqp5j2795j4pln4sq595bc2zlw8cy8qdzwj365clfbpcbyc3"; - name = "ktorrent-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktorrent-21.12.3.tar.xz"; + sha256 = "021x6qcbk4kdh5ay5mqmf92129s42j2rhrs0q350b0wcnpad55zd"; + name = "ktorrent-21.12.3.tar.xz"; }; }; ktouch = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktouch-21.12.2.tar.xz"; - sha256 = "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl"; - name = "ktouch-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktouch-21.12.3.tar.xz"; + sha256 = "0wi01gr85sxs4qhvnwkkp1230wnvz7gdr74zar03rc3wzwgv22nd"; + name = "ktouch-21.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-accounts-kcm-21.12.2.tar.xz"; - sha256 = "14niidb9kza6sms9rhhnvrba6rdwhc890b5inmlhdllnqbdrrcbl"; - name = "ktp-accounts-kcm-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-accounts-kcm-21.12.3.tar.xz"; + sha256 = "1ydsfiw67avgwswvpy85s3siggyi4w610yqz5dyl535i6my1kl5n"; + name = "ktp-accounts-kcm-21.12.3.tar.xz"; }; }; ktp-approver = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-approver-21.12.2.tar.xz"; - sha256 = "11scv978silxrprkyd66b4xkdww05xpgk8kvrknlwp33rmhm05sn"; - name = "ktp-approver-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-approver-21.12.3.tar.xz"; + sha256 = "0mvczpc0dy2m0dn25r2h2js3hw7s0qr8zl3syvqbyqqs51s59xnl"; + name = "ktp-approver-21.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-auth-handler-21.12.2.tar.xz"; - sha256 = "006an8bva8zawnirv3ai3kjb59ffgany124ip546r5wg06zkk069"; - name = "ktp-auth-handler-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-auth-handler-21.12.3.tar.xz"; + sha256 = "0lgg0ify9mbsd8has8ingkq3m0g91r9gvfq85s2xf90cwc1s429c"; + name = "ktp-auth-handler-21.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-call-ui-21.12.2.tar.xz"; - sha256 = "0n8yirlsig37839rl73azg8vf8ppdxlf1dqgkf5bz8g3jcs92gcm"; - name = "ktp-call-ui-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-call-ui-21.12.3.tar.xz"; + sha256 = "1npr8qbpxx25pm9mky9sd0qngc5wphmy5blvl6qy7nvs2rqszgam"; + name = "ktp-call-ui-21.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-common-internals-21.12.2.tar.xz"; - sha256 = "0c7kfrgf8bqm7q9hp9fd8q49vakiihzl0dgdklpvgly48zfa2yan"; - name = "ktp-common-internals-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-common-internals-21.12.3.tar.xz"; + sha256 = "0spr2gs5d561agvipkipwcxk2zjlhzvp6swdh8rcv23qr6igqjq6"; + name = "ktp-common-internals-21.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-contact-list-21.12.2.tar.xz"; - sha256 = "0pw5kl0lh0ph3y9hyws7h7phh475lw07gydxxjsfxsd4nb70hkz8"; - name = "ktp-contact-list-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-list-21.12.3.tar.xz"; + sha256 = "1qn3bmwl4kvm5ikbr0ycy2znm4c2yv4m5863d4vakr8xhhappamp"; + name = "ktp-contact-list-21.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-contact-runner-21.12.2.tar.xz"; - sha256 = "0as41gba7ra65i6ml8j8fqh70x165cnmp9ry13ijrdf9vx21a45k"; - name = "ktp-contact-runner-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-runner-21.12.3.tar.xz"; + sha256 = "0bwi0j733jnwiqlxv8nik1whdvk4aggfayy2bcwwpj5zdzr3mbga"; + name = "ktp-contact-runner-21.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-desktop-applets-21.12.2.tar.xz"; - sha256 = "0675hlcjq6xyzl1sz3a45inc3g69z5ilxyhhicxns8by3ydmb82x"; - name = "ktp-desktop-applets-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-desktop-applets-21.12.3.tar.xz"; + sha256 = "01h26jsdb7mkw8isxpy4sfpdn11q209xqhhpnk7xvchs8fpl5fni"; + name = "ktp-desktop-applets-21.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-filetransfer-handler-21.12.2.tar.xz"; - sha256 = "1cw2y06zcdfm9vixw99gbipgkl63vpkf73giq5ibal2g2yq9c2r5"; - name = "ktp-filetransfer-handler-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-filetransfer-handler-21.12.3.tar.xz"; + sha256 = "0aq5ii7b2kk0qan4qph9glapp81sgqm2zzbdknggxz7vkhj5y6lk"; + name = "ktp-filetransfer-handler-21.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-kded-module-21.12.2.tar.xz"; - sha256 = "1mwmdnr2c6ilhhjlq8bwd7gwvjmiq1k3lph5vlb5hy8nrp9x2p1r"; - name = "ktp-kded-module-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-kded-module-21.12.3.tar.xz"; + sha256 = "0921lahpqjx094ngk68pphkv306ajgxbp6yb0hkckmlic4f2hm37"; + name = "ktp-kded-module-21.12.3.tar.xz"; }; }; ktp-send-file = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-send-file-21.12.2.tar.xz"; - sha256 = "0083z5al3jgl1szmzddzkjln9ci37906mmnrcy9f0yxfq5v2gr44"; - name = "ktp-send-file-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-send-file-21.12.3.tar.xz"; + sha256 = "0vvg0qz2zxckqqwfibsl88w0mpa7a0lzskwhzbvzir03x14rwjlc"; + name = "ktp-send-file-21.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktp-text-ui-21.12.2.tar.xz"; - sha256 = "0lhbsmhp23sil3rckk51156qhz15hjyp943mgh4s3w49lwxgjpc8"; - name = "ktp-text-ui-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktp-text-ui-21.12.3.tar.xz"; + sha256 = "046611abkdn7qqh6n4v8ssdzg10q4g14rji7klypmccfng0px2xg"; + name = "ktp-text-ui-21.12.3.tar.xz"; }; }; ktuberling = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/ktuberling-21.12.2.tar.xz"; - sha256 = "0w9gx0i895vd0gi8wgd6hqikqjz5ir4li14i15k4akc7i7niy46r"; - name = "ktuberling-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/ktuberling-21.12.3.tar.xz"; + sha256 = "1awsn285j9nggyypkra9ladgi46w2m7m09d8364w5d0sygpzmgsg"; + name = "ktuberling-21.12.3.tar.xz"; }; }; kturtle = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kturtle-21.12.2.tar.xz"; - sha256 = "0xkl12albs66vnsbilkwpnw5qaqx2ss8wldsnigmf0x5d5hd554k"; - name = "kturtle-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kturtle-21.12.3.tar.xz"; + sha256 = "1689skwk2dwm4mrl2mrakb1cn74nyxd6xa8ipxsip5zhjgkkvg23"; + name = "kturtle-21.12.3.tar.xz"; }; }; kubrick = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kubrick-21.12.2.tar.xz"; - sha256 = "1sd8biyndnc7y4d3zsy4bmi409js9viyd4q5ql6fd2wcz656y1im"; - name = "kubrick-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kubrick-21.12.3.tar.xz"; + sha256 = "0hx81cp1lql74c9067dw7mi78c6sp6p1a035j2nzjn9drpxal6p2"; + name = "kubrick-21.12.3.tar.xz"; }; }; kwalletmanager = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kwalletmanager-21.12.2.tar.xz"; - sha256 = "0d2ma7dzn0nc25fj7lwaysfjfgqfl5nsisc01lp42n9k1bg0s0i5"; - name = "kwalletmanager-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kwalletmanager-21.12.3.tar.xz"; + sha256 = "01xif44iz1ik32swlrzzjycizy4hjlis1f336qc9p7affjyv2797"; + name = "kwalletmanager-21.12.3.tar.xz"; }; }; kwave = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kwave-21.12.2.tar.xz"; - sha256 = "01bjsm3aj7m1mq3nr6iwmcxswq8sxdxhhdyc5zlgffifpym53dc5"; - name = "kwave-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kwave-21.12.3.tar.xz"; + sha256 = "07xbbii5gpllbpmkxfv5kwxawd390zp0angh94xjk0yq71lvdav2"; + name = "kwave-21.12.3.tar.xz"; }; }; kwordquiz = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/kwordquiz-21.12.2.tar.xz"; - sha256 = "1na113adrd9djxk016riz3ajwrn9rbpc0ib34adfvp6nw48d9snp"; - name = "kwordquiz-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/kwordquiz-21.12.3.tar.xz"; + sha256 = "1p06ki75zy4il6k9siavqddpr9j02z3lbnd14pxwk42fhfmbx057"; + name = "kwordquiz-21.12.3.tar.xz"; }; }; libgravatar = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libgravatar-21.12.2.tar.xz"; - sha256 = "0xj3v0cknkvr8ac5iipxpz1azr0hk42zgaaip5ivn7qjfhp0zvv0"; - name = "libgravatar-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libgravatar-21.12.3.tar.xz"; + sha256 = "1bihy3dfagwc7aday40myqjbn555mkzzaaq7c14ywkmhh99dhvh7"; + name = "libgravatar-21.12.3.tar.xz"; }; }; libkcddb = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkcddb-21.12.2.tar.xz"; - sha256 = "07bcbmf3z5l0v5b6ra1h36yvbjpim1kzz1npd2h30iq09ibx6dr8"; - name = "libkcddb-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkcddb-21.12.3.tar.xz"; + sha256 = "14f1mzsfm0vyqzsyja0p8ln1105sw5dr6fssj25j0qw4rnf9yw32"; + name = "libkcddb-21.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkcompactdisc-21.12.2.tar.xz"; - sha256 = "08abnybd0fa0vvpaixi18ljfz0s8a5pmbblzpcc8rvwzdjc7az6q"; - name = "libkcompactdisc-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkcompactdisc-21.12.3.tar.xz"; + sha256 = "1vmaf3b41sj0sm4k9zdliy5ba4ps5z0cwabggfish152wzw34kgn"; + name = "libkcompactdisc-21.12.3.tar.xz"; }; }; libkdcraw = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkdcraw-21.12.2.tar.xz"; - sha256 = "0mzq0nha7mq5v3lb03xbspc0y2a7mg1mzlwbp3706ph6jp4m7mwa"; - name = "libkdcraw-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkdcraw-21.12.3.tar.xz"; + sha256 = "1pyqsaaficwxbg6hk8xg8srq79i6xdxvghkn2rf54zj1435d9kva"; + name = "libkdcraw-21.12.3.tar.xz"; }; }; libkdegames = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkdegames-21.12.2.tar.xz"; - sha256 = "1m1qz59fb82bsj9ri3b8a1ph2ihgs97wlqq91pbgqw0kgvyvka1j"; - name = "libkdegames-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkdegames-21.12.3.tar.xz"; + sha256 = "0x5mw25c8hmnxhcxc2xm19xmgdxfbx89nrxfl6mzfrh8myr3ybsb"; + name = "libkdegames-21.12.3.tar.xz"; }; }; libkdepim = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkdepim-21.12.2.tar.xz"; - sha256 = "0qqz9b17fz3kgh3gcyq30ds8fq7zkm14k85g4mywsn3lnn8bj6z9"; - name = "libkdepim-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkdepim-21.12.3.tar.xz"; + sha256 = "0g9jx6z5jf9yqn01xc1k038b4ljr9sil7bwvifc64s38qxl9wmww"; + name = "libkdepim-21.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkeduvocdocument-21.12.2.tar.xz"; - sha256 = "16vh1bycq92bh47phv7nk62r5vjaiv1p8fvq5p5idsz9ipzb1wzp"; - name = "libkeduvocdocument-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkeduvocdocument-21.12.3.tar.xz"; + sha256 = "16kk7ij2qxy5abgv9hgk1ycbx0f2gnpc9lxqbhl5sq9vxd4nblv0"; + name = "libkeduvocdocument-21.12.3.tar.xz"; }; }; libkexiv2 = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkexiv2-21.12.2.tar.xz"; - sha256 = "1j1p1pw2l32q7lk8kp6r0nz9mzjdw6mxr2gi0p770k3k0arrsg87"; - name = "libkexiv2-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkexiv2-21.12.3.tar.xz"; + sha256 = "0r2m6d9rw0r6rm6xqpj1i3w0hplhivy8h90zggqynfzvfyr9c529"; + name = "libkexiv2-21.12.3.tar.xz"; }; }; libkgapi = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkgapi-21.12.2.tar.xz"; - sha256 = "0n6x0vdirv5qbi9qmd8956i307dz0lp80bw5cqxgk4gr4f8hzi8w"; - name = "libkgapi-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkgapi-21.12.3.tar.xz"; + sha256 = "1vbk8786mk1irm94bsm97270gnd149nz7w0zqnvwz499f72d21jx"; + name = "libkgapi-21.12.3.tar.xz"; }; }; libkipi = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkipi-21.12.2.tar.xz"; - sha256 = "0zlga9gy45cs3icx56gvq2nab7i3z5ydrmisa46vpca63w8swmys"; - name = "libkipi-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkipi-21.12.3.tar.xz"; + sha256 = "0w2kwi6djwp8mhmpfrr16v8fgmwjmsc89rcwpfhgii1p68xia8gc"; + name = "libkipi-21.12.3.tar.xz"; }; }; libkleo = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkleo-21.12.2.tar.xz"; - sha256 = "0vqgycmj2v91car7ckksnjxbq3b5nzk31p4x3577dgck9jmi30zd"; - name = "libkleo-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkleo-21.12.3.tar.xz"; + sha256 = "19q128ldi0aspy7vc03r54vrf7wz7l1181x9pbmax8340nbnaz7l"; + name = "libkleo-21.12.3.tar.xz"; }; }; libkmahjongg = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkmahjongg-21.12.2.tar.xz"; - sha256 = "10fgk8nhcr3rbdnh8az46jvl6w6xankdxzw4djj3qs4dpkl52vk4"; - name = "libkmahjongg-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkmahjongg-21.12.3.tar.xz"; + sha256 = "114viyqq7zlwsdnm96iyyvj8ma4p06m69hs641yv42xlbkspwbal"; + name = "libkmahjongg-21.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libkomparediff2-21.12.2.tar.xz"; - sha256 = "07yzzc6ns1yx92gpcvhnxw0xna6ly1j4l4lx1rbw3d94z796694z"; - name = "libkomparediff2-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libkomparediff2-21.12.3.tar.xz"; + sha256 = "1j93lf9adyw581a9i8kc1pj6vadscibw49wvwfs750f0kxn5p0d2"; + name = "libkomparediff2-21.12.3.tar.xz"; }; }; libksane = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libksane-21.12.2.tar.xz"; - sha256 = "1iksfjwkibn1i8n541nngalrp8krc94qy9in801q10d291clwz9i"; - name = "libksane-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libksane-21.12.3.tar.xz"; + sha256 = "0ci2284ysh4q8sbhqcg5bis2v02bp5x64h8n0qik14yy24x852zg"; + name = "libksane-21.12.3.tar.xz"; }; }; libksieve = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libksieve-21.12.2.tar.xz"; - sha256 = "03aaqqb5g9iv49crrf7zbmsri8jjszn5wfvmcw559swalmmyzb4i"; - name = "libksieve-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libksieve-21.12.3.tar.xz"; + sha256 = "1li9cc5y6xbn4m4qa21qmsjd4xzshp67mxwh2nvr17mfs8ray7vd"; + name = "libksieve-21.12.3.tar.xz"; }; }; libktorrent = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/libktorrent-21.12.2.tar.xz"; - sha256 = "06ak3bsy5x6a0r3l9hbfih9m41y3l357rpd42x8qp08djbs11xbf"; - name = "libktorrent-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/libktorrent-21.12.3.tar.xz"; + sha256 = "0i976al9bsc3gbplqbxkxr03sdhxv3yzjlfkdaghga8fkihzkkl0"; + name = "libktorrent-21.12.3.tar.xz"; }; }; lokalize = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/lokalize-21.12.2.tar.xz"; - sha256 = "1x6sb1fw0fqvk3vg299xvih1v2xm9hviv5h1b624maasw071nfyy"; - name = "lokalize-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/lokalize-21.12.3.tar.xz"; + sha256 = "1gzfiajy377kx0iar85z72zqxh7y9vhp1hs03zzqymazawm9lqnn"; + name = "lokalize-21.12.3.tar.xz"; }; }; lskat = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/lskat-21.12.2.tar.xz"; - sha256 = "0v16rg6d2l41xgkrkj8ibh5a0zjyb4jn7am6rbgl6k9g9mfqwdx7"; - name = "lskat-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/lskat-21.12.3.tar.xz"; + sha256 = "1cfs1lfwgxwpn2g56y7jb2c6ijd81bi8ba8ap0yyx6nhv6na072b"; + name = "lskat-21.12.3.tar.xz"; }; }; mailcommon = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/mailcommon-21.12.2.tar.xz"; - sha256 = "01kirl4lk1xq7y474438jv0av3ccg18krlchllcigd9c0vcp67qj"; - name = "mailcommon-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/mailcommon-21.12.3.tar.xz"; + sha256 = "1zi8zkhv9g4vsylqzjm2wr9v6b20irfxhf4q467cmpqqrqpcp3af"; + name = "mailcommon-21.12.3.tar.xz"; }; }; mailimporter = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/mailimporter-21.12.2.tar.xz"; - sha256 = "1ng8w4byq4iiwfzh4acl2glndlr7r9hr62qpj10kpn4fi0qblakb"; - name = "mailimporter-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/mailimporter-21.12.3.tar.xz"; + sha256 = "0lcr9zzdf16f82spr9x33jnzr23sx7xk2zvfpzdki3b5jxvapnsk"; + name = "mailimporter-21.12.3.tar.xz"; }; }; marble = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/marble-21.12.2.tar.xz"; - sha256 = "093drig77dyxwfavx30h2nzdqkn52h6pjn54j7fnwygz4742qv7n"; - name = "marble-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/marble-21.12.3.tar.xz"; + sha256 = "0v6qd9cl6g8k55mjq2lswsfcxzf88w33nlm1193ps3ac0awjaaa4"; + name = "marble-21.12.3.tar.xz"; }; }; markdownpart = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/markdownpart-21.12.2.tar.xz"; - sha256 = "0g7j15s15blqr0lfagmhvxxggdplvmnkf8g2b9ysjkrr49lgk7b6"; - name = "markdownpart-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/markdownpart-21.12.3.tar.xz"; + sha256 = "1drvjrvmd2c36xj3x7kxb7lvk23cmaw8mi976pdfnxn5pdamv6wl"; + name = "markdownpart-21.12.3.tar.xz"; }; }; mbox-importer = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/mbox-importer-21.12.2.tar.xz"; - sha256 = "0qakmg86978zjm2m98602zbaiyiryrmlx2vk93yyv5xg352gphjb"; - name = "mbox-importer-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/mbox-importer-21.12.3.tar.xz"; + sha256 = "01bh0yzv23vkicc7lj217rp8c36kyyjlxmkwylss3hakr4b3afan"; + name = "mbox-importer-21.12.3.tar.xz"; }; }; messagelib = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/messagelib-21.12.2.tar.xz"; - sha256 = "0ln473gdwsscjpsh50h2cbazxbc8qy1mmll9lsfngfw1qq49dwsp"; - name = "messagelib-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/messagelib-21.12.3.tar.xz"; + sha256 = "0xrhnkahqirsz37lbvx505ll7bfhr25lbq89yqq81bxbzkbvamsw"; + name = "messagelib-21.12.3.tar.xz"; }; }; minuet = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/minuet-21.12.2.tar.xz"; - sha256 = "050pmw3srfb800h91x6pqn1vz7s6458w94r2innwc1j04pr8jaxv"; - name = "minuet-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/minuet-21.12.3.tar.xz"; + sha256 = "0r68z3j0j2gbwzj77wvsx1idrfkagj0pjai9j7fbqa0r6q833flr"; + name = "minuet-21.12.3.tar.xz"; }; }; okular = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/okular-21.12.2.tar.xz"; - sha256 = "1k0bwyhk73gshc7f0j6mply2m9ykfd07mhkxwnzj874sby5rxhv9"; - name = "okular-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/okular-21.12.3.tar.xz"; + sha256 = "054rzdqsqkjx2sncyfcnfdvm9bp45sdw3rycmpzicnwpn5j4hcb3"; + name = "okular-21.12.3.tar.xz"; }; }; palapeli = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/palapeli-21.12.2.tar.xz"; - sha256 = "0v5456hm56c7f9d49l5zjql6f4ap72wmkf8in8s95lqmpn42dl17"; - name = "palapeli-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/palapeli-21.12.3.tar.xz"; + sha256 = "076igql89sx55hfxjb79248ih4cjbkr1s1jnz46y3dk793rscm8g"; + name = "palapeli-21.12.3.tar.xz"; }; }; parley = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/parley-21.12.2.tar.xz"; - sha256 = "1cwnlv57yqjm52i0jwl33pz4h9h448h0ljrg598ghby8p3b2i5w7"; - name = "parley-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/parley-21.12.3.tar.xz"; + sha256 = "10hv885l0gz5aymf72f42bhkncfarj768nb12q9fxqk4x5rviiw0"; + name = "parley-21.12.3.tar.xz"; }; }; partitionmanager = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/partitionmanager-21.12.2.tar.xz"; - sha256 = "0rr7ic2ivm7lp3lj20b8rfbx1sr91s24fzxfzfwnw9znl9vj410q"; - name = "partitionmanager-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/partitionmanager-21.12.3.tar.xz"; + sha256 = "0x0k3vsbngcb7kvcgqj2w025fn9xvfd2232lx51xfar5r3jb7h1p"; + name = "partitionmanager-21.12.3.tar.xz"; }; }; picmi = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/picmi-21.12.2.tar.xz"; - sha256 = "0qp8b1di3qnv4xrnpcmyi6myrrwzdlijhvxmacx4ijv7b7wlg4r7"; - name = "picmi-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/picmi-21.12.3.tar.xz"; + sha256 = "0gk1yq5ac55k6lxbxszxpd393fb9k6yphisb71lx2zv9gchl44n6"; + name = "picmi-21.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/pim-data-exporter-21.12.2.tar.xz"; - sha256 = "0m4dq3x5kbncnvixjigb85j6siws6q600piw53qabiwd6w6rp1xy"; - name = "pim-data-exporter-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/pim-data-exporter-21.12.3.tar.xz"; + sha256 = "0qcwsbb4zsjgc15fhq9pp341wwm35y9v1lq8gnpjdsvfq2pczq5q"; + name = "pim-data-exporter-21.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/pim-sieve-editor-21.12.2.tar.xz"; - sha256 = "1cpazs6q6hv15ib6isif5syvpywxfdi7d3w8vc4pnfj94wkcq3gm"; - name = "pim-sieve-editor-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/pim-sieve-editor-21.12.3.tar.xz"; + sha256 = "1gp4gpagv6pfiy6gyfh14z1rb16iqm1npmngw6ybjlhh6d424n90"; + name = "pim-sieve-editor-21.12.3.tar.xz"; }; }; pimcommon = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/pimcommon-21.12.2.tar.xz"; - sha256 = "1pnhjhnjx98wdc3dg71qgjjj3dsncl56d86cagkk2spicv901p69"; - name = "pimcommon-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/pimcommon-21.12.3.tar.xz"; + sha256 = "1k1d100lr277lgwyzn2ssxsx9x2yd9nfd5657r95vmdnkh2qs517"; + name = "pimcommon-21.12.3.tar.xz"; }; }; poxml = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/poxml-21.12.2.tar.xz"; - sha256 = "1zzw9jwwd5nx12ma2ihffj6nhr3zlpahnj8k0r8mxcyn99j51kyn"; - name = "poxml-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/poxml-21.12.3.tar.xz"; + sha256 = "19hrb75fbh102fw8ajflj4777s7hq7vxv6kbwjir6wzsvdfanwdb"; + name = "poxml-21.12.3.tar.xz"; }; }; print-manager = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/print-manager-21.12.2.tar.xz"; - sha256 = "0xqv7f9p27maa0p20nc92g6240qkcin9s3dldr5b5q944hkkxizq"; - name = "print-manager-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/print-manager-21.12.3.tar.xz"; + sha256 = "1q9vv5v9hivm583hcx8qa7xik9yv4zicrd02abcsn6hvgwmdav8b"; + name = "print-manager-21.12.3.tar.xz"; }; }; rocs = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/rocs-21.12.2.tar.xz"; - sha256 = "1mjrgh0vfc1kvici5m1dx23s1c7qpvfx1br91yglgll1biajzqlq"; - name = "rocs-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/rocs-21.12.3.tar.xz"; + sha256 = "1fgjap71qnaydar9q155is7vwjlkpa8wi1162dsqxr5ywy464wrg"; + name = "rocs-21.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/signon-kwallet-extension-21.12.2.tar.xz"; - sha256 = "0qfim8ahklwkixpxcm9sj1w49cmb0wz5r8np6ga3r2rh4vlqdxbf"; - name = "signon-kwallet-extension-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/signon-kwallet-extension-21.12.3.tar.xz"; + sha256 = "0sv0g50bxxd442ia7wzk2lkqwr8lsjxk5wm3zsskxhql851y0ybm"; + name = "signon-kwallet-extension-21.12.3.tar.xz"; }; }; skanlite = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/skanlite-21.12.2.tar.xz"; - sha256 = "1fvdrzyvps0iqb9irnpdn81gmlmfhgfsfb5mg4i259sms6rq3h8m"; - name = "skanlite-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/skanlite-21.12.3.tar.xz"; + sha256 = "06dwmdjrss7cqqigg4rwsy5dya35577qwdaxj2jbvs2pkzp9rq3p"; + name = "skanlite-21.12.3.tar.xz"; }; }; spectacle = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/spectacle-21.12.2.tar.xz"; - sha256 = "1966ynfdkaya1iydi2hfmcr13adk7agjr9ndz2hjrwgjagd29pyr"; - name = "spectacle-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/spectacle-21.12.3.tar.xz"; + sha256 = "155xin26lkjr0swb281afha906nqy2821lf2spmzzxa3xalzq3sv"; + name = "spectacle-21.12.3.tar.xz"; }; }; step = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/step-21.12.2.tar.xz"; - sha256 = "1paq5wpya82s92zwacwbjf96nj52gy1sydk0gndyqi8jdplhlnps"; - name = "step-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/step-21.12.3.tar.xz"; + sha256 = "0j3w63bxj3b4lrfb0mnchlvsr987v5zwwjw5jrgvqidrhv1rh7dc"; + name = "step-21.12.3.tar.xz"; }; }; svgpart = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/svgpart-21.12.2.tar.xz"; - sha256 = "15624gfcn85xkh6lypkw73iidnclprhqhpxrjggbng1x22jg2iwc"; - name = "svgpart-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/svgpart-21.12.3.tar.xz"; + sha256 = "0yg8sn1z9zfb7a6y61nw7vya516sfaydkgxh7cfwiz7sljl87z8j"; + name = "svgpart-21.12.3.tar.xz"; }; }; sweeper = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/sweeper-21.12.2.tar.xz"; - sha256 = "07rqshzjjzqgmm5z0fn1hjd09prcwlnyilp3s61nl5fciby6m8fh"; - name = "sweeper-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/sweeper-21.12.3.tar.xz"; + sha256 = "1l4ag2nhy0da9z4nlf7fmjrim7pmwpm3m4v4y50jlpdv73f63246"; + name = "sweeper-21.12.3.tar.xz"; }; }; umbrello = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/umbrello-21.12.2.tar.xz"; - sha256 = "07bp3rf31x5c1vag6pw0lal9b6zmvsqa8wg8a30kj7k9wabvjprb"; - name = "umbrello-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/umbrello-21.12.3.tar.xz"; + sha256 = "1i94l5hnn8hl0dgdq8sj5xm2vk372zfcnch9qvf9gcvhg08gdif6"; + name = "umbrello-21.12.3.tar.xz"; }; }; yakuake = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/yakuake-21.12.2.tar.xz"; - sha256 = "1xkdyn944ga1xvwbbblnffvlnwgypspr909yvdy6xf5j0qaldsdk"; - name = "yakuake-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/yakuake-21.12.3.tar.xz"; + sha256 = "10mkr8svkjf2s023mf21cil2c5v986s5b2yp1hm0fzdgmawpwrh9"; + name = "yakuake-21.12.3.tar.xz"; }; }; zanshin = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/zanshin-21.12.2.tar.xz"; - sha256 = "1ilgswm4jbjk1mbvcrdi451f1w4vwx3ah6y32a3y5a9blbh9bh6c"; - name = "zanshin-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/zanshin-21.12.3.tar.xz"; + sha256 = "1cwawpmx5hc60zkdkyh484lp3bwiipn6c3yh164gzw769vz9zr71"; + name = "zanshin-21.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.12.2"; + version = "21.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.2/src/zeroconf-ioslave-21.12.2.tar.xz"; - sha256 = "0b59npqhmf3yvp9x0jm29bwzlyl0vm9l56jlsgwgiq7pwis5njwd"; - name = "zeroconf-ioslave-21.12.2.tar.xz"; + url = "${mirror}/stable/release-service/21.12.3/src/zeroconf-ioslave-21.12.3.tar.xz"; + sha256 = "09jmf233njbqam1swzvpzfgdplpjzdx48vjy6kcpmjvg2qlm7i2l"; + name = "zeroconf-ioslave-21.12.3.tar.xz"; }; }; } From dc1303185f809382dc075d23e881f71b0794b826 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 5 Mar 2022 12:20:21 +0000 Subject: [PATCH 191/685] kmod: add dev and lib outputs Reduces the closure size of pkgsStatic.kmod from 51.0M to 541.6K. --- pkgs/os-specific/linux/kmod/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index a1a1906ba9c..0411bae2060 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -16,6 +16,8 @@ in stdenv.mkDerivation rec { sha256 = "0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b"; }; + outputs = [ "out" "dev" "lib" ]; + nativeBuildInputs = [ autoreconfHook pkg-config libxslt ]; buildInputs = [ xz zstd ] ++ lib.optional stdenv.isDarwin elf-header; From 8d820a4daaa76afeff040bf812894d4afe9478b8 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 26 Feb 2022 19:52:41 +0300 Subject: [PATCH 192/685] openconnect: enable p11kit on linux --- pkgs/tools/networking/openconnect/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 0e1da29320f..5dea456d00b 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -4,6 +4,7 @@ , pkg-config , openssl ? null , gnutls ? null +, p11-kit , gmp , libxml2 , stoken @@ -42,7 +43,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ] - ++ lib.optional stdenv.isDarwin PCSC; + ++ lib.optional stdenv.isDarwin PCSC + ++ lib.optional stdenv.isLinux p11-kit; nativeBuildInputs = [ pkg-config ] ++ lib.optional head autoreconfHook; From 9d53c38f615d9e683e88a1899fd6ffc368bf4be8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Mar 2022 17:12:33 +0100 Subject: [PATCH 193/685] adoptopenjdk-bin: rename name to pname&version --- .../compilers/adoptopenjdk-bin/jdk-darwin-base.nix | 7 ++++--- .../compilers/adoptopenjdk-bin/jdk-linux-base.nix | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index ef3e4b7219e..68d33b657c6 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -10,9 +10,10 @@ assert (stdenv.isDarwin && stdenv.isx86_64); let cpuName = stdenv.hostPlatform.parsed.cpu.name; result = stdenv.mkDerivation { - name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; + pname = if sourcePerArch.packageType == "jdk" + then "adoptopenjdk-${sourcePerArch.vmType}-bin" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin"; + version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); src = fetchurl { inherit (sourcePerArch.${cpuName}) url sha256; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 39685131edd..6fc96b4d182 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -33,9 +33,9 @@ let in let result = stdenv.mkDerivation rec { - name = if sourcePerArch.packageType == "jdk" - then "adoptopenjdk-${sourcePerArch.vmType}-bin-${version}" - else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${version}"; + pname = if sourcePerArch.packageType == "jdk" + then "adoptopenjdk-${sourcePerArch.vmType}-bin" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin"; version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); From 94a6a281933485c668b95f95eba87dbafdb983d3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 7 Mar 2022 12:20:07 +0100 Subject: [PATCH 194/685] docbook_xml_dtd,docbook_xml_ebnf_dtd,xhtml1: replace name with pname&version --- .../sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix | 7 ++++--- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix | 11 +++-------- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix | 7 ++----- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix | 7 ++----- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix | 7 ++----- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix | 7 ++----- .../data/sgml+xml/schemas/xml-dtd/docbook/generic.nix | 10 ++++++---- pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix | 5 +++-- 8 files changed, 24 insertions(+), 37 deletions(-) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index 1c6e57b3e7a..6be2e89dcd2 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "docbook-xml-ebnf-1.2b1"; +stdenv.mkDerivation rec { + pname = "docbook-xml-ebnf"; + version = "1.2b1"; dtd = fetchurl { - url = "http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd"; + url = "https://docbook.org/xml/ebnf/${version}/dbebnf.dtd"; sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index 8a10defa0fb..c367e2a1d0c 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -1,27 +1,22 @@ {lib, stdenv, fetchurl, unzip, findXMLCatalogs}: let - # Urgh, DocBook 4.1.2 doesn't come with an XML catalog. Use the one # from 4.2. docbook42catalog = fetchurl { - url = "http://www.docbook.org/xml/4.2/catalog.xml"; + url = "https://docbook.org/xml/4.2/catalog.xml"; sha256 = "18lhp6q2l0753s855r638shkbdwq9blm6akdjsc9nrik24k38j17"; }; - in import ./generic.nix { inherit lib stdenv unzip findXMLCatalogs; - name = "docbook-xml-4.1.2"; + version = "4.1.2"; src = fetchurl { - url = "http://www.docbook.org/xml/4.1.2/docbkx412.zip"; + url = "https://docbook.org/xml/4.1.2/docbkx412.zip"; sha256 = "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h"; }; postInstall = " sed 's|V4.2|V4.1.2|g' < ${docbook42catalog} > catalog.xml "; - meta = { - branch = "4.1.2"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index 9a9abc0588b..8f778ea7505 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -2,12 +2,9 @@ import ./generic.nix { inherit lib stdenv unzip findXMLCatalogs; - name = "docbook-xml-4.2"; + version = "4.2"; src = fetchurl { - url = "http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip"; + url = "https://docbook.org/xml/4.2/docbook-xml-4.2.zip"; sha256 = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2"; }; - meta = { - branch = "4.2"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 4d821ce2ffb..a58370ec4ac 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -2,12 +2,9 @@ import ./generic.nix { inherit lib stdenv unzip findXMLCatalogs; - name = "docbook-xml-4.3"; + version = "4.3"; src = fetchurl { - url = "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"; + url = "https://docbook.org/xml/4.3/docbook-xml-4.3.zip"; sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"; }; - meta = { - branch = "4.3"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index ca847d3e436..3b46fe81bd7 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -2,12 +2,9 @@ import ./generic.nix { inherit lib stdenv unzip findXMLCatalogs; - name = "docbook-xml-4.4"; + version = "4.4"; src = fetchurl { - url = "http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip"; + url = "https://docbook.org/xml/4.4/docbook-xml-4.4.zip"; sha256 = "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82"; }; - meta = { - branch = "4.4"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 7be810fe307..c4ab1f6f3a9 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -2,12 +2,9 @@ import ./generic.nix { inherit lib stdenv unzip findXMLCatalogs; - name = "docbook-xml-4.5"; + version = "4.5"; src = fetchurl { - url = "http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip"; + url = "https://docbook.org/xml/4.5/docbook-xml-4.5.zip"; sha256 = "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"; }; - meta = { - branch = "4.5"; - }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index 3d6edd300ec..7a635f612af 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: +{ lib, stdenv, unzip, src, version, postInstall ? "true", findXMLCatalogs }: stdenv.mkDerivation { - inherit src name postInstall; + inherit version src postInstall; + pname = "docbook-xml"; - nativeBuildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; propagatedNativeBuildInputs = [ findXMLCatalogs ]; unpackPhase = '' @@ -17,7 +18,8 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = meta // { + meta = { + branch = version; platforms = lib.platforms.unix; }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index c698098e6c1..f05788076a6 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxml2 }: stdenv.mkDerivation { - name = "xhtml1-20020801"; + pname = "xhtml1"; + version = "unstable-2002-08-01"; src = fetchurl { - url = "http://www.w3.org/TR/xhtml1/xhtml1.tgz"; + url = "https://www.w3.org/TR/xhtml1/xhtml1.tgz"; sha256 = "0rr0d89i0z75qvjbm8il93bippx09hbmjwy0y2sj44n9np69x3hl"; }; From 191f62fe307fbd72a35ea3a0e612a9b2c33cdbce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 12:11:42 +0000 Subject: [PATCH 195/685] libuv: 1.43.0 -> 1.44.0 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 1d9354d48e1..b138b12d1b1 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.43.0"; + version = "1.44.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AsXJb2AGNx+SARPmY8uRFRLfX5vqTPNjwL8njSw/e7o="; + sha256 = "sha256-e8kIntv2RsIoTNb55pt+xfX1aFmaMXw2nfWnq1XDnF8="; }; postPatch = let From 32dbdc4388bf10e6939da4e5877dfbb93d0cdda8 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 27 Feb 2022 16:30:46 +0100 Subject: [PATCH 196/685] nghttp2: 1.43.0 -> 1.47.0 Refactor of the feature switches as there was some invalid combinations. {c-ares,libev,openssl,zlib} are all strictly needed if we want to build the applications but are unnecessary when building the lib alone. Accordingly the overrides in `fetchurl` and `pythonPackages.nghttp2` are updated to use `enableApp = false` as they only want libnghttp2. fetchurl bootstrapping just got lighter. :) Also enable the checks whenever possible. To run them we need to set TZDATA environment variable and the `CUnit` tool. Those tests are made optionals as we don't want to scope `cunit` and `tzdata` when bootstrapping `fetchurl`. Also install the Bash completions for h2load, nghttp, nghttpd and nghttpx. Finally, add `c0bw3b` as maintainer. --- .../development/libraries/nghttp2/default.nix | 102 +++++++++++------- pkgs/top-level/all-packages.nix | 6 +- pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 66 insertions(+), 45 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index bd639ec3041..4f22047c5a9 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,90 +1,110 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib +, stdenv +, fetchurl +, installShellFiles +, pkg-config -# Optional Dependencies -, openssl ? null, zlib ? null -, enableLibEv ? !stdenv.hostPlatform.isWindows, libev ? null -, enableCAres ? !stdenv.hostPlatform.isWindows, c-ares ? null -, enableHpack ? false, jansson ? null +# Optional dependencies +, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic +, c-ares ? null, libev ? null, openssl ? null, zlib ? null , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null +, enableHpack ? false, jansson ? null , enableJemalloc ? false, jemalloc ? null -, enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null +# Unit tests ; on Darwin CUnit brings an additional dependency on ncurses which is inconvenient here +, enableTests ? (!stdenv.isDarwin), cunit ? null, tzdata ? null + # downstream dependencies, for testing , curl , libsoup }: -# Note: this package is used for bootstrapping fetchurl, and thus -# cannot use fetchpatch! All mutable patches (generated by GitHub or -# cgit) that are needed here should be included directly in Nixpkgs as -# files. +# Note: this package is used for bootstrapping fetchurl, and thus cannot use fetchpatch! +# All mutable patches (generated by GitHub or cgit) that are needed here +# should be included directly in Nixpkgs as files. -assert enableHpack -> jansson != null; +assert enableApp -> c-ares != null && libev != null && openssl != null && zlib != null; assert enableAsioLib -> boost != null; -assert enableGetAssets -> libxml2 != null; -assert enableJemalloc -> jemalloc != null; +assert enableGetAssets -> enableApp == true && libxml2 != null; +assert enableHpack -> enableApp == true && jansson != null; +assert enableJemalloc -> enableApp == true && jemalloc != null; assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; - -let inherit (lib) optional optionals optionalString; in +assert enableTests -> cunit != null && tzdata != null; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.43.0"; + version = "1.47.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "0qhgyphzdv72dgdfxin2xbk9623za3jwbcvhhaxixiwp6djj8vsm"; + sha256 = "11d6w8iqrhnxmjd9ss9fzf66f7a32d48h2ihyk1580lg8d3rkj07"; }; outputs = [ "bin" "out" "dev" "lib" ] - ++ optional enablePython "python"; + ++ lib.optionals (enablePython) [ "python" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ optional enableLibEv libev - ++ [ zlib ] - ++ optional enableCAres c-ares - ++ optional enableHpack jansson - ++ optional enableAsioLib boost - ++ optional enableGetAssets libxml2 - ++ optional enableJemalloc jemalloc - ++ optionals enablePython [ python ncurses setuptools ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals (enableApp) [ installShellFiles ] + ++ lib.optionals (enablePython) [ cython ]; + + buildInputs = lib.optionals enableApp [ c-ares libev openssl zlib ] + ++ lib.optionals (enableAsioLib) [ boost ] + ++ lib.optionals (enableGetAssets) [ libxml2 ] + ++ lib.optionals (enableHpack) [ jansson ] + ++ lib.optionals (enableJemalloc) [ jemalloc ] + ++ lib.optionals (enablePython) [ python ncurses setuptools ]; enableParallelBuilding = true; configureFlags = [ - "--with-spdylay=no" "--disable-examples" (lib.enableFeature enableApp "app") - ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib" - ++ (if enablePython then [ - "--with-cython=${cython}/bin/cython" - ] else [ - "--disable-python-bindings" - ]); + ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] + ++ lib.optionals (enablePython) [ "--with-cython=${cython}/bin/cython" ]; - preInstall = optionalString enablePython '' + # Unit tests require CUnit and setting TZDIR environment variable + doCheck = enableTests; + checkInputs = lib.optionals (enableTests) [ cunit tzdata ]; + preCheck = lib.optionalString (enableTests) '' + export TZDIR=${tzdata}/share/zoneinfo + ''; + + preInstall = lib.optionalString (enablePython) '' mkdir -p $out/${python.sitePackages} # convince installer it's ok to install here export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" ''; - postInstall = optionalString enablePython '' + postInstall = lib.optionalString (enablePython) '' mkdir -p $python/${python.sitePackages} mv $out/${python.sitePackages}/* $python/${python.sitePackages} + rm -r $out/lib + '' + lib.optionalString (enableApp) '' + installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} ''; - #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc - passthru.tests = { inherit curl libsoup; }; meta = with lib; { + description = "HTTP/2 C library and tools"; + longDescription = '' + nghttp2 is an implementation of the HyperText Transfer Protocol version 2 in C. + The framing layer of HTTP/2 is implemented as a reusable C library. On top of that, + we have implemented an HTTP/2 client, server and proxy. We have also developed + load test and benchmarking tools for HTTP/2. + An HPACK encoder and decoder are available as a public API. + We have Python bindings of this library, but we do not have full code coverage yet. + An experimental high level C++ library is also available. + ''; + homepage = "https://nghttp2.org/"; - description = "A C implementation of HTTP/2"; + changelog = "https://github.com/nghttp2/nghttp2/releases/tag/v${version}"; + # News articles with changes summary can be found here: https://nghttp2.org/blog/archives/ license = licenses.mit; + maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c02073b649f..f9438574770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -652,9 +652,9 @@ with pkgs; }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit zlib pkg-config openssl; - c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; - libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; + inherit pkg-config; + enableApp = false; # curl just needs libnghttp2 + enableTests = false; # avoids bringing `cunit` and `tzdata` into scope }; }); }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18198e5595a..95a451ec6d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5473,7 +5473,8 @@ in { nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; - enablePython = true; + enableApp = false; # build only libnghttp2 ... + enablePython = true; # ... and its Python bindings })).python; nibabel = callPackage ../development/python-modules/nibabel { }; From d951853737e07b7277d676126ad73aba98ffd55b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 9 Mar 2022 11:54:25 +0100 Subject: [PATCH 197/685] govers: switch to fetchFromGitHub --- pkgs/development/tools/govers/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index 5e2d89cfd5d..eb234c82fc0 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "govers"; - version = "20160623-${lib.strings.substring 0 7 rev}"; - rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43"; + version = "unstable-2016-06-23"; goPackagePath = "github.com/rogpeppe/govers"; - src = fetchgit { - inherit rev; - url = "https://github.com/rogpeppe/govers"; - sha256 = "12w83vyi8mgn48fwdm2js693qcydimxapg8rk0yf01w0ab03r5wn"; + src = fetchFromGitHub { + owner = "rogpeppe"; + repo = "govers"; + rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43"; + sha256 = "sha256-lpc8wFKAB+A8mBm9q3qNzTM8ktFS1MYdIvZVFP0eiIs="; }; dontRenameImports = true; From 3fae68b30cfc27a7df5beaf9aaa7cb654edd8403 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Feb 2022 19:51:03 +0300 Subject: [PATCH 198/685] build-support/writeTextFile: fix for names with spaces I am sorry. --- pkgs/build-support/trivial-builders.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 68f0f1bc4dd..fc3a6b35dbc 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -121,7 +121,7 @@ rec { allowSubstitutes = false; } '' - target=$out${destination} + target=$out${lib.escapeShellArg destination} mkdir -p "$(dirname "$target")" if [ -e "$textPath" ]; then From 267f618da56d8ef12c3ada98d08c032549afadc2 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 1 Mar 2022 10:28:39 +0300 Subject: [PATCH 199/685] build-support/makeDesktopItem: remove workaround, fix quoting --- pkgs/build-support/make-desktopitem/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index d831fe24d33..e09fd0e20f2 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -34,11 +34,6 @@ , extraConfig ? {} # Additional values to be added literally to the final item, e.g. vendor extensions }: let - # FIXME: workaround until https://github.com/NixOS/nixpkgs/pull/162246 lands - cleanName = if lib.hasInfix " " name - then throw "makeDesktopItem: name must not contain spaces!" - else name; - # There are multiple places in the FDO spec that make "boolean" values actually tristate, # e.g. StartupNotify, where "unset" is literally defined as "do something reasonable". # So, handle null values separately. @@ -116,8 +111,8 @@ let content = [ mainSectionRendered ] ++ actionsRendered; in writeTextFile { - name = "${cleanName}.desktop"; - destination = "/share/applications/${cleanName}.desktop"; + name = "${name}.desktop"; + destination = "/share/applications/${name}.desktop"; text = builtins.concatStringsSep "\n" content; - checkPhase = "${buildPackages.desktop-file-utils}/bin/desktop-file-validate $target"; + checkPhase = ''${buildPackages.desktop-file-utils}/bin/desktop-file-validate "$target"''; } From 7e3c503257490763fac7ceacbd33e551a0811e37 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 3 Mar 2022 10:26:30 +0300 Subject: [PATCH 200/685] build-support/writeTextFile: add test for weird file names --- .../trivial-builders/test/write-text-file.nix | 34 +++++++++++++++++++ pkgs/test/default.nix | 1 + 2 files changed, 35 insertions(+) create mode 100644 pkgs/build-support/trivial-builders/test/write-text-file.nix diff --git a/pkgs/build-support/trivial-builders/test/write-text-file.nix b/pkgs/build-support/trivial-builders/test/write-text-file.nix new file mode 100644 index 00000000000..ac83a75fca4 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/write-text-file.nix @@ -0,0 +1,34 @@ +{ writeTextFile }: +let + veryWeirdName = ''here's a name with some "bad" characters, like spaces and quotes''; +in writeTextFile { + name = "weird-names"; + destination = "/etc/${veryWeirdName}"; + text = ''passed!''; + checkPhase = '' + # intentionally hardcode everything here, to make sure + # Nix does not mess with file paths + + name="here's a name with some \"bad\" characters, like spaces and quotes" + fullPath="$out/etc/$name" + + if [ -f "$fullPath" ]; then + echo "[PASS] File exists!" + else + echo "[FAIL] File was not created at expected path!" + exit 1 + fi + + content=$(<"$fullPath") + expected="passed!" + + if [ "$content" = "$expected" ]; then + echo "[PASS] Contents match!" + else + echo "[FAIL] File contents don't match!" + echo " Expected: $expected" + echo " Got: $content" + exit 2 + fi + ''; +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 4110327946d..d572c039060 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -59,6 +59,7 @@ with pkgs; trivial-builders = recurseIntoAttrs { writeStringReferencesToFile = callPackage ../build-support/trivial-builders/test/writeStringReferencesToFile.nix {}; + writeTextFile = callPackage ../build-support/trivial-builders/test/write-text-file.nix {}; references = callPackage ../build-support/trivial-builders/test/references.nix {}; overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {}; concat = callPackage ../build-support/trivial-builders/test/concat-test.nix {}; From aac2283c26f138ad43727aac9673fbe9b3d69dff Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 10 Mar 2022 19:01:19 +0800 Subject: [PATCH 201/685] =?UTF-8?q?libinput:=201.19.3=20=E2=86=92=201.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.19.901 https://gitlab.freedesktop.org/libinput/libinput/-/releases/1.20.0 --- .../libraries/libinput/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 89bdc15ff62..5c06cd282da 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,6 +1,7 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, gitUpdater , pkg-config , meson , ninja @@ -44,13 +45,16 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.19.3"; + version = "1.20.0"; outputs = [ "bin" "out" "dev" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; - sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libinput"; + repo = "libinput"; + rev = version; + sha256 = "Ey6ItBIrf1POACp2+6R0B4KxJq5V1HoO+y4j6hZSGAE="; }; patches = [ @@ -113,8 +117,14 @@ stdenv.mkDerivation rec { sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; - passthru.tests = { - libinput-module = nixosTests.libinput; + passthru = { + tests = { + libinput-module = nixosTests.libinput; + }; + updateScript = gitUpdater { + inherit pname version; + patchlevel-unstable = true; + }; }; meta = with lib; { From fb079c3110d95867be383415e9ac41fd1520ab6f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 3 Mar 2022 13:04:49 +0000 Subject: [PATCH 202/685] linux.configfile: fix alts containing "/m" generate-config.pl's auto modules feature answers "m" to any Kconfig question it thinks supports being a module. It detected this by seeing if the help shown by make config (called "alts" by the script) contained the string "/m", which it would in the case of e.g a tristate option, where alts would be "N/m/y/?". But then along came CONFIG_MODPROBE_PATH in Linux 5.13, with a default value, shown in the make config help, of "/sbin/modprobe". generate-config.pl would see the "/m" substring, and answer "m" to the question, meaning (I think) that the built kernel would expect the modprobe binary to be at /m. This broke the (non-NixOS) VM images I build with Nix. NixOS was unaffected because it uses a different mechanism to set the modprobe path. With the current architecture, we can't 100% determine whether a Kconfig option is a string or a tristate, but we can get a lot closer by using a better regex. My new regex only accepts single word characters, separated by slashes, with a "/?" at the end. This is much less likely to ever end up as the default value of a string option. Tested by building linux_latest.configfile before and after my changes, and checking the only difference is the correct default for CONFIG_MODPROBE_PATH. --- pkgs/os-specific/linux/kernel/generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index df807188f14..7e12ca5d96a 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -81,7 +81,7 @@ sub runConfig { my $question = $1; my $name = $2; my $alts = $3; my $answer = ""; # Build everything as a module if possible. - $answer = "m" if $autoModules && $alts =~ /\/m/ && !($preferBuiltin && $alts =~ /Y/); + $answer = "m" if $autoModules && $alts =~ qr{\A(\w/)+m/(\w/)*\?\z} && !($preferBuiltin && $alts =~ /Y/); $answer = $answers{$name} if defined $answers{$name}; print STDERR "QUESTION: $question, NAME: $name, ALTS: $alts, ANSWER: $answer\n" if $debug; print OUT "$answer\n"; From f8be98b2cb58149b8f9789123743392b354d51a2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Jan 2022 12:53:19 +0000 Subject: [PATCH 203/685] cryptsetup: separate binaries from libraries This reduces closure sizes by making the libraries not depend on the binaries, which is good for dynamic builds, and (when statically linked) making the binaries not depend on the libraries, which is good for static builds. When static building, we additionally have to disable loading LUKS plugins from $lib to avoid a reference, which probably wouldn't have worked anyway. --- pkgs/os-specific/linux/cryptsetup/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index a9bd508d16e..be819802394 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; version = "2.4.3"; - outputs = [ "out" "dev" "man" ]; + outputs = [ "bin" "out" "dev" "man" ]; separateDebugInfo = true; src = fetchurl { @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" "--disable-ssh-token" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "--disable-external-tokens" + # We have to override this even though we're removing token + # support, because the path still gets included in the binary even + # though it isn't used. + "--with-luks2-external-tokens-path=/" ]; nativeBuildInputs = [ pkg-config ]; From 69da642a5a9bb433138ba1b13c8d56fb5bb6ec05 Mon Sep 17 00:00:00 2001 From: Evils Date: Wed, 9 Mar 2022 11:32:58 +0100 Subject: [PATCH 204/685] fontforge: 20201107 -> 20220308 refactor the debian patch to apply still seems required to get the extra binaries Co-authored-by: Jan Tojnar (suggestion for partial applying the fetched patch) --- pkgs/tools/misc/fontforge/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 6bb728af99c..3de016bf6d6 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchpatch, fetchFromGitHub, lib , cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango -, readline, woff2, zeromq, libuninameslist +, readline, woff2, zeromq , withSpiro ? false, libspiro , withGTK ? false, gtk3 , withGUI ? withGTK @@ -14,13 +14,13 @@ assert withGTK -> withGUI; stdenv.mkDerivation rec { pname = "fontforge"; - version = "20201107"; + version = "20220308"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; + sha256 = "sha256-q+71PDPODl5fEEy3d1icRl+rBGY7AhH+2dMUKeBWGgI="; }; patches = [ @@ -28,13 +28,11 @@ stdenv.mkDerivation rec { # Taken from https://salsa.debian.org/fonts-team/fontforge/-/blob/master/debian/patches/0001-add-extra-cmake-install-rules.patch (fetchpatch { url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; - sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; - }) - # Fix segmentation fault with some fonts. - # This is merged and should be present in the next release. - (fetchpatch { - url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch"; - sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29"; + excludes = [ + # Already handled upstream: https://github.com/fontforge/fontforge/commit/f97a2cd7b344ec8fcb9f8bfb908e1b6f36326d20 + "contrib/cidmap/CMakeLists.txt" + ]; + sha256 = "iQwaGeBHUais979hGVbU2NxKozQSQkpYXjApxPuLI/4="; }) ]; @@ -52,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - readline uthash woff2 zeromq libuninameslist + readline uthash woff2 zeromq python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [ libspiro ] From 46baf627e21a3199b56e7fef95963a9c47b06042 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 10 Mar 2022 11:49:13 +0100 Subject: [PATCH 205/685] avahi: patch segfault on resolving .local addresses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avahi would segfault on a NULL pointer dereference when trying to resolve .local addresses. This patch fixes that quite annoying behaviour, but apparently wasn’t worth a release yet. --- pkgs/development/libraries/avahi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index dc55b85d5b2..1732b5df04e 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { patches = [ ./no-mkdir-localstatedir.patch + (fetchpatch { + url = "https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c.patch"; + sha256 = "sha256-BXWmrLWUvDxKPoIPRFBpMS3T4gijRw0J+rndp6iDybU="; + }) ]; buildInputs = [ libdaemon dbus glib expat libiconv libevent ] From 8f1cf1ea0be9c62ef5a83e6ed16ddb7dcdbb06a5 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 12 Mar 2022 14:16:46 +0100 Subject: [PATCH 206/685] doxygen: 1.8.20 -> 1.9.3 --- .../tools/documentation/doxygen/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index a4a70dabd69..5a0807974ed 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.8.20"; + version = "1.9.3"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "17chvi3i80rj4750smpizf562xjzd2xcv5rfyh997pyvc1zbq5rh"; + sha256 = "1xfsv31ffrv03qhxlscav0r5mdi3qz4654ib9cq35rvmxfj999bw"; }; nativeBuildInputs = [ @@ -30,19 +30,20 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; - enableParallelBuilding = false; - meta = { license = lib.licenses.gpl2Plus; - homepage = "http://doxygen.nl/"; + homepage = "https://www.doxygen.nl/"; + changelog = "https://www.doxygen.nl/manual/changelog.html"; description = "Source code documentation generator tool"; longDescription = '' - Doxygen is a documentation system for C++, C, Java, Objective-C, - Python, IDL (CORBA and Microsoft flavors), Fortran, VHDL, PHP, - C\#, and to some extent D. It can generate an on-line - documentation browser (in HTML) and/or an off-line reference - manual (in LaTeX) from a set of documented source files. + Doxygen is the de facto standard tool for generating documentation from + annotated C++ sources, but it also supports other popular programming + languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba, + Microsoft, and UNO/OpenOffice flavors), Fortran, VHDL and to some extent + D. It can generate an on-line documentation browser (in HTML) and/or an + off-line reference manual (in LaTeX) from a set of documented source + files. ''; platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix; From 6e2dd6725c23c6d46f8e1d48e7decbf9d558c684 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 12 Mar 2022 15:02:15 +0100 Subject: [PATCH 207/685] =?UTF-8?q?gtk3:=203.24.31=20=E2=86=92=203.24.33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gtk+/3.24/gtk+-3.24.32.news https://ftp.gnome.org/pub/GNOME/sources/gtk+/3.24/gtk+-3.24.33.news --- pkgs/development/libraries/gtk/3.x.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index bb145159447..c736c5cc761 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch , pkg-config , gettext , docbook-xsl-nons @@ -60,7 +59,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.31"; + version = "3.24.33"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-Qjw+f9tMRZ7oieNf1Ncf0mI1YlQcEEGxHAflrR/xC/k="; + sha256 = "sha256-WIsGUi4l0VeemJtvnYob2/L+E83gGgTpBP80aiJeeAE="; }; patches = [ @@ -84,12 +83,6 @@ stdenv.mkDerivation rec { # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536 ./patches/3.0-darwin-x11.patch - - # 3.24.31 does not declare QuartzCore dependency properly and fails to link - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de.patch"; - sha256 = "sha256-KaMeIdV/gfM4xzN9lIkY99E7bzAfTM6VETk5DEunB2w="; - }) ]; nativeBuildInputs = [ From b5fde728eee1569e408db9d832f5fdaa262dce64 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 13 Jan 2022 09:59:40 +0800 Subject: [PATCH 208/685] meson: 0.60.3 -> 0.61.2 --- .../tools/build-managers/meson/default.nix | 8 ++------ .../meson/do-not-update-ldconfig-cache.patch | 12 ------------ .../tools/build-managers/meson/fix-rpath.patch | 8 ++++---- 3 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index aeddf457f48..32710ebebfd 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.60.3"; + version = "0.61.2"; src = python3.pkgs.fetchPypi { inherit pname version; - hash = "sha256-h8pfqTWKAYZFKTkr1k4CcVjrlK/KfHdmsYZu8n7MuY4="; + hash = "sha256-AjOn+NlZB5MY9gUrCTnCf2il3oa6YB8lye5oaftfWIk="; }; patches = [ @@ -57,10 +57,6 @@ python3.pkgs.buildPythonApplication rec { # unsandboxed non-NixOS builds, see: # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 ./boost-Do-not-add-system-paths-on-nix.patch - - # Meson tries to update ld.so.cache which breaks when the target architecture - # differs from the build host's. - ./do-not-update-ldconfig-cache.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch b/pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch deleted file mode 100644 index 884023aaa7e..00000000000 --- a/pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index cb87faf5c..878ec4cd6 100644 ---- a/mesonbuild/minstall.py -+++ b/mesonbuild/minstall.py -@@ -551,7 +551,6 @@ class Installer: - self.install_emptydir(d, dm, destdir, fullprefix) - self.install_data(d, dm, destdir, fullprefix) - self.restore_selinux_contexts(destdir) -- self.apply_ldconfig(dm, destdir) - self.run_install_script(d, destdir, fullprefix) - if not self.did_install_something: - self.log('Nothing to install.') diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/fix-rpath.patch index d34b6c4c434..29bec7903ca 100644 --- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch +++ b/pkgs/development/tools/build-managers/meson/fix-rpath.patch @@ -1,9 +1,9 @@ --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py -@@ -456,6 +456,21 @@ class Backend: - args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang)) - except Exception: - pass +@@ -723,6 +723,21 @@ + @staticmethod + def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]: + dirs: T.Set[str] = set() + + nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split() + next_is_path = False From 7a9b09b2a5ee8895833823669223d886fd0d3f64 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Sun, 6 Feb 2022 19:47:56 -0500 Subject: [PATCH 209/685] http-parser: fix build on armv7l-linux --- pkgs/development/libraries/http-parser/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 36ca0b0ca0b..aff5b1ea3c1 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "http-parser"; @@ -12,7 +12,14 @@ stdenv.mkDerivation rec { }; NIX_CFLAGS_COMPILE = "-Wno-error"; - patches = [ ./build-shared.patch ]; + patches = [ + ./build-shared.patch + # https://github.com/nodejs/http-parser/pull/510 + (fetchpatch { + url = "https://github.com/nodejs/http-parser/commit/4f15b7d510dc7c6361a26a7c6d2f7c3a17f8d878.patch"; + sha256 = "sha256-rZZMJeow3V1fTnjadRaRa+xTq3pdhZn/eJ4xjxEDoU4="; + }) + ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; buildFlags = [ "library" ]; doCheck = true; From f476db5bddfeaec35a84c967fa27cf9367198716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Mar 2022 18:21:03 +0100 Subject: [PATCH 210/685] libva1: 1.7.3 -> 1.8.3, update homepage, add SuperSandro2000 as maintainer All things under bin moved to libva-utils. Changelog: https://github.com/intel/libva/compare/libva-1.7.3...libva-1.8.3#diff-7ee66c4f1536ac84dc5bbff1b8312e2eef24b974b3e48a5c5c2bcfdf2eb8f3ce --- pkgs/development/libraries/libva/1.0.0.nix | 37 ---------------- pkgs/development/libraries/libva/1.nix | 50 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 51 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/libva/1.0.0.nix create mode 100644 pkgs/development/libraries/libva/1.nix diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix deleted file mode 100644 index ade56ac16ee..00000000000 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchurl, libX11, pkg-config, libXext, libdrm, libXfixes, wayland, libffi -, libGL, mesa -, minimal ? false, libva1-minimal -}: - -stdenv.mkDerivation rec { - pname = "libva"; - version = "1.7.3"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/vaapi/releases/libva/${pname}-${version}.tar.bz2"; - sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; - }; - - outputs = [ "bin" "dev" "out" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; - # TODO: share libs between minimal and !minimal - perhaps just symlink them - - configureFlags = - # Add FHS paths for non-NixOS applications. - [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ - lib.optionals (!minimal) [ "--enable-glx" ]; - - installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; - - meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; - license = licenses.mit; - description = "VAAPI library: Video Acceleration API"; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix new file mode 100644 index 00000000000..5197420783a --- /dev/null +++ b/pkgs/development/libraries/libva/1.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, libX11 +, pkg-config +, libXext +, libdrm +, libXfixes +, wayland +, libffi +, libGL +, mesa +, minimal ? false +, libva1-minimal +}: + +stdenv.mkDerivation rec { + pname = "libva" + lib.optionalString minimal "-minimal"; + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "libva"; + rev = version; + sha256 = "sha256-ur59cqdZqXIY2dDUSie9XsxyRomVBxIW2IVKAgWYC38="; + }; + + outputs = [ "dev" "out" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ libdrm ] + ++ lib.optionals (!minimal) [ libva1-minimal libX11 libXext libXfixes wayland libffi libGL ]; + # TODO: share libs between minimal and !minimal - perhaps just symlink them + + # Add FHS paths for non-NixOS applications. + configureFlags = [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] + ++ lib.optionals (!minimal) [ "--enable-glx" ]; + + installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; + + meta = with lib; { + homepage = "https://www.freedesktop.org/wiki/Software/vaapi/"; + license = licenses.mit; + description = "VAAPI library: Video Acceleration API"; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fea1b617a7d..de4761b35ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18870,7 +18870,7 @@ with pkgs; libva-minimal = libva.override { minimal = true; }; libva-utils = callPackage ../development/libraries/libva/utils.nix { }; - libva1 = callPackage ../development/libraries/libva/1.0.0.nix { }; + libva1 = callPackage ../development/libraries/libva/1.nix { }; libva1-minimal = libva1.override { minimal = true; }; libvarlink = callPackage ../development/libraries/libvarlink { }; From c329f549eb0745abc9a836c10a15e13bc05915a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Mar 2022 19:44:35 +0100 Subject: [PATCH 211/685] libva: add SuperSandro2000 as maintainer, add - before minimal --- pkgs/development/libraries/libva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 4b7420c8e6b..99c0e3dd7aa 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - pname = "libva" + lib.optionalString minimal "minimal"; + pname = "libva" + lib.optionalString minimal "-minimal"; version = "2.14.0"; src = fetchFromGitHub { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://01.org/linuxmedia/vaapi"; changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos SuperSandro2000 ]; platforms = platforms.unix; }; } From 9e1ee884e99428cee274892b802792b264bdb184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 11 Mar 2022 19:45:18 +0100 Subject: [PATCH 212/685] libva-utils: add SuperSandro2000 as maintainer --- pkgs/development/libraries/libva/utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index f5538c34acd..fc1fd00a53b 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/libva-utils"; changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos SuperSandro2000 ]; platforms = platforms.unix; }; } From f8ca3a9099629c3fc81deb11b1a7fd95e1bb6dce Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 12 Mar 2022 21:51:06 +0100 Subject: [PATCH 213/685] liva{,-utils}: remove primos from maintainers --- pkgs/development/libraries/libva/default.nix | 2 +- pkgs/development/libraries/libva/utils.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 99c0e3dd7aa..037318353ce 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://01.org/linuxmedia/vaapi"; changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index fc1fd00a53b..357d2052795 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/libva-utils"; changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; }; } From c30918d419f5b4b60f8d5b965f600c05bec63761 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Mar 2022 04:04:41 +0000 Subject: [PATCH 214/685] nixos/networkd: add support for more WireGuard options (introduced in systemd v250) As of systemd/systemd@e90843445890586912ec366cf017f01483c7fdd6, systemd-networkd now automatically configures routes to addresses specified in AllowedIPs unless explicitly disabled with "RouteTable=off". --- nixos/modules/system/boot/networkd.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index ac1e4ef34b4..4444ce3363a 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -281,6 +281,8 @@ let "PrivateKeyFile" "ListenPort" "FirewallMark" + "RouteTable" + "RouteMetric" ]) (assertInt "FirewallMark") (assertRange "FirewallMark" 1 4294967295) @@ -296,6 +298,8 @@ let "AllowedIPs" "Endpoint" "PersistentKeepalive" + "RouteTable" + "RouteMetric" ]) (assertInt "PersistentKeepalive") (assertRange "PersistentKeepalive" 0 65535) From 479329611e570447e679f6d6922028ab5935ad2f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 13 Mar 2022 12:16:17 +0800 Subject: [PATCH 215/685] polkit: fix build with meson 0.61 --- pkgs/development/libraries/polkit/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 72907f7aedc..9c49f89c2ca 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -71,6 +71,12 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/polkit/raw/0a203bd46a1e2ec8cc4b3626840e2ea9d0d13a9a/f/CVE-2021-4115.patch"; sha256 = "sha256-BivHVVpYB4Ies1YbBDyKwUmNlqq2D1MpMipH9/dZM54="; }) + # Fix build with meson 0.61 + # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99 + (fetchpatch { + url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a96c5119f726225f8d79b222c85d71a9f0e32419.patch"; + sha256 = "sha256-/hm/m22dKA50sDmw4L1VAlgvCm8CuIyNjHxF/2YgMKo="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 From 7c19019c1bbae0b3202246edd4379bb1c6a7a105 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 13 Mar 2022 04:20:00 +0000 Subject: [PATCH 216/685] libuv: 1.44.0 -> 1.44.1 https://github.com/libuv/libuv/releases/tag/v1.44.1 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index b138b12d1b1..4f7d35f420c 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.44.0"; + version = "1.44.1"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-e8kIntv2RsIoTNb55pt+xfX1aFmaMXw2nfWnq1XDnF8="; + sha256 = "sha256-12uveSEavRxQW4xVrB4Rkkj+eHZ71Qy8dRG+95ldz50="; }; postPatch = let From 5ecb4b787410c435fc7cf139357c7e54ff313d4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:06:04 +0100 Subject: [PATCH 217/685] python3Packages.pip: 21.3.1 -> 22.0.3 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 2ddba8f363e..a4370fbaae5 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "21.3.1"; + version = "22.0.3"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-A8oePI5VOKGJTY6ZuUhcOhRkz2I2FSdfsS2xIgktCVQ="; + sha256 = "sha256-Wu2QQfb0pehPLLa+za32C4jH1arkBKKc3jlAMRkDV5Q="; name = "${pname}-${version}-source"; }; From ac90f4238934a643f1858855223a59c525c97828 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:14:57 +0100 Subject: [PATCH 218/685] python3Packages.pytest: 6.2.5 -> 7.0.1 --- .../python-modules/pytest/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 0b1bb2b0203..109e9182858 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,5 +1,4 @@ { lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy -, pythonAtLeast, fetchpatch , atomicwrites , attrs , hypothesis @@ -13,29 +12,21 @@ , setuptools , setuptools-scm , six -, toml +, tomli , wcwidth , writeText }: buildPythonPackage rec { pname = "pytest"; - version = "6.2.5"; + version = "7.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"; + sha256 = "sha256-4wkFoMEx09lLiWJKHMWv7D4LovvbFRhn2ODr1JhQ8XE="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix test_errors_in_xfail_skip_expressions for Python 3.10.1, remove after 6.2.5 - url = "https://github.com/pytest-dev/pytest/commit/913439f5e5691f391e2969b3c8f0a49e50dce43a.patch"; - sha256 = "0hsl3lww6bx5k99cp8gj0fy9rg02kcfbwiiwjx2y8vbhwd5ns41p"; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ @@ -48,7 +39,7 @@ buildPythonPackage rec { py setuptools six - toml + tomli wcwidth ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; @@ -95,7 +86,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/6.2.5/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.0.1/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" From 423785bd843171f45ccab98168d09ad2d69d434d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:16:03 +0100 Subject: [PATCH 219/685] python3Packages.pytest-subtests: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/pytest-subtests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index d5e379b524d..b1df1ceaad6 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Pr0wao3PdRM/F0LyiMgvNkJuvPihMtTuiXgtIOhPwTo="; + sha256 = "sha256-lcRMd+P77emEi7iMqQs4SBX8uoCQ75qfVWWasWOxaBw="; }; nativeBuildInputs = [ From 3855b2d0c3b6a6e9f1be95233e2582ad1acda6ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:48 +0100 Subject: [PATCH 220/685] python3Packages.adblock: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/adblock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 941beb54473..53385102529 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "adblock"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ArniDagur"; repo = "python-adblock"; rev = version; - sha256 = "sha256-f6PmEHVahQv8t+WOkE8DO2emivHG2t14hUSIf/l8omY="; + sha256 = "sha256-6FH+AVK7+Yg1a6oKbFV80TuGGE4Y7I3mMVzwVHdHYO4="; }; cargoDeps = rustPlatform.fetchCargoTarball { From 7b34bb2ed8deacade7490ec3a4c525c8ecd47453 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:48 +0100 Subject: [PATCH 221/685] python3Packages.aioftp: 0.20.0 -> 0.20.1 --- pkgs/development/python-modules/aioftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index fab3a32a6a0..83c5e986f09 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.20.0"; + version = "0.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N8qiKsWPaFT/t5p1eSHS0BydoXv4AL6y8gP4z4P9fsE="; + sha256 = "sha256-6p3n5tNNQrbwHqGRXYNL4+cf31Blx2e9elxX6/wxj/4="; }; propagatedBuildInputs = [ From e878a91a1396587e3b272bc2ac6b1610ed14556f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:49 +0100 Subject: [PATCH 222/685] python3Packages.alembic: 1.7.5 -> 1.7.6 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 18698a0d68f..a82cd5e258a 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.7.5"; + version = "1.7.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fDKGlKLmjwPulx5jw72IWEZHA3OltTLPLJ8WAcQTsVM="; + sha256 = "sha256-bAwF6XaKiW2AQ4fiCymYgP4BvFZIQkaw3/6AddbT2Ec="; }; propagatedBuildInputs = [ From bb06db91731e78eaf5a299ab017b87db262d635f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:49 +0100 Subject: [PATCH 223/685] python3Packages.ansi2html: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/ansi2html/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 50188fe0e4a..1f45968974c 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -2,13 +2,14 @@ buildPythonPackage rec { pname = "ansi2html"; - version = "1.6.0"; + version = "1.7.0"; + format = "pyproject"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; + sha256 = "sha256-aTFr6MaKyRxVgtOXwokOacmTzHzaUgYqx+Rfy2YNjtw="; }; nativeBuildInputs = [ setuptools-scm ]; From 37435d23acdf8fdd8d0126161845f2816d918746 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:49 +0100 Subject: [PATCH 224/685] python3Packages.ansible-lint: 5.3.2 -> 5.4.0 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 0523b775dab..334fd20c125 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "5.3.2"; + version = "5.4.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-m6iG20xE5ZNgvI1mjwvq5hk8Ch/LuedhJwAMo6ztfCg="; + sha256 = "sha256-IWCmC0qwNMBABtcBoXeTQP+w9uKPAw/43pWOEGKoiWI="; }; nativeBuildInputs = [ From 638c332a31581f7fc80bd11f6182e77e5a4e1f1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:49 +0100 Subject: [PATCH 225/685] python3Packages.ansi: 0.2.0 -> 0.3.6 --- pkgs/development/python-modules/ansi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index d198fde80bb..73873f8c4cb 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ansi"; - version = "0.2.0"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "98e9b27c4bb187867a69480cbc63b843331622fec7e7d090873d806e1b5d8a80"; + sha256 = "sha256-EFRc4lCORw6SCNDMIAYWAy/cgbhJZ4gm+3yByCP9SLE="; }; checkPhase = '' From 30bda34f740cc8c31a55e7f41574d3ccffbd70ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:49 +0100 Subject: [PATCH 226/685] python3Packages.apache-airflow: 2.2.3 -> 2.2.4 --- pkgs/development/python-modules/apache-airflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 4ac03a8820f..948fae7893b 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ , mkYarnPackage }: let - version = "2.2.3"; + version = "2.2.4"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "02y3az7yj4g4qaamq5s1bcvy3knd6xmvnhbfqs3kbm51irkba1zq"; + sha256 = "sha256-JCcEgCq1sB8lBaeJy7QQbWU00sGAh5vUmJAptF8M9qo="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. From 53e7b4a5dfd218240db21c6c828f0dacd40aa1a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:49 +0100 Subject: [PATCH 227/685] python3Packages.apache-beam: 2.35.0 -> 2.36.0 --- pkgs/development/python-modules/apache-beam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 2eeebaaea7f..b8d1a94eeff 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.35.0"; + version = "2.36.0"; disabled = pythonAtLeast "3.10"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "v${version}"; - sha256 = "0qxkas33d8i6yj133plnadbfm74ak7arn7ldpziyiwdav3hj68sy"; + sha256 = "sha256-f+ICbKSwNjkhrTCCZwxbmqZlQ1+dQSTRag1IflWsqYg="; }; patches = [ From f170668a7b71cc44658cbbdb97cf7e2445f67b19 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:50 +0100 Subject: [PATCH 228/685] python3Packages.approvaltests: 3.6.0 -> 4.0.0 --- pkgs/development/python-modules/approvaltests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index b74533e0d44..ece87d1894e 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - version = "3.6.0"; + version = "4.0.0"; pname = "approvaltests"; # no tests included in PyPI tarball @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "v${version}"; - sha256 = "sha256-pgGuIoYV6JRM9h7hR8IeNduqsGm+UrKq+P/T1LM30NE="; + sha256 = "sha256-4dg5xTswqLFRBaZagKrkilCvsAnky9donb03MT/PiWM="; }; propagatedBuildInputs = [ From 31c778cd96aa553183cc5a57dd74bbc23bb778c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:50 +0100 Subject: [PATCH 229/685] python3Packages.arrow: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/arrow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index fc66509a194..c09610c3be1 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840"; + sha256 = "sha256-Bcrx/T2aEaETWytvCYh0IRU7lFWOXvTQkLVntHFzrCs="; }; postPatch = '' From 31e8a8f4e435dd1385d184c63485b70a3207e60a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:50 +0100 Subject: [PATCH 230/685] python3Packages.asdf: 2.8.3 -> 2.10.1 --- pkgs/development/python-modules/asdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 1a9ba2dd096..122020c271f 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.8.3"; + version = "2.10.1"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "de0f70ffb2e0d539461940d6f7529c3548541fa098d8edc37af256af61c09b44"; + sha256 = "sha256-9+Vp8ps3I5Oe/sgWTrLtcnS91ICwsoPXWDPw9Z0QhAk="; }; nativeBuildInputs = [ setuptools-scm ]; From 117eb5bfbfa13cf5d0046facf6aff3e533f16285 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:50 +0100 Subject: [PATCH 231/685] python3Packages.astropy: 5.0 -> 5.0.1 --- pkgs/development/python-modules/astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 78f02e2870c..6a61dd1009c 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ let pname = "astropy"; - version = "5.0"; + version = "5.0.1"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927"; + sha256 = "sha256-Y4LN5qIFqgsWoNXmHAwBMevU8BdNbHPilk9L7hMqkCc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From cc53855a7c41296f019aafa75634fd3303e17d74 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:51 +0100 Subject: [PATCH 232/685] python3Packages.authcaptureproxy: 1.1.1 -> 1.1.3 --- pkgs/development/python-modules/authcaptureproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 73422a0624c..11e1f444cb0 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.1.1"; + version = "1.1.3"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "08zpaclg5f9g1pix0jaq42i2ph12xc8djjrmhxz0yygw5rsilgl4"; + sha256 = "sha256-RD/8v3IQb50iGkU6zj5QfHXakjHdcCBWWAkXhCIF6qo="; }; postPatch = '' From d9b506dc82e368d91c328bdb1aa0872c8e4da53a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:51 +0100 Subject: [PATCH 233/685] python3Packages.autobahn: 21.11.1 -> 22.2.2 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index a088a012010..285630db32e 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "autobahn"; - version = "21.11.1"; + version = "22.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vW9GMVQZygpb5BCfc3QQIIrV8ZcY9nympKZ0zGbKmxg="; + sha256 = "sha256-YOH0xgKqzQUv/j1GrkC2t1+ChrPEaSLCE7UjFi5YwX4="; }; propagatedBuildInputs = [ From 94d80a1820440b716a2340f1fd126bb108bec69d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:51 +0100 Subject: [PATCH 234/685] python3Packages.aws-adfs: 1.24.5 -> 2.0.1 --- pkgs/development/python-modules/aws-adfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 461ce9d90d9..673b6631cf2 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "1.24.5"; + version = "2.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6a78bd31477ea9988166215ae86abcbfe1413bee20373ecdf0dd170b7290db55"; + sha256 = "sha256-+WMv52JIbh51pqLhDnUCzrcbPD5eutzwFcPOhO+nR7s="; }; propagatedBuildInputs = [ From 4467434cc62bfd5b447ad7f15e3fa9dc2a4f6410 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:51 +0100 Subject: [PATCH 235/685] python3Packages.azure-common: 1.1.27 -> 1.1.28 --- pkgs/development/python-modules/azure-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 2312df1cafa..a540ebf0bea 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.27"; + version = "1.1.28"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9f3f5d991023acbd93050cf53c4e863c6973ded7e236c69e99c8ff5c7bad41ef"; + sha256 = "sha256-SsDNMhTja2obakQmhnIqXYzESWA6qDPz8PQL2oNnBKM="; }; propagatedBuildInputs = [ From 40bd4fef12b8186ba6a5c86080f3f10d32beac34 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:51 +0100 Subject: [PATCH 236/685] python3Packages.azure-core: 1.21.1 -> 1.22.1 --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 9a128d81348..8c343b67430 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.21.1"; + version = "1.22.1"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "88d2db5cf9a135a7287dc45fdde6b96f9ca62c9567512a3bb3e20e322ce7deb2"; + sha256 = "sha256-S25AUmijO4cxB3lklc7D8vGx/+k1Ykzg+93/NtONOk0="; }; propagatedBuildInputs = [ From 7927d4aad281cf0fac0c959c4be0b5180d89329f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:52 +0100 Subject: [PATCH 237/685] python3Packages.azure-mgmt-apimanagement: 2.1.0 -> 3.0.0 --- .../azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 4c7233203bb..4c61b55b666 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "3.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; + sha256 = "sha256-kmL1TtOH6wg9ja5m0yqN81ZHMZuQK9SYzcN29QoS0VQ="; extension = "zip"; }; From 95bf8353503a74424354bb7cef1471c418d4b548 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:52 +0100 Subject: [PATCH 238/685] python3Packages.azure-mgmt-trafficmanager: 0.51.0 -> 1.0.0 --- .../python-modules/azure-mgmt-trafficmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index dd7ed3b19b2..ebb9466e9e2 100644 --- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-trafficmanager"; - version = "0.51.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fc8ae77022cfe52fda4379a2f31e0b857574d536e41291a7b569b5c0f4104186"; + sha256 = "sha256-R0F2HoA0bE7dTLPycTaOqYBj+ATQFeJFwv4EjtK1lqg="; }; propagatedBuildInputs = [ From 8b86ab5af270aca60f3ea59b136b2d1b24e74909 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:52 +0100 Subject: [PATCH 239/685] python3Packages.azure-servicebus: 7.5.0 -> 7.6.0 --- pkgs/development/python-modules/azure-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index b4e37c33fef..a0864529177 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.5.0"; + version = "7.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e97a069c6a73fce3042a5ef0d438cc564152cfbcc2e7db6f7a19fbd51bb3555b"; + sha256 = "sha256-uZGxQ1Vl6wpBCMW1+80/CBuqelLV02yXf1sNlNtCpHU="; }; propagatedBuildInputs = [ From ab5c26589bbf547c4c682a980985fb821ddb19b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:52 +0100 Subject: [PATCH 240/685] python3Packages.basemap: 1.3.0 -> 1.3.2 --- pkgs/development/python-modules/basemap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 30ca58fed31..6d8dd8a3943 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; rev = "v${version}"; - sha256 = "0nwpd6zx2q2fc556ppz71ra6ad9z0d5bz8hcld64i91dcy0f0zs3"; + sha256 = "sha256-onNdOQL4i6GTcuCRel5yanJ2EQ5iYClp+imuBObXF2I="; }; propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; From c3366d5fe2ae11ea16c60c4abd990ab7eb447f2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:52 +0100 Subject: [PATCH 241/685] python3Packages.bip_utils: 2.1.0 -> 2.2.1 --- pkgs/development/python-modules/bip_utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index a4430b655ce..932d887754e 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "2.1.0"; + version = "2.2.1"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "1n677z6rvcny1vyfzwnvcmzbqp9m4kfpdjfvkf1q6310zr2ybp7m"; + sha256 = "sha256-p2JOZAJxQ/nPZ7vjnB24hA3kz3Io4D3HTP/8mqS/XCc="; }; propagatedBuildInputs = [ ecdsa pysha3 ]; From f264180b63832508a365e118cfae36c7fc5937b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:53 +0100 Subject: [PATCH 242/685] python3Packages.bitbox02: 5.3.0 -> 6.0.0 --- pkgs/development/python-modules/bitbox02/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index d57d4a6585b..358a4d163f3 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "5.3.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fe0e8aeb9b32fd7d76bb3e9838895973a74dfd532a8fb8ac174a1a60214aee26"; + sha256 = "sha256-wTateh3dJycFNozLaQbAzXF0avr2ofBdjlqqcOBLr/0="; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; From da98bb072499a062498b6b80b91b0b03e1868e6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:53 +0100 Subject: [PATCH 243/685] python3Packages.bjoern: 3.1.0 -> 3.2.1 --- .../development/python-modules/bjoern/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index ef599d89be2..e8b11a6311a 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -1,12 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, libev, python }: +{ lib, buildPythonPackage, fetchFromGitHub, libev, python }: buildPythonPackage rec { pname = "bjoern"; - version = "3.1.0"; + version = "3.2.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "01f3b601cf0ab0a9c7cb9c8f944ab7c738baaa6043ca82db20e9bd7a9be5767b"; + # tests are not published to pypi anymore + src = fetchFromGitHub { + owner = "jonashaag"; + repo = pname; + rev = version; + hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio="; + fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules }; buildInputs = [ libev ]; From 6fb9a658b7ba00abbca702878ec170e7e454410f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:53 +0100 Subject: [PATCH 244/685] python3Packages.blessed: 1.19.0 -> 1.19.1 --- pkgs/development/python-modules/blessed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index c2b03d35a21..592c36692d0 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "blessed"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "4db0f94e5761aea330b528e84a250027ffe996b5a94bf03e502600c9a5ad7a61"; + sha256 = "sha256-mg0JlpW/Yh1GgN1sc/atVH9qNEL72+gMSx2qHtvEkvw="; }; checkInputs = [ pytest mock glibcLocales ]; From 04f4ee8d2ba8aa7b309e3f5abfad7bc411ddad44 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:53 +0100 Subject: [PATCH 245/685] python3Packages.boto3: 1.20.35 -> 1.21.11 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index c6fdc8c9981..1c3fed6b1aa 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.20.35"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.21.11"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "42dd9fcb9e033ab19c9dfaeaba745ef9d2db6efe4e9f1e1f547b3e3e0b1f4a82"; + sha256 = "sha256-8s7PXRdvOYo5v94ACN+DwD8hQrK+XqvjK/EElh32iBA="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 97c0dba4a9987e90314f18650986e7e74546827c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:53 +0100 Subject: [PATCH 246/685] python3Packages.botocore: 1.23.35 -> 1.24.11 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 6d5c11665c2..70e502993b3 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.23.35"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.24.11"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "5be6ba6c5ea71c256da8a5023bf9c278847c4b90fdb40f2c4c3bdb21ca11ff28"; + sha256 = "sha256-Kvk95wTzEih4oyM+fPXeCwL2xMn6mTyoU7WD9Ze7HDg="; }; propagatedBuildInputs = [ From e9f5119edc6d0dd760c0706d2e9230632399677c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:53 +0100 Subject: [PATCH 247/685] python3Packages.Bottleneck: 1.3.2 -> 1.3.4 --- pkgs/development/python-modules/bottleneck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index f7e7dc7c390..7b8334ee36c 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Bottleneck"; - version = "1.3.2"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "20179f0b66359792ea283b69aa16366419132f3b6cf3adadc0c48e2e8118e573"; + sha256 = "sha256-F2Sn9K1YxVhyPFQoR+s2erC7ttiApOXV7vMKDs5c7Oo="; }; propagatedBuildInputs = [ numpy ]; From 23e9464e048dcfb73f23059209e6a3666f9a5d36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:53 +0100 Subject: [PATCH 248/685] python3Packages.boxx: 0.9.9 -> 0.9.10 --- pkgs/development/python-modules/boxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index a3f0db80faf..dd521523179 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.9.9"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Mc6R6ruUVhFs2D0CTJsAiM9aGOusS973hRS5r2kQsy4="; + sha256 = "sha256-Iw6jRhKAroqfWmbXhD7YTn4s8FrE/Iyd31EOP0tMdkQ="; }; propagatedBuildInputs = [ From 277239983248ea302c0ba6e2b694796160a83039 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:54 +0100 Subject: [PATCH 249/685] python3Packages.bsblan: 0.5.0 -> 0.5.5 --- pkgs/development/python-modules/bsblan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix index 6db95234775..2bf4c63df8e 100644 --- a/pkgs/development/python-modules/bsblan/default.nix +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bsblan"; - version = "0.5.0"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "liudger"; repo = "python-bsblan"; - rev = "v.${version}"; - sha256 = "1j41y2njnalcsp1vjqwl508yp3ki82lv8108ijz52hprhrq4fffb"; + rev = "v${version}"; + sha256 = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ="; }; propagatedBuildInputs = [ From 95d73d3c80b33674469f8e498544aa329d23a171 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:54 +0100 Subject: [PATCH 250/685] python3Packages.cbor2: 5.4.2 -> 5.4.2.post1 --- pkgs/development/python-modules/cbor2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index cf4813a9d90..5039872b336 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.4.2"; + version = "5.4.2.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4oPnC1WgSf82TMXmSP3lh+TZsOh+SyZkxp5jkTXms7g="; + sha256 = "sha256-nPIdWWBLlSnXh3yOA0Ki66rhoH/o/1aD3HX+wVhHx5c="; }; nativeBuildInputs = [ From dbb9df56e2994cae1796874fb8449d0ead01ff0c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:54 +0100 Subject: [PATCH 251/685] python3Packages.certbot: 1.22.0 -> 1.24.0 --- pkgs/development/python-modules/certbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index e65e6f0d808..72a5d8db39d 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.22.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1wrk5rhds6a69vbs1bda0zhwpvjhd8i20did6j3kydbas3zbr516"; + sha256 = "sha256-XIKFEPQKIV5s6sZ7LRnlTvsb3cF4KIaiVZ36cAN1AwA="; }; sourceRoot = "source/${pname}"; From b8943d1285a638f6ad9de1bd0d742358a316c5d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:54 +0100 Subject: [PATCH 252/685] python3Packages.chart-studio: 5.5.0 -> 5.6.0 --- pkgs/development/python-modules/chart-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 28e777e8fdd..30a620b5ad6 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.5.0"; + version = "5.6.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51"; + sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA="; }; sourceRoot = "source/packages/python/chart-studio"; From 8a175bd2fa09b9660212c585c5be5fe790699255 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:54 +0100 Subject: [PATCH 253/685] python3Packages.click: 8.0.3 -> 8.0.4 --- pkgs/development/python-modules/click/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 3e2e8b6e24f..edab4e5caac 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "click"; - version = "8.0.3"; + version = "8.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QQ6TKwUPXu13PEzalN51lxyJzbMVWnKggxE5p55ey1s="; + sha256 = "sha256-hFjXsSh8X7EoyQ4jOBz5nc3nS+r2x/9jhM6E1v4JCts="; }; postPatch = '' From 2f5994c353f09f8eb24aa004650709b4c8c3ebc0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:54 +0100 Subject: [PATCH 254/685] python3Packages.cma: 3.1.0 -> 3.2.1 --- pkgs/development/python-modules/cma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 473f0607698..c0480f2fa71 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "cma"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; rev = "r${version}"; - sha256 = "1bal4kljxrdm6x5ppyi6i109714h0czdxfsna906dlfplrmq52bf"; + sha256 = "sha256-wLUD8HMJusUeCwwp37D/W7yJuJQcDfRwVGVKwBS6sR8="; }; propagatedBuildInputs = [ From a521505b0a7825e2141b7de6dbeb245bb36c04d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:55 +0100 Subject: [PATCH 255/685] python3Packages.cmd2: 2.3.3 -> 2.4.0 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 5f262438fe9..8a7f9a5e1c8 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.3.3"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "750d7eb04d55c3bc2a413e191bc177856f388102de47d11f2210a35266543640"; + sha256 = "sha256-CQkJq2yOzuQIE87HWeYd1ucMgiehqOlggvXysNOUvHc="; }; LC_ALL = "en_US.UTF-8"; From 2084747e898755df99eabae32f8b2ea7182c5575 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:55 +0100 Subject: [PATCH 256/685] python3Packages.collections-extended: 2.0.0 -> 2.0.2 --- .../python-modules/collections-extended/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/collections-extended/default.nix b/pkgs/development/python-modules/collections-extended/default.nix index 52f73a5554a..b51a458109c 100644 --- a/pkgs/development/python-modules/collections-extended/default.nix +++ b/pkgs/development/python-modules/collections-extended/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { pname = "collections-extended"; - version = "2.0.0"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mlenzen"; repo = pname; rev = "v${version}"; - sha256 = "sha256:1qcr1q49a134b122rpldjiim1fsl32gxs5fpj3232nyb05r68haz"; + sha256 = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4="; }; nativeBuildInputs = [ From 14f366ecaf4013b650b9f6a01a252cd9c33cea8f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:55 +0100 Subject: [PATCH 257/685] python3Packages.construct: 2.10.67 -> 2.10.68 --- pkgs/development/python-modules/construct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 8ae44476eff..ce6e0a65b34 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "construct"; - version = "2.10.67"; + version = "2.10.68"; disabled = pythonOlder "3.6"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1nciwim745qk41l1ck4chx3vxpfr6cq4k3a4i7vfnnrd3s6szzsw"; + sha256 = "sha256-bp/YyRFP0rrBHPyhiqnn6o1iC5l61oedShZ2phGeqaw="; }; # not an explicit dependency, but it's imported by an entrypoint From ea86d0ba5dcec9bc1795866dd59722ebc376707f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:55 +0100 Subject: [PATCH 258/685] python3Packages.convertdate: 2.3.2 -> 2.4.0 --- pkgs/development/python-modules/convertdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index cc26142d362..cb47546055e 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "convertdate"; - version = "2.3.2"; + version = "2.4.0"; disabled = isPy27; # Tests are not available in the PyPI tarball so use GitHub instead. @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "0k7j59sbqwyi72vcjx5vsh3qb6hxfnkfjkd2i6f6lckdr1bkh7fz"; + sha256 = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; }; propagatedBuildInputs = [ From 99e7b03c0a613b76ddd940ae3052edf16376cc9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:55 +0100 Subject: [PATCH 259/685] python3Packages.coverage: 6.2 -> 6.3.2 --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index f1930b88fb8..8019fc94966 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "6.2"; + version = "6.3.2"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"; + sha256 = "sha256-A+KngmCGuR7zRf8YdC7p/Eemg5zNUXBh74+hl25lLOk="; }; # No tests in archive From 5ac0c98987d33873d3d5b44912239dafb71617cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:55 +0100 Subject: [PATCH 260/685] python3Packages.cssselect2: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 52c1bc4067f..9d30ec09312 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.4.1"; + version = "0.5.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8"; + sha256 = "sha256-2Yp7vdjrxGCTJ5GV1mmjNZvVoj+QwZ6CwZ2e7vMz5hc="; }; postPatch = '' From 994f13b2d3cf74290e87786768e63b4c8b89e374 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:55 +0100 Subject: [PATCH 261/685] python3Packages.cx_Freeze: 6.9 -> 6.10 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 90e2608069c..fb02b0d1ef1 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.9"; + version = "6.10"; src = fetchPypi { inherit pname version; - sha256 = "673aa3199af2ef87fc03a43a30e5d78b27ced2cedde925da89c55b5657da267b"; + sha256 = "sha256-5bcb9XuYgawUL76+riyLDTKUtW9uSKtkAyMh47Giuic="; }; disabled = pythonOlder "3.5"; From 9cc7502db1f7285bf79b338b3e16ebbfb070d618 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:56 +0100 Subject: [PATCH 262/685] python3Packages.cyclonedx-python-lib: 1.3.0 -> 2.0.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 26546c3f7cb..af638894831 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "1.3.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - hash = "sha256-/1kWvhTUS0JT0RwodiivJSUiWIDwQyXxdjF/KUlCNds="; + hash = "sha256-S1bcUCHe4UYJuSHI8LMQZ/reS6YAE0hxrpw+QweFm/8="; }; nativeBuildInputs = [ From 79c45e08d74bd9a50c03165973d285225c1635c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:56 +0100 Subject: [PATCH 263/685] python3Packages.datasets: 1.17.0 -> 1.18.3 --- pkgs/development/python-modules/datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index ab5e929818c..baf27639fd4 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.17.0"; + version = "1.18.3"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "0bsk3jldvcxak64dhlxkqax7mf83z6qpwfgfk32rni1gpnz5pqbd"; + sha256 = "sha256-2x6DpsDcVF2O5iJKeMEGw/aJwZPc7gSGaK2947c3B6s="; }; propagatedBuildInputs = [ From 54a6971a65e68c59e38d13640a8f27de03553e23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:56 +0100 Subject: [PATCH 264/685] python3Packages.detect-secrets: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/detect-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/detect-secrets/default.nix b/pkgs/development/python-modules/detect-secrets/default.nix index ef19b9a913b..e9227891e04 100644 --- a/pkgs/development/python-modules/detect-secrets/default.nix +++ b/pkgs/development/python-modules/detect-secrets/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "detect-secrets"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dG2YaWXAMINxBGKNMlVfGTR9QHdnepiZmN+G88X4Wak="; + hash = "sha256-4VcV06iaL3NAj7qF8RyfWV1zgrt928AQfjGeuO2Pbjk="; leaveDotGit = true; }; From 8bd3a132596d02af26952da1f61437a9e41b5160 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:56 +0100 Subject: [PATCH 265/685] python3Packages.distributed: 2022.2.0 -> 2022.2.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index ee86418a665..2055c9de13e 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.2.0"; + version = "2022.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - hash = "sha256-Gi9u7JczpnAEg53E7N5tXBfAeWZaLBVzRU3SpbU3bZU="; + hash = "sha256-+2KnWvjvM7vhqoCmjAGjOpPBzVozLdAXq0SVW/fs9ls="; }; propagatedBuildInputs = [ From 4618c4bb0ff1f9605e674fa628bf6716ae200416 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:56 +0100 Subject: [PATCH 266/685] python3Packages.distro: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/distro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index bf8675af941..deee452ae1b 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distro"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"; + sha256 = "sha256-FRrsz2DCFkApMrUuQO5HepOfjViJiSc3igKrvoUsHDk="; }; # tests are very targeted at individual linux distributions From 4d7b531a45d0c60f221e43796e4892c499833776 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:57 +0100 Subject: [PATCH 267/685] python3Packages.django-contrib-comments: 2.1.0 -> 2.2.0 --- .../python-modules/django_contrib_comments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 3f717b0fb5c..88bbdfdeddb 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-contrib-comments"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d82f1d04690550df026553053903deec0c52dc54212e1b79241b08f0355cff2c"; + sha256 = "sha256-SN4A8VZ34BaiFq7/IF1uAOQ5HJpXAhNsZBGcRytzVto="; }; propagatedBuildInputs = [ django ]; From 75c288dbb5c8b3e9378c81a46535a162776a23da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:57 +0100 Subject: [PATCH 268/685] python3Packages.django-reversion: 4.0.2 -> 5.0.0 --- pkgs/development/python-modules/django_reversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 1bf4d6b4dab..f6bc72dc226 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "4.0.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XTO6lE2/GccDDJ5w43MSSK40Nozyr+3hDg0I+/ieb4w="; + sha256 = "sha256-C63jw5k4dFEIfwxng14NPRhtdn3mpcW6U6iOr8Pyccg="; }; # tests assume the availability of a mysql/postgresql database From 8571b07158a7368485a73651feaaff81c0cce143 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:57 +0100 Subject: [PATCH 269/685] python3Packages.dm-haiku: 0.0.5 -> 0.0.6 --- pkgs/development/python-modules/dm-haiku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 14ceebf0a19..6f16808be5d 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "v${version}"; - sha256 = "1mdqjcka0m1div63ngba8w8z94id4c1h8xqmnq1xpmgkc79224wa"; + sha256 = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; }; propagatedBuildInputs = [ From 0e590ca9aa4819ee7c0ac87f3d99ab540ee3a68e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:57 +0100 Subject: [PATCH 270/685] python3Packages.dynalite-devices: 0.1.46 -> 0.46 --- pkgs/development/python-modules/dynalite-devices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index dafbcfc2f5c..3ee79ae4480 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.1.46"; + version = "0.46"; src = fetchFromGitHub { owner = "ziv1234"; repo = "python-dynalite-devices"; - rev = "v0.46"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 + rev = "v${version}"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 hash = "sha256-Fju2JpFkQBCbOln7r3L+crv82TI2SkdPJ1oaK7PEifo="; }; From 4a95953e6d38565a12a742365e616912cf90c110 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:57 +0100 Subject: [PATCH 271/685] python3Packages.EasyProcess: 0.3 -> 1.1 --- pkgs/development/python-modules/easyprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index c98a8b572d4..97707e0e9fd 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.3"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "115rzzr0hx4af4m6krf7dxn8851n4l8jfxahjzjc2r0zq2m8v57v"; + sha256 = "sha256-iFiYMCpXqrlIlz6LXTKkIpOSufstmGqx1P/VkOW6kOw="; }; # No tests From c1158905e7e7b02bf20d4129803f479568fec32c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:57 +0100 Subject: [PATCH 272/685] python3Packages.einops: 0.3.2 -> 0.4.0 --- pkgs/development/python-modules/einops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/einops/default.nix b/pkgs/development/python-modules/einops/default.nix index 18b8d671c98..126f9a31500 100644 --- a/pkgs/development/python-modules/einops/default.nix +++ b/pkgs/development/python-modules/einops/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "einops"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "arogozhnikov"; repo = pname; rev = "v${version}"; - sha256 = "0ix094cfh6w4bvx6ymp5dpm35y9nkaibcn1y50g6kwdp4f0473y8"; + sha256 = "sha256-/NnBm5qnTY0BngEj5i5hIb0VCInBZiSiVkIGLhCkffQ="; }; checkInputs = [ From 5d7147381c933088386692dd796870188c814ad3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 273/685] python3Packages.elegy: 0.8.4 -> 0.8.5 --- pkgs/development/python-modules/elegy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix index 5b0cb293c0a..c98dcd40534 100644 --- a/pkgs/development/python-modules/elegy/default.nix +++ b/pkgs/development/python-modules/elegy/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "elegy"; - version = "0.8.4"; + version = "0.8.5"; format = "pyproject"; src = fetchFromGitHub { owner = "poets-ai"; repo = pname; rev = version; - sha256 = "11w8lgl31b52w2qri8j8cgzd30sn8i3769g8nkkshvgkjgca9r4g"; + sha256 = "sha256-2qBHiNmdO53rD9/tudnf1z4+6a5ZHH/y2wB4v3/Tqdg="; }; nativeBuildInputs = [ From 4915afac14d2417bd7fb335e347f326f6b0881dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 274/685] python3Packages.entrypoints: 0.3 -> 0.4 --- .../python-modules/entrypoints/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index a26d6ede890..1223f3f911d 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -1,31 +1,36 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi +, flit-core , configparser -, pytest -, isPy3k +, pytestCheckHook }: buildPythonPackage rec { pname = "entrypoints"; - version = "0.3"; + version = "0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"; + sha256 = "sha256-twbt2qkhihnrzWe1aBjwW7J1ibHKno15e3Sv+tTMrNQ="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + flit-core + ]; - propagatedBuildInputs = lib.optional (!isPy3k) configparser; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test tests - ''; - - meta = { + meta = with lib; { description = "Discover and load entry points from installed packages"; homepage = "https://github.com/takluyver/entrypoints"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 8ed0cf2b0c0a5e56f325a3d4ad95642c89c8c406 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 275/685] python3Packages.faker: 11.3.0 -> 13.3.0 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 048edf64d38..728339621f8 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "11.3.0"; + version = "13.3.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-rb5WfmTaahCX/qyraZAA4a0W4Xplkqjwrh7gt/vxmIc="; + hash = "sha256-YYsUDHdHV4bb46VAmtU1Ict2dGq3pcd7mcZj8+8bG8I="; }; propagatedBuildInputs = [ From 06e320562bbc1fe90ab9ac17058e01fc51c9df9b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 276/685] python3Packages.fasteners: 0.16.3 -> 0.17.3 --- .../python-modules/fasteners/default.nix | 37 ++++++------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 0364022fa28..b1281c686d8 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,47 +1,32 @@ { lib , buildPythonPackage -, fetchPypi -, six -, monotonic +, fetchFromGitHub , diskcache -, more-itertools -, testtools -, isPy3k -, nose -, futures ? null +, pytestCheckHook }: buildPythonPackage rec { pname = "fasteners"; - version = "0.16.3"; + version = "0.17.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de"; + src = fetchFromGitHub { + owner = "harlowja"; + repo = pname; + rev = version; + hash = "sha256-FVhHp8BZ/wQQyr5AcuDo94LlflixhjZ0SnheSdHuDVQ="; }; - propagatedBuildInputs = [ - six - monotonic - ]; - checkInputs = [ diskcache - more-itertools - testtools - nose - ] ++ lib.optionals (!isPy3k) [ - futures + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { description = "A python package that provides useful locks"; homepage = "https://github.com/harlowja/fasteners"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From 3719c915e61ddd9d132434e0e1eb8e36597e93a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 277/685] python3Packages.filelock: 3.4.2 -> 3.6.0 --- pkgs/development/python-modules/filelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 8eaed65ca73..16379ef85e1 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.4.2"; + version = "3.6.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"; + sha256 = "sha256-nNVAqTUuQyxyRqSP5OhxKxCssd8q0fMOjAcLgq4f7YU="; }; nativeBuildInputs = [ From df218fdd3ee7dcb1217f047a3572d38d67c8da54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 278/685] python3Packages.Flask-Compress: 1.10.1 -> 1.11 --- pkgs/development/python-modules/flask-compress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index fff330946d1..11aea3ce69c 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "1.10.1"; + version = "1.11"; pname = "Flask-Compress"; src = fetchPypi { inherit pname version; - sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; + sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw="; }; postPatch = '' From aa12d780f24f24e03afe92a91469ceb2cb0102ce Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 279/685] python3Packages.Flask: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/flask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index cf1079166b0..e7464a38701 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "2.0.3"; pname = "Flask"; src = fetchPypi { inherit pname version; - sha256 = "7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2"; + sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; }; propagatedBuildInputs = [ From eddb45ed251be89df005a809ebd5fcea8d69c61b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 280/685] python3Packages.flask-security-too: 4.1.2 -> 4.1.3 --- .../development/python-modules/flask-security-too/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index ddf5aa05c49..e88556c07d0 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "4.1.2"; + version = "4.1.3"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "16ws5n08vm7wsa2f7lrkxvc7jl3ah1xfylhhyzb4vvqmlk7x9hw8"; + sha256 = "sha256-mW2NKGeJpyR4Ri7m+KE3ElSg3E+P7qbzNTTCo3cskc8="; }; propagatedBuildInputs = [ From 09782d6886ad771a46e84bd69fa1b52c0badc096 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 281/685] python3Packages.fonttools: 4.29.0 -> 4.29.1 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 50f5e87a29f..84f2edb7210 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.29.0"; + version = "4.29.1"; # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "LnkpTEpZbbRAyqGPJXdfpHjh4t7n6LkjZGLhirVNl7E="; + sha256 = "sha256-xviNGFcb1wj5WuA6UxHpw3BkpdjSJL3fbsBytJacp8w="; }; # all dependencies are optional, but From def5286419df75006861f7727c4ca3119930b0d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:58 +0100 Subject: [PATCH 282/685] python3Packages.fs: 2.4.14 -> 2.4.15 --- pkgs/development/python-modules/fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 0ab3778f55c..6915ba8d050 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "fs"; - version = "2.4.14"; + version = "2.4.15"; src = fetchPypi { inherit pname version; - sha256 = "9555dc2bc58c58cac03478ac7e9f622d29fe2d20a4384c24c90ab50de2c7b36c"; + sha256 = "sha256-sJ0CwxH0rdHm4rdXJMRQ6vz+7MkXV5IkyorSHazQoYI="; }; buildInputs = [ glibcLocales ]; From a4a0cc2b4d0a8fd11fa97a172d193c190a492bbb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 283/685] python3Packages.ftfy: 6.0.3 -> 6.1.1 --- pkgs/development/python-modules/ftfy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 5ea93ec179e..8bd25bea7c6 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ftfy"; - version = "6.0.3"; + version = "6.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b"; + sha256 = "sha256-v8IBn4T82FFBkVIyCmN1YEoPFFnCgbWxmbLNDS5yf48="; }; propagatedBuildInputs = [ From c967d88ffc0a68fbd3dce4b5b8ba1709fe893522 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 284/685] python3Packages.Genshi: 0.7.5 -> 0.7.6 --- pkgs/development/python-modules/genshi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index c476960bbf8..be6abbd8364 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Genshi"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "c12d6c2abf7df0ec661d9ff2e197522eae846e43dc58abd5a36443d05bc41135"; + sha256 = "sha256-NKLOi4DoQ/Ygxbe35ZqqNip2zpdkpvEQMig+2UWMOlk="; }; # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) From 8f9fca514a6b92bc122fe42b825d996e02fe07fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 285/685] python3Packages.gidgethub: 5.0.1 -> 5.1.0 --- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 691af2eda84..9d1fdc07d90 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "5.0.1"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682"; + sha256 = "sha256-kNGTb6mA2XBaljYvpOWaKFEks3NigsiPgmdIgSMKTiU="; }; nativeBuildInputs = [ setuptools pytest-runner ]; From a5483739f5d78bec75d5a7e248eb89714c591709 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 286/685] python3Packages.github3.py: 3.0.0 -> 3.2.0 --- pkgs/development/python-modules/github3_py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 1f5c983e14f..67e1868fb8b 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "github3.py"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "a9134cb9efd334b1644ad7c5ee3ff3ff488317c4549ffc0e8d82e4d63383a1a4"; + sha256 = "sha256-Cbcr4Ul9NGsJaM3oNgoNavedwgbQFJpjzT7IbGXDd8w="; }; checkInputs = [ betamax pytest betamax-matchers ] From 222b9d54d41cedc8ffde75a41db1add8217d7a3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 287/685] python3Packages.google-api-python-client: 2.35.0 -> 2.39.0 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 772f45411d3..493bda2f9d5 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.35.0"; + version = "2.39.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "038b12979ea86ef0e33962bd33f955c337bc28f0471522bd27a801d52bfb4ae2"; + sha256 = "sha256-QBFpIV7K+1r7aD0/4OQ8BZ62Jccf6hkp8WQD3acqLcE="; }; propagatedBuildInputs = [ From 6775f2827e994a99522fa83a002e0436b3a0075f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 288/685] python3Packages.googleapis-common-protos: 1.54.0 -> 1.55.0 --- .../python-modules/googleapis-common-protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 55380e3081a..629ffa3a47d 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.54.0"; + version = "1.55.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pAMdbsbCsbbcPgvn4Qob1y+wsYsH75vntR8sEATOJDc="; + sha256 = "sha256-U+sxMGRzj0XVrGNBVa4gjhIcljZZYnuQ38th71FMA+E="; }; propagatedBuildInputs = [ grpc protobuf ]; From abce52df801f257eee064b0890d9b9f02da89420 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 289/685] python3Packages.google-auth-oauthlib: 0.4.6 -> 0.5.0 --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 1d23af5a3d4..39aa54a4832 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.6"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno="; + sha256 = "sha256-BsTOs6sqk7hbiXa76Gy7gq4dHALS3tPP0IR6i2lVJjs="; }; propagatedBuildInputs = [ From c68f5afe368a3b7efbb1a0a3dfe22725b35a6561 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 290/685] python3Packages.graphql-relay: 3.1.0 -> 3.1.5 --- pkgs/development/python-modules/graphql-relay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index 08e27c19487..d5460461925 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "graphql-relay"; - version = "3.1.0"; + version = "3.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cNWn7lmV6nwqmjflEidmOxpGTx9A6Y/d6VC+VBXf4LQ="; + sha256 = "sha256-En9AkT8Ry4R0Uu95STEmGq47Ii6q+Xb3yEMCmFNOVNM="; }; propagatedBuildInputs = [ From cb8e95eb51bcd6de31e00ed300b9d6f6cc5a30c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:41:59 +0100 Subject: [PATCH 291/685] python3Packages.graspologic: 0.3.1 -> 1.0.0 --- pkgs/development/python-modules/graspologic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 10e7190d1fd..1a246461e5f 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "graspologic"; - version = "0.3.1"; + version = "1.0.0"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "v${version}"; - sha256 = "07dmfb1aplha01d22b41js7634dac4v28pv1l3bzssqhi4yyds7h"; + sha256 = "sha256-mzJ3eFo77gnOh/Vs9u68yFDZW3ilXtcCCwKahKyRRmc="; }; propagatedBuildInputs = [ From 410c585a4c6fc8e8def3f29bae59831a5edf8271 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:00 +0100 Subject: [PATCH 292/685] python3Packages.gssapi: 1.7.2 -> 1.7.3 --- pkgs/development/python-modules/gssapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index d500c645321..f703820a4f5 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.7.2"; + version = "1.7.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "1xdcnm66b07m7chf04pp58p3khvy547hns1fw1xffd4n51kl42pp"; + sha256 = "sha256-/1YOnG6sCP8G8J3K2/RycTC95rXW9M+U3Mjz4GCt13s="; }; # It's used to locate headers From c59e2d3789c0a6f5ae04705c7f6e941a6a66ed7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:00 +0100 Subject: [PATCH 293/685] python3Packages.gym: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/gym/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 1616343f8b4..aff7d1a2978 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "gym"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = "v${version}"; - sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c"; + rev = version; + sha256 = "sha256-JbPWLuQGo+fErUlCKKpMwWdu0KvXBDuH2MeAHdJCTgM="; }; propagatedBuildInputs = [ From e70fd31a5b0a717d30bc47c9257ca04a5bc3efa7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:00 +0100 Subject: [PATCH 294/685] python3Packages.h11: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/h11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index f3d37dacfa3..be4802566f7 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "h11"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0hk0nll6qazsambp3kl8cxxsbl4gv5y9252qadyk0jky0sv2q8j7"; + sha256 = "sha256-cIE8ETUIeiSKTTjMDhoBgf+rIYgUGpPq9WeUDDlX/wY="; }; checkInputs = [ pytestCheckHook ]; From 4d81db205db97ff99e5da97880a94529072bf968 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:00 +0100 Subject: [PATCH 295/685] python3Packages.hass-nabucasa: 0.52.0 -> 0.54.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index e7732e1f6a4..edf19d0e190 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { sed -i 's/"acme.*"/"acme"/' setup.py substituteInPlace setup.py \ --replace "cryptography>=2.8,<4.0" "cryptography" \ - --replace "snitun==" "snitun>=" + --replace "snitun==" "snitun>=" \ + --replace "pycognito==2022.01.0" "pycognito" ''; propagatedBuildInputs = [ From def84cb7d39044dd1968bc60edf3a5aff2680bf1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:00 +0100 Subject: [PATCH 296/685] python3Packages.hatasmota: 0.3.1 -> 0.4.0 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 6a0a3793d87..b710e5fb2e2 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw="; + sha256 = "sha256-r9EBuaKxc7Vcdfk8zoDpIi2i6yIGc7soSWx+RjG+SZo="; }; propagatedBuildInputs = [ From 4b03937bae7e804b57e38d87255e12f3f7893bf5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:00 +0100 Subject: [PATCH 297/685] python3Packages.hg-git: 0.10.3 -> 0.10.4 --- pkgs/development/python-modules/hg-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index eccdcdaed42..be3edd37218 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hg-git"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "27e6d7686a1548d4632dcc977f2ff3ce2e42d80735339b1f3b389b7481260cc4"; + sha256 = "sha256-guJlIm9HPTgKw5cg/s7rFST/crAXfPxGYGeZxEJ+hcw="; }; propagatedBuildInputs = [ dulwich mercurial ]; From a6118e1395378828c7600a00c6ada76d195af385 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:00 +0100 Subject: [PATCH 298/685] python3Packages.hmmlearn: 0.2.6 -> 0.2.7 --- pkgs/development/python-modules/hmmlearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 17f5126367b..bdeff30b761 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "2a289cf28b31be59fa8ba5d3253d4a2a992401d45a8cdc221ae484fbf390c0d7"; + sha256 = "sha256-a0snIPJ6912pNnq02Q3LAPONozFo322Rf57F3mZw9uE="; }; buildInputs = [ setuptools-scm cython ]; From deda5e4c21f120587321ddd5b987b4179b5fbd0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Mar 2022 16:11:19 +0100 Subject: [PATCH 299/685] python3Packages.socksio: init at 1.0.0 https://github.com/sethmlarson/socksio/blob/master/CHANGELOG.md\#100-2020-04-17 --- .../python-modules/socksio/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/socksio/default.nix diff --git a/pkgs/development/python-modules/socksio/default.nix b/pkgs/development/python-modules/socksio/default.nix new file mode 100644 index 00000000000..5d42ed6e8ec --- /dev/null +++ b/pkgs/development/python-modules/socksio/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +, flit-core +, pytestCheckHook +}: + +let + pname = "socksio"; + version = "1.0.0"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-+IvrPaW1w4uYkEad5n0MsPnUlLeLEGyhhF+WwQuRxKw="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + # remove coverage configuration + preCheck = '' + rm pytest.ini + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5"; + homepage = "https://github.com/sethmlarson/socksio"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f563b4faa9d..a2775766e1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9311,6 +9311,8 @@ in { sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; + socksio = callPackage ../development/python-modules/socksio { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; soco = callPackage ../development/python-modules/soco { }; From ab248891031daec7f7faeb1b32abc3acbd4df4a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:01 +0100 Subject: [PATCH 300/685] python3Packages.httpcore: 0.14.4 -> 0.14.7 --- pkgs/development/python-modules/httpcore/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 79d979b10a9..7f028c478fc 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -12,6 +12,7 @@ , pytest-cov , pytest-httpbin , sniffio +, socksio , trio , trustme , uvicorn @@ -19,22 +20,28 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.14.4"; + version = "0.14.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "19zsg8ijw0s1722ka67mjxx5z07lx9jq36z97l1fa6z1129wq240"; + sha256 = "sha256-h+3MfP1p/ifN0mF/xxrOKPTjD4Q7WzRh94YO4DYSuXE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "h11>=0.11,<0.13" "h11>=0.11,<0.14" + ''; + propagatedBuildInputs = [ anyio certifi h11 h2 sniffio + socksio ]; checkInputs = [ From c89fdaa8655f921ec632867861ab7d78dde71f3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:01 +0100 Subject: [PATCH 301/685] python3Packages.httptools: 0.3.0 -> 0.4.0 --- pkgs/development/python-modules/httptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index 0a5b510b0ad..963a9ff5ebf 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.3.0"; + version = "0.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3f9b4856d46ba1f0c850f4e84b264a9a8b4460acb20e865ec00978ad9fbaa4cf"; + sha256 = "sha256-LJqTDDeLPRXWtpX7levP+BpzlbT5d1xPEKB2vrCywf8="; }; # tests are not included in pypi tarball From f5289383d6187034062104db6656a2e20938d33e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:01 +0100 Subject: [PATCH 302/685] python3Packages.httpx: 0.21.3 -> 0.22.0 --- pkgs/development/python-modules/httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index d479cc1f13c..dbf8d1745c0 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.21.3"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "01069b0kj6vnb26xazlz06rj4yncy5nkq76pajvzx0pmpjkniiz9"; + sha256 = "sha256-hQmQodGpVG23IZSsWV7rB1iB6QAudDao/8YshIgpmas="; }; propagatedBuildInputs = [ From f4dafacf992a7a0f96e36cfd09b9b20a24cab8bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:01 +0100 Subject: [PATCH 303/685] python3Packages.huggingface-hub: 0.1.2 -> 0.4.0 --- pkgs/development/python-modules/huggingface-hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index cf0b27c6c5b..3bbc8ad2669 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.1.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "v${version}"; - sha256 = "1pmi76vinwwn0bcxy5hj8pxhzqxdbzp0y3hsd631yyys01s0n6xd"; + sha256 = "sha256-rrkubNy60e/1VcGacYQang4yWxUzIBGySxZyq6G1arw="; }; nativeBuildInputs = [ packaging ]; From 684e9075ee19cd3e9ef1fdf9316e1fc8b4870ff1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:01 +0100 Subject: [PATCH 304/685] python3Packages.humanize: 3.13.1 -> 4.0.0 --- pkgs/development/python-modules/humanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index d0b2464608b..fa13cdab0c2 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "3.13.1"; + version = "4.0.0"; pname = "humanize"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jmoiron"; repo = pname; rev = version; - sha256 = "sha256-lgGBvYb3ciqETBOR31gxQVD7YyopTtmr++nCwvm63Zs="; + sha256 = "sha256-v4OdZmUI2LCick4qCSGOHJ7jtWybwKTeTeIcly+QQQQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 40cac59f12f162e3652ffb675d438962070a6c54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Mar 2022 00:14:38 +0100 Subject: [PATCH 305/685] python3Packages.hypothesis: 6.35.0 -> 6.38.0 --- pkgs/development/python-modules/hypothesis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 89aac153172..c928a13950c 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.35.0"; + version = "6.38.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "08wph7q3c08480ma2p7m7mamy0g7g7r5jqpwdyhdga4cfg734527"; + sha256 = "sha256-JLAM9gBf/Lh+UO7audy6V2jEPg5Cn4DR7moQV7VBwGc="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; From ceb3e9742217881c53631b1768f8b67b1c32c1c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:01 +0100 Subject: [PATCH 306/685] python3Packages.hyppo: 0.2.2 -> 0.3.2 --- pkgs/development/python-modules/hyppo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 61966bc7de7..b09d5bd565f 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hyppo"; - version = "0.2.2"; + version = "0.3.2"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "1wrzrppyjq0pc03bn6qcslxzcnwn7fr2z5lm71gfpli5k05i26nr"; + sha256 = "sha256-DQ5DrQrFBJ3dnGAjD1c/7GCJeR3g+aL2poR4hwOvmPA="; }; propagatedBuildInputs = [ From 8cae15829d38548fa1716aa8e52278b624905a13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:01 +0100 Subject: [PATCH 307/685] python3Packages.imageio: 2.14.1 -> 2.16.1 --- pkgs/development/python-modules/imageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 98495932fda..5a0d75acc02 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.14.1"; + version = "2.16.1"; disabled = isPy27; src = fetchPypi { - sha256 = "sha256-cJwY+ACYHkKGq+S9hrbJtbtuKFtrkztboJYu+OeZQFg="; + sha256 = "sha256-fxI8sjp3rFq+jtTnrWpggxqC3ixdEjRj3PHUJ4xHedI="; inherit pname version; }; From 06cae9aa956d76e6e775eb62a4065fd9ec785070 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:01 +0100 Subject: [PATCH 308/685] python3Packages.importlib-metadata: 4.11.0 -> 4.11.2 --- .../development/python-modules/importlib-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 3917742a55a..5a8ef5957a0 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.11.0"; + version = "4.11.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-nl5VO7uhhDy0oAgjAUuQdha+Ru5QPSuboAHSFKjaIY8="; + hash = "sha256-s2/6kl/jE5svb/EdaSX/1Pp7xHhwFl46wmCse0+R5qw="; }; nativeBuildInputs = [ From e31838f0e38a8893753cd23fe14b6f63f43d57bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:02 +0100 Subject: [PATCH 309/685] python3Packages.intbitset: 2.4.1 -> 3.0.0 --- .../python-modules/intbitset/default.nix | 25 +++++-------------- .../intbitset/remove-impure-tuning.patch | 24 ------------------ 2 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/intbitset/remove-impure-tuning.patch diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix index db98be8276c..798bdbbd251 100644 --- a/pkgs/development/python-modules/intbitset/default.nix +++ b/pkgs/development/python-modules/intbitset/default.nix @@ -1,36 +1,23 @@ { lib , fetchPypi , buildPythonPackage -, six -, nose +, pytestCheckHook }: + buildPythonPackage rec { pname = "intbitset"; - version = "2.4.1"; + version = "3.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "44bca80b8cc702d5a56f0686f2bb5e028ab4d0c2c1761941589d46b7fa2c701c"; + sha256 = "sha256-tDG3CAlTZvz9Pi2pLq0TEPhl3DyYuWQS1N6VNNNokEE="; }; - patches = [ - # fixes compilation on aarch64 and determinism (uses -march=core2 and - # -mtune=native) - ./remove-impure-tuning.patch - ]; - - propagatedBuildInputs = [ - six - ]; - checkInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - pythonImportsCheck = [ "intbitset" ]; diff --git a/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch b/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch deleted file mode 100644 index 4747b87b806..00000000000 --- a/pkgs/development/python-modules/intbitset/remove-impure-tuning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2ea60bdf4d7b0344fc6ff5c97c675842fedccfa8 Mon Sep 17 00:00:00 2001 -From: Cole Helbling -Date: Fri, 23 Apr 2021 09:02:22 -0700 -Subject: [PATCH] setup.py: remove impure tuning - ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 7840022..3922aa5 100644 ---- a/setup.py -+++ b/setup.py -@@ -48,7 +48,6 @@ setup( - ext_modules=[ - Extension("intbitset", - ["intbitset/intbitset.c", "intbitset/intbitset_impl.c"], -- extra_compile_args=['-O3', '-march=core2', '-mtune=native'] - # For debug -> '-ftree-vectorizer-verbose=2' - ) - ], --- -2.30.1 - From 7758d354c00b4495ef682ae383d3976f108f688b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:02 +0100 Subject: [PATCH 310/685] python3Packages.intensity-normalization: 2.1.4 -> 2.2.0 --- .../python-modules/intensity-normalization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 48260398f49..2cb4b51de2c 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.1.4"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e7b46039311bcbba40224d85eb07eefe1488bd8a6faa893a180e15e65c48b7f5"; + sha256 = "sha256-0tc21NBj3Cajklk9mWbKfBzbSwjUrBWs/SlakjEHC1U="; }; propagatedBuildInputs = [ From 5d4a480e6aecbe0ce06aaac50eb395424861868a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:02 +0100 Subject: [PATCH 311/685] python3Packages.ipykernel: 6.7.0 -> 6.9.1 --- pkgs/development/python-modules/ipykernel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 0827e611679..746babe0de4 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.7.0"; + version = "6.9.1"; src = fetchPypi { inherit pname version; - sha256 = "d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24"; + sha256 = "sha256-+VBwot/TFH+KsZ8Y7kZzMxCBN1hZN0XgfsGPsItAnx0="; }; propagatedBuildInputs = [ From 2f978e2731083bc78e42b35b2ee135d1f0f2f15f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:02 +0100 Subject: [PATCH 312/685] python3Packages.ipympl: 0.8.7 -> 0.8.8 --- pkgs/development/python-modules/ipympl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 3644442f7ad..08b41e62978 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.8.7"; + version = "0.8.8"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "11c3d01f0555f855c51a960964e3ab4dff38e6ccd1a4695205fe250341a9eb99"; + sha256 = "sha256-hkaK6q6MCigAfQx/bbuF8rbLmAUWfojU2qdSlWIAkVk="; }; From c161e7b47d1e9dc12588dcb5f7040c5b1d6b5b56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:02 +0100 Subject: [PATCH 313/685] python3Packages.ipython: 8.0.1 -> 8.1.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index c1c0b049dc8..24fd28a16f7 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.0.1"; + version = "8.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb"; + sha256 = "sha256-QsI+kLLequYxJmiF3hZWpRehZz1+HbV+jrOku2zVzhs="; }; buildInputs = [ From a07a720813299d99805a1cdc4116263abb9b6929 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:02 +0100 Subject: [PATCH 314/685] python3Packages.itsdangerous: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/itsdangerous/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index 35cdf8836a8..c2050c6f79c 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "itsdangerous"; - version = "2.0.1"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly"; + sha256 = "sha256-2Ej8uLx9UHxFRrRIV06KRPxOorqE6/jXgykNU+gZkvU="; }; checkInputs = [ From c09d0be8aac754a85371ca57ac2a8aa103f87af1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:02 +0100 Subject: [PATCH 315/685] python3Packages.jaraco.itertools: 6.0.3 -> 6.2.1 --- pkgs/development/python-modules/jaraco_itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 80b0349ed58..7c4d0d3bf12 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "6.0.3"; + version = "6.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1775bfcad5de275a540a36720c5ab34594ea1dbe7ffefa32099b0129c5604608"; + sha256 = "sha256-YJjts3xrgCPzeU1CWIoTv3WyygK0D/l5XIRry+DBtGw="; }; pythonNamespaces = [ "jaraco" ]; From 12eeeaa9614b9cc2364fc093f981b650a6472c6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:03 +0100 Subject: [PATCH 316/685] python3Packages.jaraco.text: 3.6.0 -> 3.7.0 --- pkgs/development/python-modules/jaraco_text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 054f68ba2f2..e1e82df89ea 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "901d3468eaaa04f1d8a8f141f54b8887bfd943ccba311fc1c1de62c66604dfe0"; + sha256 = "sha256-p/nMG0Sl8wlqIWy9EwtlDHprLJ+ABbAArpfzKSOafAA="; }; pythonNamespaces = [ From 4e3dc53bff0e3c9e5b509172481cdf50c423e3fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:03 +0100 Subject: [PATCH 317/685] python3Packages.jsondiff: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/jsondiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 0b6f0120981..fe41d0dd854 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsondiff"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5122bf4708a031b02db029366184a87c5d0ddd5a327a5884ee6cf0193e599d71"; + sha256 = "sha256-BM+uvUpeVziUirYVcQ3D7pjvvfhRJV/Tl3xMLuWecxI="; }; postPatch = '' From 12c9430438dbbe71f96aee803cc6f03f82a874fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:03 +0100 Subject: [PATCH 318/685] python3Packages.jsonpickle: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/jsonpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index a91e6b3accd..1ffbbdd5e89 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"; + sha256 = "sha256-hGhM/FM4pTQXPI3WmAnkDyhl0L4fiit6+EZeW5aNz6k="; }; checkInputs = [ pytest ]; From 677ef90a34123baed15c543ee0909d0aaf39d234 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:03 +0100 Subject: [PATCH 319/685] python3Packages.jupyter_client: 7.1.0 -> 7.1.2 --- pkgs/development/python-modules/jupyter-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 9cb46594755..23580f42bf5 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.1.0"; + version = "7.1.2"; src = fetchPypi { inherit pname version; - sha256 = "a5f995a73cffb314ed262713ae6dfce53c6b8216cea9f332071b8ff44a6e1654"; + sha256 = "sha256-TqYQM3Jsjlee21VibY7i5r8KgxWN3zdRuN1GssXNHpY="; }; propagatedBuildInputs = [ From 6add586341153c6a8fc8c33f8dbe1321e97c0795 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:03 +0100 Subject: [PATCH 320/685] python3Packages.jupyter_core: 4.9.1 -> 4.9.2 --- pkgs/development/python-modules/jupyter_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index a7dd89a1f89..e093706fa8e 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.9.1"; + version = "4.9.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa"; + sha256 = "sha256-1puuuf+xKLjNJlf88nA/icdp0Wc8hRgSEZ46Kg6TrZo="; }; checkInputs = [ pytest mock glibcLocales nose ]; From 4cede2b0393d45a1d6e41cf6dbbc91aa51aafad0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:03 +0100 Subject: [PATCH 321/685] python3Packages.jupyterlab-git: 0.34.1 -> 0.34.2 --- pkgs/development/python-modules/jupyterlab-git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 9d2907072e6..dc909f798da 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.34.1"; + version = "0.34.2"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "c7a03f526eb19175df73fedd5dee3cdae2d39e0474eef8f55c1c55b219ab26d9"; + sha256 = "sha256-WNBhuHF3rhAWZED4di9B9Loq+shRzpJuaAOOcND1YEE="; }; nativeBuildInputs = [ From b42b2c63846f27b2014b23952c1cc6114bdcf925 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:03 +0100 Subject: [PATCH 322/685] python3Packages.keras: 2.7.0 -> 2.8.0 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 2b9a269e280..dbdebefdb5a 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.7.0"; + version = "2.8.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "0c33ae1f728064ca0d35dfba999e9c316f03623bf5688c82fb83cc74a80ea248"; + sha256 = "sha256-dE053GV33NgP9KTUFUnpK3fWoX4O3VikMdMGVuKbyU4="; }; checkInputs = [ From 1a93d01619d19178d76c144f8f54949e57960196 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:03 +0100 Subject: [PATCH 323/685] python3Packages.labelbox: 3.11.1 -> 3.15.0 --- pkgs/development/python-modules/labelbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index c89782d4027..27f05d83aa0 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.11.1"; + version = "3.15.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; - rev = "v${version}"; - sha256 = "114h9phvbdknyvqdnjba3pd7i4iznffhgx9d569lq0hfla3hl61a"; + rev = "v.${version}"; + sha256 = "sha256-pJkDC/2EDPWbIw9WqV9kdYmr4X6apXtholzd0IYjgDg="; }; propagatedBuildInputs = [ From d47d87f9f9ad81bafb61e45605d22a08295fb6aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:04 +0100 Subject: [PATCH 324/685] python3Packages.lektor: 3.3.1 -> 3.3.2 --- pkgs/development/python-modules/lektor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index f88e14d0a3e..442dec03aee 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "lektor"; repo = "lektor"; rev = version; - sha256 = "04gn3jybqf9wc6l9mi0djpki60adnk7gppmv987ik676k5x8f1kk"; + sha256 = "sha256-PNHQ87aO+b1xseupIOsO7MXdr16s0gjoHGnZhPlKKRY="; }; propagatedBuildInputs = [ From 7ed8ac06d1aae3ae78303342b4271b6ff6d968cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:04 +0100 Subject: [PATCH 325/685] python3Packages.levenshtein: 0.17.0 -> 0.18.1 --- pkgs/development/python-modules/levenshtein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 64a9a3b5e99..e5f743e0fe1 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.17.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "v${version}"; - sha256 = "1a14cw2314jb5lrm979zipzk3av4630lxdr4jzj2wl5qh3yw4w52"; + sha256 = "sha256-3p9LM4tv45bqeTsuyngivqfd5uml7uqGB2ICKqPa0qY="; }; postPatch = '' From ff86d0fed55fec87533fffc5e6d7096fdeb7e8b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:04 +0100 Subject: [PATCH 326/685] python3Packages.libcst: 0.3.23 -> 0.4.1 --- .../python-modules/libcst/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 774cb572e95..ebbc17c6ea8 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -5,10 +5,12 @@ , fetchFromGitHub , hypothesis , isort -, pytest +, pytestCheckHook , python , pythonOlder , pyyaml +, rustPlatform +, setuptools-rust , setuptools-scm , typing-extensions , typing-inspect @@ -16,8 +18,8 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.23"; - format = "setuptools"; + version = "0.4.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,9 +27,18 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "1r4aiqpndqa75119faknsghi7zxyjrx5r6i7cb3d0liwiqrkzrvx"; + sha256 = "sha256-soAlt1KBpCn5JxM1b2LZ3vOpBn9HPGdbm+BBYbyEkfE="; }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "source/${cargoRoot}"; + name = "${pname}-${version}"; + hash = "sha256:1rz1c0dv3f1h2m5hwdisl3rbqnmifbva4f0c4vygk7rh1q27l515"; + }; + + cargoRoot = "native"; + postPatch = '' # test try to format files, which isn't necessary when consuming releases sed -i libcst/codegen/generate.py \ @@ -37,8 +48,10 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools-rust setuptools-scm - ]; + rustPlatform.cargoSetupHook + ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); propagatedBuildInputs = [ hypothesis @@ -52,7 +65,7 @@ buildPythonPackage rec { checkInputs = [ black isort - pytest + pytestCheckHook ]; preCheck = '' From aadf6d7ea09769827cbc238ed6c258813711c864 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:04 +0100 Subject: [PATCH 327/685] python3Packages.libevdev: 0.9 -> 0.10 --- pkgs/development/python-modules/libevdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index 4a4ba489e0a..494e887c79b 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "libevdev"; - version = "0.9"; + version = "0.10"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "17agnigmzscmdjqmrylg1lza03hwjhgxbpf4l705s6i7p7ndaqrs"; + sha256 = "sha256-9LM2Ftr6qmQYysCxso+XJSthwJdOU01J+yL8ZWbtwRM="; }; patches = [ From 0036e6929572a84f8bd93c0cc8ed38cb06f3bf06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:04 +0100 Subject: [PATCH 328/685] python3Packages.limits: 2.2.0 -> 2.3.3 --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 9a19dda1578..47738b23dc4 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "2.2.0"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "da6346f0dcf85f17f0f1cc709c3408a3058cf6fee68313c288127c287237b411"; + sha256 = "sha256-1CcNKVkcxezqsZvgU0VaTmGbo5UGJQK94rVoGvfcG+g="; }; propagatedBuildInputs = [ six ]; From 6a0eefa743a6a52fe38cf6a5bc02d9169fa82bfb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:04 +0100 Subject: [PATCH 329/685] python3Packages.lxml: 4.7.1 -> 4.8.0 --- pkgs/development/python-modules/lxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 2c549b6830a..3ef230eb8e8 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.7.1"; + version = "4.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "lxml-${version}"; - sha256 = "0xji4kcw1fl3nqg04q6zlympkx2kv2s1r1p18763dshgpisqgiq4"; + sha256 = "sha256-ppyLn8B0YFQivRCOE8TjKGdDDQHbb7UdTUkevznoVC8="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs From a253b0d20a13ad28646cfdbfd1783d38b22f9bbb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:05 +0100 Subject: [PATCH 330/685] python3Packages.python-lz4: 3.1.12 -> 4.0.0 --- pkgs/development/python-modules/lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index 9e2cc9b31e1..bca476484c4 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "3.1.12"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-fqt9aJGqZpfbiYtU8cmm7UQaixZwbTKFBwRfR1B/qic="; + sha256 = "sha256-9gp67i2fotvFOpkaQZ82/YKnDEs3DnzXfuNCVRJg88I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d07d9cae26f20ea7ae985bd549e48695567feefd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:05 +0100 Subject: [PATCH 331/685] python3Packages.magicgui: 0.3.0 -> 0.3.7 --- pkgs/development/python-modules/magicgui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index 03ca9d79159..28fa4c9c4e2 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -11,12 +11,12 @@ , docstring-parser }: buildPythonPackage rec { pname = "magicgui"; - version = "0.3.0"; + version = "0.3.7"; src = fetchFromGitHub { owner = "napari"; repo = "magicgui"; rev = "v${version}"; - sha256 = "sha256-DvL1szk2RoCrpisjp0BVNL6qFZtYc2oYDenX59Cxbug="; + sha256 = "sha256-LYXNNr5lS3ibQk2NIopZkB8kzC7j3yY8moGMk0Gr+hU="; }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; From b5bc91804315742f173781655e34ee39a43af6bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:05 +0100 Subject: [PATCH 332/685] python3Packages.manticore: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/manticore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix index 0c36f2cc6cc..2e1bff7e21e 100644 --- a/pkgs/development/python-modules/manticore/default.nix +++ b/pkgs/development/python-modules/manticore/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "manticore"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "trailofbits"; repo = "manticore"; rev = version; - sha256 = "sha256-L112YwrBcdcLBeBsPLWt3C57u2WDvGLq50EzW9ojdyg="; + sha256 = "sha256-+17VBfAtkZZIi3SF5Num1Uqg3WjIpgbz3Jx65rD5zkM="; }; propagatedBuildInputs = [ From 805d0a2c99d0c28f5ec8c9a61077e01bdaf65432 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:05 +0100 Subject: [PATCH 333/685] python3Packages.markupsafe: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/markupsafe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index 12845da7e37..b0f876ef3e8 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "2.0.1"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "MarkupSafe"; inherit version; - sha256 = "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r"; + sha256 = "sha256-gL6vY937xkoEUrhB2ANsoGEeBJZQ4gr8uIL108Jm1l8="; }; checkInputs = [ From 794822a191b9f48b9955fec06833197559356d0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:05 +0100 Subject: [PATCH 334/685] python3Packages.meshio: 5.2.2 -> 5.3.2 --- pkgs/development/python-modules/meshio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 54f8431ba27..7c7b67a0739 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "5.2.2"; + version = "5.3.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "209885ac31b00155e43c27859d1aff0ba7f97f319ee7bed453a8b9e1677a4e52"; + sha256 = "sha256-L1YNRAgoHBvf8SsM++J+k1UNciIw91W1s6IA26I/bYw="; }; propagatedBuildInputs = [ From ca2577b8fa49483f293b65ffece002ab6f624d28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:06 +0100 Subject: [PATCH 335/685] python3Packages.Mezzanine: 5.1.0 -> 5.1.3 --- pkgs/development/python-modules/mezzanine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 2c78575d370..83085d76a36 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -20,12 +20,12 @@ }: buildPythonPackage rec { - version = "5.1.0"; + version = "5.1.3"; pname = "Mezzanine"; src = fetchPypi { inherit pname version; - sha256 = "ce1117c81416d2e0a77981419312e200aec1cf3cb3ea9630083bd29e74bbb265"; + sha256 = "sha256-G/Oj5g70tFUhnbSVElVk0s9Ka+MEuPsEgj6blcFBOoY="; }; disabled = isPyPy || lib.versionOlder django.version "1.11" From 36cd8367b973c34fd3e6f022dab812e359a5070c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:06 +0100 Subject: [PATCH 336/685] python3Packages.minio: 7.1.2 -> 7.1.4 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 477ed47e9dd..5b142406fab 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.2"; + version = "7.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = version; - sha256 = "sha256-KluSdmhpSSqUTLVdFpIGwre7LOu3A16rt73FvaTmuz8="; + sha256 = "sha256-IzITqo23pRf83SFpnBZdryGHIsxh+7HrLVLM9CT5nQQ="; }; propagatedBuildInputs = [ From 8441eba18ff0e2316d2d25cf66e32525d682ea62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:06 +0100 Subject: [PATCH 337/685] python3Packages.mlflow: 1.23.1 -> 1.24.0 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index add6ee40de4..49d6bd7a324 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.23.1"; + version = "1.24.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "03rfyhli7vbb1pz0zw75mdwj9pz3awxi3dadxn5glpwn953w6r5y"; + sha256 = "sha256-6hZwiOuHtB8RFwgyfPeV8plLBPlnAdVP1f1bNah4en4="; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config From 4de81a0b283bd184f8ec333ed7b3ff88861c4a16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:06 +0100 Subject: [PATCH 338/685] python3Packages.mongoengine: 0.23.1 -> 0.24.0 --- pkgs/development/python-modules/mongoengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index d609f465e27..b282332188b 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.23.1"; + version = "0.24.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "1lj33pgdrp4rvjzcg2glvz1f87np1pfnqhlwbdcijav9rxqc0w70"; + sha256 = "sha256-BQSB4SGlejARFreeTfqFMzCWvBc6Vvq9EOMLjhAihdI="; }; propagatedBuildInputs = [ From 8c84c40502e09508ecbda266653128e7cee6ef53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:06 +0100 Subject: [PATCH 339/685] python3Packages.moonraker-api: 2.0.4 -> 2.0.5 --- pkgs/development/python-modules/moonraker-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index 9f6ca7e91a7..50ba81d6d52 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "moonraker-api"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = pname; rev = "v${version}"; - sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61"; + sha256 = "sha256-PgFsXmdAmHXK0wZ6xLTu94RdME1L2H1Mb6V+qFlGXSk="; }; postPatch = '' From 02b065dcdc2bb6e82be4bbf09f6040e181b7bda8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:06 +0100 Subject: [PATCH 340/685] python3Packages.moto: 3.0.2 -> 3.0.5 --- .../python-modules/moto/default.nix | 272 ++++-------------- 1 file changed, 59 insertions(+), 213 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 1d9d0774379..f920a06488a 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,269 +1,115 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# runtime , aws-xray-sdk -, backports_tempfile , boto3 , botocore , cfn-lint +, cryptography , docker , flask , flask-cors -, freezegun +, graphql-core +, idna , jinja2 , jsondiff -, mock -, pyaml +, python-dateutil , python-jose , pytz +, pyyaml , requests , responses -, six , sshpubkeys -, sure , werkzeug , xmltodict -, parameterized -, idna -, nose + +# tests +, freezegun , pytestCheckHook , pytest-xdist +, sure }: buildPythonPackage rec { pname = "moto"; - version = "3.0.2"; + version = "3.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vZ1oofOYUkFETDFKwSmifvvn+bCi/6NQAxu950NYk5k="; + sha256 = "sha256-hfLs4K0DBaoTo5E5zmSKs6/hwEyzKsHbjV5ekRfU0Q4="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "ecdsa<0.15" "ecdsa" \ - --replace "idna<3,>=2.5" "idna" \ - --replace "MarkupSafe<2.0" "MarkupSafe" \ - ''; - propagatedBuildInputs = [ aws-xray-sdk boto3 botocore cfn-lint + cryptography docker - flask # required for server + flask + flask-cors + graphql-core + idna jinja2 jsondiff - mock - pyaml + python-dateutil python-jose pytz - six + pyyaml requests responses sshpubkeys werkzeug xmltodict - idna - ] ++ lib.optionals isPy27 [ backports_tempfile ]; + ]; checkInputs = [ - boto3 - flask-cors freezegun - parameterized - pytestCheckHook pytest-xdist + pytestCheckHook sure ]; - # Multiple test files still import boto, rather than boto3 like - # boto is long-deprecated and broken on python3.9 - # https://github.com/spulec/moto/blob/63ce647123755e4c4693a89f52c254596004c098/tests/test_autoscaling/test_autoscaling.py#L2 - # NOTE: This should change to use disabledTestFiles / disabledTestPaths once that - # feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700 pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" - "--ignore=tests/test_awslambda/test_policy.py" - "--ignore=tests/test_autoscaling/test_autoscaling.py" - "--ignore=tests/test_autoscaling/test_cloudformation.py" - "--ignore=tests/test_autoscaling/test_elbv2.py" - "--ignore=tests/test_autoscaling/test_launch_configurations.py" - "--ignore=tests/test_autoscaling/test_policies.py" - "--ignore=tests/test_autoscaling/test_server.py" - "--ignore=tests/test_awslambda/test_lambda.py" - "--ignore=tests/test_awslambda/test_lambda_cloudformation.py" - "--ignore=tests/test_batch/test_cloudformation.py" - "--ignore=tests/test_batch/test_server.py" - "--ignore=tests/test_cloudformation/test_cloudformation_depends_on.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py" - "--ignore=tests/test_cloudformation/test_cloudformation_stack_integration.py" - "--ignore=tests/test_cloudformation/test_stack_parsing.py" - "--ignore=tests/test_cloudformation/test_validate.py" - "--ignore=tests/test_cloudwatch/test_cloudwatch.py" - "--ignore=tests/test_cognitoidentity/test_server.py" - "--ignore=tests/test_config/test_config.py" - "--ignore=tests/test_core/test_auth.py" - "--ignore=tests/test_core/test_decorator_calls.py" - "--ignore=tests/test_core/test_nested.py" - "--ignore=tests/test_core/test_server.py" - "--ignore=tests/test_datapipeline/test_datapipeline.py" - "--ignore=tests/test_datapipeline/test_server.py" - "--ignore=tests/test_datasync/test_datasync.py" - "--ignore=tests/test_dynamodb/test_dynamodb.py" - "--ignore=tests/test_dynamodb/test_dynamodb_table_with_range_key.py" - "--ignore=tests/test_dynamodb/test_dynamodb_table_without_range_key.py" - "--ignore=tests/test_dynamodb/test_server.py" - "--ignore=tests/test_dynamodb2/test_dynamodb.py" - "--ignore=tests/test_dynamodb2/test_dynamodb_table_with_range_key.py" - "--ignore=tests/test_dynamodb2/test_dynamodb_table_without_range_key.py" - "--ignore=tests/test_dynamodb2/test_server.py" - "--ignore=tests/test_ec2/test_amazon_dev_pay.py" - "--ignore=tests/test_ec2/test_amis.py" - "--ignore=tests/test_ec2/test_availability_zones_and_regions.py" - "--ignore=tests/test_ec2/test_customer_gateways.py" - "--ignore=tests/test_ec2/test_dhcp_options.py" - "--ignore=tests/test_ec2/test_elastic_block_store.py" - "--ignore=tests/test_ec2/test_elastic_ip_addresses.py" - "--ignore=tests/test_ec2/test_elastic_network_interfaces.py" - "--ignore=tests/test_ec2/test_general.py" - "--ignore=tests/test_ec2/test_instances.py" - "--ignore=tests/test_ec2/test_internet_gateways.py" - "--ignore=tests/test_ec2/test_ip_addresses.py" - "--ignore=tests/test_ec2/test_key_pairs.py" - "--ignore=tests/test_ec2/test_monitoring.py" - "--ignore=tests/test_ec2/test_network_acls.py" - "--ignore=tests/test_ec2/test_placement_groups.py" - "--ignore=tests/test_ec2/test_regions.py" - "--ignore=tests/test_ec2/test_reserved_instances.py" - "--ignore=tests/test_ec2/test_route_tables.py" - "--ignore=tests/test_ec2/test_security_groups.py" - "--ignore=tests/test_ec2/test_spot_instances.py" - "--ignore=tests/test_ec2/test_subnets.py" - "--ignore=tests/test_ec2/test_tags.py" - "--ignore=tests/test_ec2/test_virtual_private_gateways.py" - "--ignore=tests/test_ec2/test_vm_export.py" - "--ignore=tests/test_ec2/test_vm_import.py" - "--ignore=tests/test_ec2/test_vpc_peering.py" - "--ignore=tests/test_ec2/test_vpcs.py" - "--ignore=tests/test_ec2/test_vpn_connections.py" - "--ignore=tests/test_ec2/test_vpn_connections.py" - "--ignore=tests/test_ec2/test_windows.py" - "--ignore=tests/test_ecs/test_ecs_boto3.py" - "--ignore=tests/test_elb/test_elb.py" - "--ignore=tests/test_elb/test_server.py" - "--ignore=tests/test_elbv2/test_elbv2.py" - "--ignore=tests/test_elbv2/test_server.py" - "--ignore=tests/test_emr/test_emr.py" - "--ignore=tests/test_emr/test_server.py" - "--ignore=tests/test_glacier/test_glacier_archives.py" - "--ignore=tests/test_glacier/test_glacier_jobs.py" - "--ignore=tests/test_glacier/test_glacier_vaults.py" - "--ignore=tests/test_iam/test_iam.py" - "--ignore=tests/test_iam/test_iam_cloudformation.py" - "--ignore=tests/test_iam/test_iam_groups.py" - "--ignore=tests/test_iam/test_server.py" - "--ignore=tests/test_iot/test_server.py" - "--ignore=tests/test_iotdata/test_server.py" - "--ignore=tests/test_kinesis/test_kinesis.py" - "--ignore=tests/test_kinesis/test_kinesis_cloudformation.py" - "--ignore=tests/test_kinesis/test_server.py" - "--ignore=tests/test_kinesisvideo/test_server.py" - "--ignore=tests/test_kinesisvideoarchivedmedia/test_server.py" - "--ignore=tests/test_kms/test_kms.py" - "--ignore=tests/test_kms/test_server.py" - "--ignore=tests/test_kms/test_utils.py" - "--ignore=tests/test_logs/test_logs.py" - "--ignore=tests/test_polly/test_server.py" - "--ignore=tests/test_rds/test_rds.py" - "--ignore=tests/test_rds/test_server.py" - "--ignore=tests/test_rds2/test_server.py" - "--ignore=tests/test_redshift/test_redshift.py" - "--ignore=tests/test_redshift/test_server.py" - "--ignore=tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py" - "--ignore=tests/test_route53/test_route53.py" - "--ignore=tests/test_s3/test_s3.py" - "--ignore=tests/test_s3/test_s3_cloudformation.py" - "--ignore=tests/test_s3/test_s3_lifecycle.py" - "--ignore=tests/test_s3/test_s3_storageclass.py" - "--ignore=tests/test_s3/test_s3_utils.py" - "--ignore=tests/test_s3bucket_path/test_s3bucket_path.py" - "--ignore=tests/test_s3bucket_path/test_s3bucket_path_combo.py" - "--ignore=tests/test_secretsmanager/test_server.py" - "--ignore=tests/test_ses/test_server.py" - "--ignore=tests/test_ses/test_ses.py" - "--ignore=tests/test_ses/test_ses_boto3.py" - "--ignore=tests/test_ses/test_ses_sns_boto3.py" - "--ignore=tests/test_sns/test_application.py" - "--ignore=tests/test_sns/test_application_boto3.py" - "--ignore=tests/test_sns/test_publishing.py" - "--ignore=tests/test_sns/test_publishing_boto3.py" - "--ignore=tests/test_sns/test_server.py" - "--ignore=tests/test_sns/test_subscriptions.py" - "--ignore=tests/test_sns/test_subscriptions_boto3.py" - "--ignore=tests/test_sns/test_topics.py" - "--ignore=tests/test_sns/test_topics_boto3.py" - "--ignore=tests/test_sqs/test_server.py" - "--ignore=tests/test_sqs/test_sqs.py" - "--ignore=tests/test_ssm/test_ssm_boto3.py" - "--ignore=tests/test_ssm/test_ssm_docs.py" - "--ignore=tests/test_sts/test_server.py" - "--ignore=tests/test_sts/test_sts.py" - "--ignore=tests/test_swf/models/test_activity_task.py" - "--ignore=tests/test_swf/models/test_decision_task.py" - "--ignore=tests/test_swf/models/test_timeout.py" - "--ignore=tests/test_swf/models/test_workflow_execution.py" - "--ignore=tests/test_swf/responses/test_activity_tasks.py" - "--ignore=tests/test_swf/responses/test_activity_types.py" - "--ignore=tests/test_swf/responses/test_decision_tasks.py" - "--ignore=tests/test_swf/responses/test_domains.py" - "--ignore=tests/test_swf/responses/test_timeouts.py" - "--ignore=tests/test_swf/responses/test_workflow_executions.py" - "--ignore=tests/test_swf/responses/test_workflow_types.py" - # attempts web connections - "--ignore=tests/test_appsync/test_appsync_schema.py" - "--ignore=tests/test_awslambda/test_lambda_eventsourcemapping.py" - "--ignore=tests/test_awslambda/test_lambda_invoke.py" - "--ignore=tests/test_batch/test_batch_jobs.py" - "--ignore=tests/**/*_integration.py" + "--numprocesses $NIX_BUILD_CORES" + + # Disable tests that try to access the network + "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed" + "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" + "--deselect=tests/test_core/test_decorator_calls.py::test_context_manager" + "--deselect=tests/test_core/test_decorator_calls.py::test_decorator_start_and_stop" + "--deselect=tests/test_core/test_request_mocking.py::test_passthrough_requests" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" + "--deselect=tests/test_logs/test_integration.py::test_put_subscription_filter_with_lambda" + "--deselect=tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception" + "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception" + "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names" + "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination" + + # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) + "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" + ]; + + disabledTestPaths = [ + # xml.parsers.expat.ExpatError: out of memory: line 1, column 0 + "tests/test_sts/test_sts.py" + # botocore.exceptions.NoCredentialsError: Unable to locate credentials + "tests/test_redshiftdata/test_redshiftdata.py" + # Tries to access the network + "tests/test_appsync/test_appsync_schema.py" + "tests/test_awslambda/test_lambda_eventsourcemapping.py" + "tests/test_awslambda/test_lambda_invoke.py" + "tests/test_batch/test_batch_jobs.py" ]; disabledTests = [ - # these tests rely on the network - "test_server" - "test_managedblockchain_nodes" - "test_swf" - "test_simple_instance" - "test_passthrough_requests" - "test_s3_server_get" - "test_s3_server_bucket_create" - "test_s3_server_post_to_bucket" - "test_s3_server_put_ipv6" - "test_s3_server_put_ipv4" - "test_http_proxying_integration" - "test_submit_job_by_name" - "test_submit_job" - "test_list_jobs" - "test_terminate_job" - "test_idtoken_contains_kid_header" - "test_latest_meta_data" - "test_meta_data_iam" - "test_meta_data_security_credentials" - "test_meta_data_default_role" - "test_reset_api" - "test_data_api" - "test_requests_to_amazon_subdomains_dont_work" - "test_get_records_seq" - "test_stream_with_range_key" - "test_create_notebook_instance_bad_volume_size" - "http_destination" - "test_invoke_function_from_sqs_exception" - "test_state_machine_list_executions_with_pagination" - "test_put_subscription_filter_with_lambda" - "test_create_custom_lambda_resource__verify_cfnresponse_failed" - "test_state_machine_creation_fails_with_invalid_names" - # needs graphql - "test_get_schema_creation_status" # only appears in aarch64 currently, but best to be safe "test_state_machine_list_executions_with_filter" ]; From 9e7a04d528fbda4ee472864059f56d3e7d42759b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:06 +0100 Subject: [PATCH 341/685] python3Packages.msal-extensions: 0.3.1 -> 1.0.0 --- pkgs/development/python-modules/msal-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index f81395f0245..a811018da21 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "0.3.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d9029af70f2cbdc5ad7ecfed61cb432ebe900484843ccf72825445dbfe62d311"; + sha256 = "sha256-xnarpWsMzjeD3htcXs/oKNuZgWeHUSbKS0fcZDZFE1Q="; }; propagatedBuildInputs = [ From 25a12606cb6d9b20618c98db55bcbf7a6a0cc6bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:06 +0100 Subject: [PATCH 342/685] python3Packages.multidict: 5.2.0 -> 6.0.2 --- pkgs/development/python-modules/multidict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 0ea21ecbe40..6ee07173269 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "multidict"; - version = "5.2.0"; + version = "6.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce"; + sha256 = "sha256-X/O9dfOOTEPx9HDy33pNQwuCHEziK+OE4UWctX1rsBM="; }; postPatch = '' From 2f6d2ddd8fe028ca9c75c459989a32fec5bee971 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:07 +0100 Subject: [PATCH 343/685] python3Packages.napari: 0.4.12 -> 0.4.14 --- pkgs/development/python-modules/napari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 74936da4f72..babdbc4506d 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -28,12 +28,12 @@ , wrapQtAppsHook }: mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.12"; + version = "0.4.14"; src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0QSI0mgDjF70/X58fE7uWwlBUCGY5gsvbCm4oJkp2Yk="; + sha256 = "sha256-uDDj5dzsT4tRVV0Y+CYegiCpLM77XFaXEXEZXTnX808="; }; nativeBuildInputs = [ setuptools-scm wrapQtAppsHook ]; propagatedBuildInputs = [ From 5149a984728494deafe6980223abd14d156af8ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:07 +0100 Subject: [PATCH 344/685] python3Packages.nbclient: 0.5.10 -> 0.5.11 --- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index c5e3facc062..52478ad4fd6 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.10"; + version = "0.5.11"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088"; + sha256 = "sha256-dRUWmS80tYFyutVO7x5L9+T0Rg1Y4lXKGk5clklHYAc="; }; inherit doCheck; From 2d2285e9415f440e09b718f6ccb2ba378a86e897 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:07 +0100 Subject: [PATCH 345/685] python3Packages.nbconvert: 6.4.0 -> 6.4.2 --- pkgs/development/python-modules/nbconvert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index ab91f22acc4..8604698cc2a 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.4.0"; + version = "6.4.2"; src = fetchPypi { inherit pname version; - sha256 = "5412ec774c6db4fccecb8c4ba07ec5d37d6dcf5762593cb3d6ecbbeb562ebbe5"; + sha256 = "sha256-6ygD2xj2+szmvzsBtoT+R5B5lL0VbRXqzN8BHj1/gWQ="; }; # Add $out/share/jupyter to the list of paths that are used to search for From 5823c6720ea43ff732850052d8cc2de81cadefda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:07 +0100 Subject: [PATCH 346/685] python3Packages.net2grid: 3.0.0 -> 4.0.0 --- pkgs/development/python-modules/net2grid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/net2grid/default.nix b/pkgs/development/python-modules/net2grid/default.nix index 05b5321a69c..ef03d45ab6b 100644 --- a/pkgs/development/python-modules/net2grid/default.nix +++ b/pkgs/development/python-modules/net2grid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "net2grid"; - version = "3.0.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-net2grid"; rev = "v${version}"; - hash = "sha256-nT9qMv4Zr7SjNwHRN3HRR11yl+Oue8VVCfJr2n1D02Q="; + hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; }; nativeBuildInputs = [ From 018a61d48cb3bde374e5ec81b1b7d07f66b10152 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:07 +0100 Subject: [PATCH 347/685] python3Packages.networkx: 2.6.3 -> 2.7 --- pkgs/development/python-modules/networkx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index e8769f9efc7..c876c0d549d 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.6.3"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51"; + sha256 = "sha256-7/t9nNXDbh4NM/QqOu9brd5QMFNYJqNn1c9gihcK9RU="; }; propagatedBuildInputs = [ decorator setuptools ]; From 49ff3d9ed6e77cea11419420e65423f54aac3916 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:07 +0100 Subject: [PATCH 348/685] python3Packages.nilearn: 0.8.1 -> 0.9.0 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index c79ea52f558..4b8668f6127 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a0489940855130f35bbc4cac0750479a6f82025215ea7b1d778faca064219298"; + sha256 = "sha256-+cjjCt71FImRCux3JLVpneF4Qn065jhz2tmyPdMh/nY="; }; checkInputs = [ pytestCheckHook ]; From 1b084308a570ea8737a4b76c1607e6dbfb8819f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:08 +0100 Subject: [PATCH 349/685] python3Packages.notebook: 6.4.7 -> 6.4.8 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 7a1902cb211..586257a4f8d 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.7"; + version = "6.4.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a"; + sha256 = "sha256-Hphcncb2eL3/+53GVzBrVGm/pi1z4D906N77920oQxI="; }; LC_ALL = "en_US.utf8"; From 1c64dd01ef2b6ce467e5a14e2fff93b8bf20d3b5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:08 +0100 Subject: [PATCH 350/685] python3Packages.numba: 0.55.0 -> 0.55.1 --- pkgs/development/python-modules/numba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 8bead014e34..d2204b34fb6 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.55.0"; + version = "0.55.1"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0="; + sha256 = "sha256-A+kGmiZm0chPk7ANvXFvuP7d6Lssbvr6LwSEKkZELqM="; }; postPatch = '' From d78bad227728cc22cfab005a5ec6330596e6daaf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:08 +0100 Subject: [PATCH 351/685] python3Packages.numpy: 1.21.5 -> 1.22.2 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 2fbe1a7a694..6ecad79b7f2 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -44,7 +44,7 @@ in buildPythonPackage rec { # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so # build both to verify they don't break. # https://github.com/scipy/scipy/issues/15414 - version = "1.21.5"; + version = "1.22.2"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; @@ -52,7 +52,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-alkovGJBJk3OXtUJ5m8zZ2/Jf0ZOepGe3GcvtVMiIe4="; + sha256 = "sha256-B2ruWjdj1B2mvvlWX988uYdgb1Z82LEEre0rOLe0er8="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 6b0f91baf92c5964f28e8fd5784a8be6aef3fde7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:08 +0100 Subject: [PATCH 352/685] python3Packages.numpydoc: 1.1.0 -> 1.2 --- pkgs/development/python-modules/numpydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 0f57847b3a6..ea092d01dd4 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.1.0"; + version = "1.2"; disabled = isPy27; src = fetchPypi { inherit pname; inherit version; - sha256 = "c36fd6cb7ffdc9b4e165a43f67bf6271a7b024d0bb6b00ac468c9e2bfc76448e"; + sha256 = "sha256-DOwjN0DGsSWRMAXRboqZluBgUor8uLfK0/JwZinf1vc="; }; checkInputs = [ nose pytest ]; From 955e58dd9f930da369cc972afbb1a2b55c526414 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:08 +0100 Subject: [PATCH 353/685] python3Packages.nunavut: 1.6.2 -> 1.7.3 --- pkgs/development/python-modules/nunavut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index f4cc9d3140e..5b974c9b6af 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.6.2"; + version = "1.7.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "c6f99eaa65935b2c8a3f004025fb3c0309e11655c391d0fcd318d2a8665ca5c4"; + sha256 = "sha256-Tj3zCKDM4IBH9BKonhW9gPFD+lE3Q570Lxfm6b/d5JU="; }; propagatedBuildInputs = [ From a507224cdbd6f75213602c705f327ad6945122f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:09 +0100 Subject: [PATCH 354/685] python3Packages.oci: 2.56.0 -> 2.59.0 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 8da783dbdb2..2ae55df278f 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.56.0"; + version = "2.59.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-olrWv4c2DoZ7ddm58Wpb5jZntw8WEKJ6IzAND11tdjk="; + hash = "sha256-qejmfyTdJcJwo30lulF3V0SOUXb8HjD4OcR5LcDRTmo="; }; propagatedBuildInputs = [ From f232fd3335b0ab46f21fd560dc21ffea037d8876 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:09 +0100 Subject: [PATCH 355/685] python3Packages.onnx: 1.10.2 -> 1.11.0 --- pkgs/development/python-modules/onnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index d32b82365dc..e873f325608 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.10.2"; + version = "1.11.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-JNc8p9/X5sczmUT4lVS0AQcZiZM3kk/KFEfY8bXbUNY="; + sha256 = "sha256-7KIkx8LI7kByoHQ+SJioSpvfgpe15ZEKJjLkxBgv+yo="; }; nativeBuildInputs = [ From dae4b932963452278db6ce5e57fa347c401ef147 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:09 +0100 Subject: [PATCH 356/685] python3Packages.openapi-schema-validator: 0.2.0 -> 0.2.3 --- .../python-modules/openapi-schema-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 8251c2cd017..ced5f8ed68b 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.2.0"; + version = "0.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = version; - sha256 = "sha256-HoXtDlXOoYqzsM4FxVfLQdIlpJXaNUcQo8//B4JqJoA="; + sha256 = "sha256-rgl2B55dnbpZszr+gWM0FgeXMKfrkDG7HeZBSw5Eles="; }; nativeBuildInputs = [ From 15c952bf44bc0007038be7c545d246e38ca4cb1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:09 +0100 Subject: [PATCH 357/685] python3Packages.openapi-spec-validator: 0.3.1 -> 0.4.0 --- .../python-modules/openapi-spec-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 4e61a86a501..3bd5c4e8916 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.3.1"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "3d70e6592754799f7e77a45b98c6a91706bdd309a425169d17d8e92173e198a2"; + sha256 = "sha256-l/JYhQr8l7BI98JlOFXg+I+masEDwr5Qd8eWCsoq1Jo="; }; propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] From c49500456e82c1b1aae53fa4b0154bae2fee5bf4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:09 +0100 Subject: [PATCH 358/685] python3Packages.openshift: 0.12.1 -> 0.13.1 --- pkgs/development/python-modules/openshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix index 78e0c53c911..c233f88c73f 100644 --- a/pkgs/development/python-modules/openshift/default.nix +++ b/pkgs/development/python-modules/openshift/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "openshift"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "openshift"; repo = "openshift-restclient-python"; rev = "v${version}"; - sha256 = "1di55xg3nl4dwrrfw314p4mfm6593kdi7ia517v1sm6x5p4hjl78"; + sha256 = "sha256-9mMHih2xuQve8hEnc5x4f9Pd4wX7IMy3vrxxGFCG+8o="; }; postPatch = '' From 64af180db041d6c8f73cefbdda02a79515e2e45f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:09 +0100 Subject: [PATCH 359/685] python3Packages.ordered-set: 4.0.2 -> 4.1.0 --- .../python-modules/ordered-set/default.nix | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index 7546566cb3a..8ea71fd2d90 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -1,24 +1,39 @@ -{ buildPythonPackage, fetchPypi, lib, isPy27, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, flit-core +, pytestCheckHook +}: buildPythonPackage rec { pname = "ordered-set"; - version = "4.0.2"; - disabled = isPy27; + version = "4.1.0"; + format = "pyproject"; - checkInputs = [ pytest ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "159syfbqnwqnivzjfn3x7ak3xwrxmnzbji7c2qhj1jjv0pgv54xs"; + sha256 = "sha256-aUqORMh2V8WSku3nKJHrkdNBMfZTFGOqswCRkcdzZKg="; }; - checkPhase = '' - py.test test.py - ''; + nativeBuildInputs = [ + flit-core + ]; - meta = { + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ordered_set" + ]; + + meta = with lib; { description = "A MutableSet that remembers its order, so that every entry has an index."; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.MostAwesomeDude ]; + homepage = "https://github.com/rspeer/ordered-set"; + license = licenses.mit; + maintainers = with maintainers; [ MostAwesomeDude ]; }; } From 378934298fea9b899b62caa558fcc6fc901a3f5f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:10 +0100 Subject: [PATCH 360/685] python3Packages.oslo.context: 3.4.0 -> 4.1.0 --- pkgs/development/python-modules/oslo-context/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index f38b9bb09b3..7f5fa9b98ca 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "oslo.context"; - version = "3.4.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "970f96361c5de9a5dc86d48a648289d77118180ca13ba5eeb307137736ffa953"; + sha256 = "sha256-damnIqVS+6ionooBAo+oKmGQqzF6lZG7gzA6IhCnkUQ="; }; postPatch = '' From 398be2e2b2c28f2edc949e61ad896ef8726a90ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:10 +0100 Subject: [PATCH 361/685] python3Packages.packageurl-python: 0.9.8.1 -> 0.9.9 --- pkgs/development/python-modules/packageurl-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 5236cc7bbf8..c2d74d0d3c1 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.9.8.1"; + version = "0.9.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z14OyAWPoIN6BAUEcXi96mp9C0aWaYP6eeHAoa+rHJ4="; + sha256 = "sha256-hyoENLmkSLP6l1cXEfad0qP7cjRa1myQsX2Cev6oLwk="; }; checkInputs = [ pytestCheckHook ]; From 491416d9ccc95c266d04df603ca11262fd7fe8ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:10 +0100 Subject: [PATCH 362/685] python3Packages.pandas: 1.3.5 -> 1.4.1 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 536f883f29a..90309ef0b40 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.5"; + version = "1.4.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1"; + sha256 = "sha256-jbk+yYrHy1+KwUIMEPXjxDUzFT8lP+f7bYkc9aorgNI="; }; nativeBuildInputs = [ cython ]; From 02ccb75c1e6000d42326637a0d05b9ba51e417b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:10 +0100 Subject: [PATCH 363/685] python3Packages.pathlib2: 2.3.6 -> 2.3.7.post1 --- pkgs/development/python-modules/pathlib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 757ddc7d974..bbaff273102 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.6"; + version = "2.3.7.post1"; src = fetchPypi { inherit pname version; - sha256 = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"; + sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; From 8776195b6805f70c4989d38a1745cd2a45d02b0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:10 +0100 Subject: [PATCH 364/685] python3Packages.pdm-pep517: 0.10.2 -> 0.11.2 --- pkgs/development/python-modules/pdm-pep517/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index aa99d5f23f7..5649e092634 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.10.2"; + version = "0.11.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "83bb71a7588df69ea0d77dc6524741c3a1af54ad5f421341428de648bfc03a29"; + sha256 = "sha256-4AC6tDUCwZHXGAiiYw3UTs4wGjGdJuACocrqOnMHzSA="; }; preCheck = '' From bab54430c86c7540a4b362b403575a713fd15fd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:10 +0100 Subject: [PATCH 365/685] python3Packages.peewee: 3.14.8 -> 3.14.9 --- pkgs/development/python-modules/peewee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 852ba5ffbcb..85a58271b6d 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.14.8"; + version = "3.14.9"; format = "setuptools"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "sha256-BJSM+7+VdW6SxN4/AXsX8NhQPdIFoYrVRVwR9OsJ3QE="; + sha256 = "sha256-8rwWKsOOYUrk2k1piCurb1LkB9zzmSITq52qWdyx4yk="; }; buildInputs = [ From 9d17779cca47296d554a995868e04f444357f9a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:11 +0100 Subject: [PATCH 366/685] python3Packages.pelican: 4.7.1 -> 4.7.2 --- pkgs/development/python-modules/pelican/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 436192e18b8..723b3888edb 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.7.1"; + version = "4.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; repo = pname; rev = version; - sha256 = "0w3r4ifbrl6mhfphabqs048qys7x6k164ds63jr10l3namljm8ad"; + hash = "sha256-ZBGzsyCtFt5uj9mpOpGdTzGJET0iwOAgDTy80P6anRU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From a6b1a677f7d64b907a58a6a0194ab906d12f5b7a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:11 +0100 Subject: [PATCH 367/685] python3Packages.perfplot: 0.9.13 -> 0.10.1 --- pkgs/development/python-modules/perfplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index ca8f867e6e3..a2bb6baec96 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.9.13"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6"; + sha256 = "sha256-5qZolEJWjhqk1JakcGBWZ1hxeP1cLqcB7IZ3ufjOC/o="; }; nativeBuildInputs = [ From 2c4b54a395dd9343f6bcd09193895187a86166e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:11 +0100 Subject: [PATCH 368/685] python3Packages.pgspecial: 1.13.0 -> 1.13.1 --- pkgs/development/python-modules/pgspecial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 308e8c9c8b6..8eec0190fe5 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.13.0"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "3847e205b19469f16ded05bda24b4758056d67ade4075a5ded4ce6628a9bad01"; + sha256 = "sha256-1dq5ZpCQgnWRbcLGIu+uIX8ULggWX6NmlJ1By8VlhwE="; }; propagatedBuildInputs = [ From 560b3c2526403661d4e221c6b9e6f5e2bd9b22e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:11 +0100 Subject: [PATCH 369/685] python3Packages.phonenumbers: 8.12.43 -> 8.12.44 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 9faad1e96de..92b621e49c6 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.43"; + version = "8.12.44"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HIJwouJX1sZUWKQig/gtPsp/e52SVFSmlm4vBN914c8="; + sha256 = "sha256-Js/QJX0XBP4viMr/LKq7cNFqh3seZbaq5R+fu+EKqM4="; }; checkInputs = [ From 9b3f008c56d244a9cf0a6b4ac5252b2f3dd0e4db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:11 +0100 Subject: [PATCH 370/685] python3Packages.platformdirs: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/platformdirs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 2be8928f630..584d9361fb7 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-fppwtY8VX8IQ96H930xItO7mS8LlxxHgBcKlwIL5P2E="; + sha256 = "sha256-z6WIwTWLlc/chNRxt3dqqa/IxYj1BBTcQ6OcfliHrvA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 5f7603563905574ef0526f5b07b808499e4c8bf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:11 +0100 Subject: [PATCH 371/685] python3Packages.plotly: 5.5.0 -> 5.6.0 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index fbe869b0703..fc24a4c2e6f 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.5.0"; + version = "5.6.0"; src = fetchPypi { inherit pname version; - sha256 = "20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0"; + sha256 = "sha256-2G5E69449HU9/5gqubXgPPhyqrj99TpAPpme03gVQzE="; }; propagatedBuildInputs = [ From 90e8a1dbb4635fca4a0074e3a954c43a996f0824 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:12 +0100 Subject: [PATCH 372/685] python3Packages.poetry-core: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/poetry-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index e8632d0ed07..5922d67fc8b 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0v86x8f8pcbviv2cdn7jjbgj3c994qasx0bqk1kr0mj8m6pjwy9z"; + sha256 = "sha256-cs9SMGD9RdW8Wx/IAMq6gkOUBsney5r19hyGva98grk="; }; postPatch = lib.optionalString (pythonOlder "3.8") '' From 951f98afacc94aac828ab36143eacdd1a51d33e3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:12 +0100 Subject: [PATCH 373/685] python3Packages.pooch: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/pooch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 3b7ddaf2801..3ea5b0ef3b4 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.5.2"; + version = "1.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5969b2f1defbdc405df932767e05e0b536e2771c27f1f95d7f260bc99bf13581"; + sha256 = "sha256-V9IOxLEN1pTSsFu2S8axCcboWmwUBXlM6H7Ys0GrP0Q="; }; nativeBuildInputs = [ setuptools-scm ]; From 788e15b1b7f39429258017ca6ff4697b60552ce1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:12 +0100 Subject: [PATCH 374/685] python3Packages.prettytable: 3.0.0 -> 3.1.1 --- pkgs/development/python-modules/prettytable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index f914a0f3df4..25d22c2c5a2 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.0.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58"; + sha256 = "sha256-Q8niMnLKJT0Diudv463eiXlOkuf8qy3fW5SzhkLvTyE="; }; nativeBuildInputs = [ setuptools-scm ]; From 3f7d2dcad22e5f7b7fc2c16b8921e1811a5faa05 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:12 +0100 Subject: [PATCH 375/685] python3Packages.prometheus-client: 0.12.0 -> 0.13.1 --- pkgs/development/python-modules/prometheus-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 7af4e2b02fa..9ba5068359b 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.12.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "v${version}"; - sha256 = "1a0kllal5vkkdv325k0mx1mha2l9808mcz4dqx6qrgfskz8c2xjl"; + sha256 = "sha256-1sMnlUOvvdlUuh288UalAdlf0a1mpnM+Y/upwlnL1H8="; }; checkInputs = [ From 3d1859d3327f514f9f2025842ad68d3f92ff423b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:12 +0100 Subject: [PATCH 376/685] python3Packages.prompt-toolkit: 3.0.24 -> 3.0.28 --- pkgs/development/python-modules/prompt-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index e38560be2eb..4ec9e381daf 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.24"; + version = "3.0.28"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6"; + sha256 = "sha256-nxzRax6GwpaPJRnX+zHdnWaZFvUVYSwmnRTp7VK1FlA="; }; propagatedBuildInputs = [ From 548b96952740a5b5a73d90618b88edc226273905 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:12 +0100 Subject: [PATCH 377/685] python3Packages.proto-plus: 1.19.8 -> 1.20.3 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index dd2494729ef..defc28d9429 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.19.8"; + version = "1.20.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bdf45f0e0be71510eb2ec9db4da78afde7b5fb8b0a507a36340a9b6ce8e48e58"; + sha256 = "sha256-8osiW8nmwU4gb7f46Zakb7LM2QJkjlEtSWq7anFqSuU="; }; propagatedBuildInputs = [ protobuf ]; From edd52ecf80afa0cadb682e42e951c2d416118089 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:13 +0100 Subject: [PATCH 378/685] python3Packages.proxy-py: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/proxy-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index 4bf07b1375e..6527f88e489 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.3.1"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; rev = "v${version}"; - sha256 = "sha256-qqwb3t8/xicDGfO6l843qRwh0yUfthnOIhgNeKIbEO4="; + sha256 = "sha256-VagX7ATVu6AT4POWoG9btizxFeBh9MLXiLpavtfXnyM="; }; nativeBuildInputs = [ From 02bdb74a28d3eb5f97d480e3ac2983e79e3907f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:13 +0100 Subject: [PATCH 379/685] python3Packages.pycognito: 2022.01.0 -> 2022.02.1 --- pkgs/development/python-modules/pycognito/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index 375453231b9..ff050c15bfe 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -4,22 +4,25 @@ , envs , fetchFromGitHub , isPy27 +, freezegun , mock +, moto , pytestCheckHook , python-jose , requests +, requests-mock }: buildPythonPackage rec { pname = "pycognito"; - version = "2022.01.0"; + version = "2022.02.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = version; - sha256 = "sha256-mmlw3irMC0SFjfEinXHyoPNfTvCcO02zGyqQLj9STSY="; + sha256 = "sha256-0PqeZ8yy2MzvIi1xQNosR7V2Ma3tMT0Q/v4OIv7f1Kg="; }; propagatedBuildInputs = [ @@ -30,8 +33,11 @@ buildPythonPackage rec { ]; checkInputs = [ + freezegun mock + moto pytestCheckHook + requests-mock ]; postPatch = '' From 48632114037964b1681096a68f5fb626687c42eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:14 +0100 Subject: [PATCH 380/685] python3Packages.pyee: 8.2.2 -> 9.0.4 --- pkgs/development/python-modules/pyee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index a252cd4505a..e47e0366c86 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pyee"; - version = "8.2.2"; + version = "9.0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XH5g+N+VcQ2+F1UOFs4BU/g5kMAO90SEG0Pzce1T6+o="; + sha256 = "sha256-J3DEkoq8ch9GtwXmpysMWUgMSmnJqDygsAu5lPHqSzI="; }; buildInputs = [ From e2629a6b5baf849224006331ae66f45ebe71ca59 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:14 +0100 Subject: [PATCH 381/685] python3Packages.pyfaidx: 0.6.3.1 -> 0.6.4 --- pkgs/development/python-modules/pyfaidx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index a2815c3e1e2..e356ca563b5 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.3.1"; + version = "0.6.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "93adf036a75e08dc9b1dcd59de6a4db2f65a48c603edabe2e499764b6535ed50"; + sha256 = "sha256-e6O9yx30unSfdmWzTmoFKqToQkBqDflebfRxfMEj85I="; }; nativeBuildInputs = [ From 0423be59a348df72dc626582b2f3dab9c675bcb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:14 +0100 Subject: [PATCH 382/685] python3Packages.pyfakefs: 4.5.4 -> 4.5.5 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 29803793fd6..63bf4483911 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.4"; + version = "4.5.5"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323"; + sha256 = "sha256-iIIe2MJjJxu2alRBmoJZGqEH+yz9pC3I8hWOC+CIWQc="; }; postPatch = '' From 592082ab33638c2892b8fa0e6789b7a7312495aa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:14 +0100 Subject: [PATCH 383/685] python3Packages.pygit2: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index b8b405a8ecf..47654ff34c6 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bixc/1qh5D9DEDSAdhFS9cXWvvQPXB9QyHWKbonmbLY="; + sha256 = "sha256-xehYisrV4y+gWVWCVxBZ5rkOx8SHxYtOU8KADcveRMg="; }; preConfigure = lib.optionalString stdenv.isDarwin '' From e7fa6ec2f0e69f7faf38275ded173724281c3118 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:15 +0100 Subject: [PATCH 384/685] python3Packages.PyICU: 2.8 -> 2.8.1 --- pkgs/development/python-modules/pyicu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 3281a7ceb87..02226feff2c 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "PyICU"; - version = "2.8"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "3d80de47045a8163db5aebc947c42b4d429eeea4f0c32af4f40b33981fa872b9"; + sha256 = "sha256-8LlUmof4e6fEE/E2edE3Jx4LN/HzmwEJrOOCV9TRSNY="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config From fd1dd8c9c04ea5a8cc6f3a99913c7f4c9762f5cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:15 +0100 Subject: [PATCH 385/685] python3Packages.pylint-django: 2.5.0 -> 2.5.2 --- pkgs/development/python-modules/pylint-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 291ef8fba62..61d49bd3ba0 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.5.0"; + version = "2.5.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1r48dss9qnzlifwy5ylkffdw35aaajmil0486mav056jm1vmi2pr"; + sha256 = "sha256-VgGdV1T154LauclGo6jpLPUrYn5vTOWwvO4IXQ9se7c="; }; propagatedBuildInputs = [ From 2e1380f3ec22af6ae6847ee60820d560aa325ef5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:15 +0100 Subject: [PATCH 386/685] python3Packages.pymemcache: 3.5.0 -> 3.5.1 --- pkgs/development/python-modules/pymemcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index f30b6ea06b4..f2055ca9a79 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pymemcache"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "pinterest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O2qmcLWCUSc1f32irelIZOOuOziOUQXFGcuQJBXPvvM="; + sha256 = "sha256-DKqfv5gf9gzbnEPQSzy2mAaVYJZL9jmTKyGWVzj40T4="; }; checkInputs = [ From 27488a3ed53026bc64e97689f19335d6171465c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:16 +0100 Subject: [PATCH 387/685] python3Packages.pyomo: 5.7.3 -> 6.3.0 --- pkgs/development/python-modules/pyomo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index e8d89e9ef2d..20450cd9eff 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyomo"; - version = "5.7.3"; + version = "6.3.0"; disabled = isPy27; # unable to import pyutilib.th src = fetchFromGitHub { repo = "pyomo"; owner = "pyomo"; rev = version; - sha256 = "sha256-p0/DdCwyXdzXElzjWewKs0Oi7BMXC+BxgYikdZL0t68="; + sha256 = "sha256-xyjiB5fDRf5y9Av5Cr+8wtU4pHzMHsM45mcmJEOaTWs="; }; checkInputs = [ nose glpk ]; From cb705d19a513ffa6c09b6effdc1dfdd1f15325df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:16 +0100 Subject: [PATCH 388/685] python3Packages.pyopengl: 3.1.5 -> 3.1.6 --- pkgs/development/python-modules/pyopengl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 72d6ae33258..7370057ad72 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyopengl"; - version = "3.1.5"; + version = "3.1.6"; src = fetchPypi { pname = "PyOpenGL"; inherit version; - sha256 = "4107ba0d0390da5766a08c242cf0cf3404c377ed293c5f6d701e457c57ba3424"; + sha256 = "sha256-jqbIdzkn7adAW//G9buTvoFWmnsFyMrFDNlOlp3OXic="; }; propagatedBuildInputs = [ pillow ]; From a25417511c6ba19805571af1ee574965e7623cdf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:16 +0100 Subject: [PATCH 389/685] python3Packages.pyparsing: 3.0.6 -> 3.0.7 --- pkgs/development/python-modules/pyparsing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 27047cf6eab..449c5334e66 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -11,13 +11,13 @@ let pyparsing = buildPythonPackage rec { pname = "pyparsing"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; rev = "pyparsing_${version}"; - sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; + sha256 = "sha256-RyvTTbFshAZgyZPgzqcq31E504RlnMZuf16jJYGqDDI="; }; # circular dependencies if enabled by default From 5d481bd1703bb1ee90322c9213d2304d1bb381c4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:16 +0100 Subject: [PATCH 390/685] python3Packages.pypdf3: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/pypdf3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypdf3/default.nix b/pkgs/development/python-modules/pypdf3/default.nix index 4970c0d527b..a4273497e3b 100644 --- a/pkgs/development/python-modules/pypdf3/default.nix +++ b/pkgs/development/python-modules/pypdf3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pypdf3"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { pname = "PyPDF3"; inherit version; - sha256 = "sha256-DGKpR4p3z8tw4gKi5Hmj09svysD3Hkn4NklhgROmEAU="; + sha256 = "sha256-yUbzJzQZ43JY415yJz9JkEqxVyPYenYcERXvmXmfjF8="; }; LC_ALL = "en_US.UTF-8"; From b323e99ecf8b6d4f501cc2cd2767a5152e6dc4b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:16 +0100 Subject: [PATCH 391/685] python3Packages.pyperf: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/pyperf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 40a77fc0c7b..25cf9906cb4 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "8a85dd42e067131d5b26b71472336da7f7f4b87ff9c97350d89f5ff0de9adedc"; + sha256 = "sha256-SsLiz3JKubUlInw7SmnxarXHFOpbrWHJdODF1XhyOKE="; }; checkInputs = [ nose psutil ] ++ From 6340108b4e43fbd47b06d22c899efc7d153ebbd2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:17 +0100 Subject: [PATCH 392/685] python3Packages.pyrsistent: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/pyrsistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 75cecc7d709..5a1b66bfa26 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.18.0"; + version = "0.18.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"; + sha256 = "sha256-1NYfi5k6clW6cU3zrKUnAPgSUon4T3BM+AkWUXxG65Y="; }; propagatedBuildInputs = [ six ]; From 5ba76cabd20ad8a109c03446987b051c861bc9cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:17 +0100 Subject: [PATCH 393/685] python3Packages.pyspark: 3.2.0 -> 3.2.1 --- pkgs/development/python-modules/pyspark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 2e6f41aa233..c424e3195e7 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "bfea06179edbfb4bc76a0f470bd3c38e12f00e1023e3ad0373558d07cff102ab"; + sha256 = "sha256-C4E1kmLsbprHjDUzROfeAmAn0UDG3vlJ/w2Aq3D4mlQ="; }; # pypandoc is broken with pandoc2, so we just lose docs. From 71886c3c01862035c6824bfd39577b8348931dde Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:17 +0100 Subject: [PATCH 394/685] python3Packages.pyspnego: 0.3.1 -> 0.5.0 --- pkgs/development/python-modules/pyspnego/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 561ec037c0a..563042091bf 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.3.1"; + version = "0.5.0"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f7CR7wMxHNNpxizV7MFCtWci3SSNvdx+W5i/rgOUSxY="; + sha256 = "sha256-CvPvyP7Vi2Ib+ikgUQt8JkVt5fxzapG590TgAehXqHE="; }; propagatedBuildInputs = [ From b54c57fbfabb2c6652a56dac8702a3ddc84e24b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:17 +0100 Subject: [PATCH 395/685] python3Packages.pytesseract: 0.3.8 -> 0.3.9 --- pkgs/development/python-modules/pytesseract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 6fcb9f97d32..42628e9cfdd 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YUigHkN1dghi6PVupxjiK10TsoFFTfRuqNrJgHeT/Fo="; + sha256 = "sha256-fiuvx/SNG7cUQ85GM6VvXiGSWpjyIKNsM2KX7c0ZVtA="; }; patches = [ From 995ae2eb80ecfd7aed997ad9307cf68159f16fb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:18 +0100 Subject: [PATCH 396/685] python3Packages.pytest-asyncio: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/pytest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index b8d3dffa3b0..da60feb724f 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-PE66ogjfzj6cW3+UD5nZHSt6zg7b+j6Q4ACznE4j0j8="; + hash = "sha256-9KN45+Pdz40rJv1NUxuoy8xWtLGt7kz7YcqfjfZ9x4A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 85a0475df3392f8e9197f5590a443ab4dc473fa8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:18 +0100 Subject: [PATCH 397/685] python3Packages.pytest-httpx: 0.17.3 -> 0.20.0 --- pkgs/development/python-modules/pytest-httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 9536325ade5..569ac8606f6 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.17.3"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "sha256-cJRzjNIN9Fc8vcjmndW+akjxDSp+wFahY2MEslgXIwM="; + sha256 = "sha256-9LDbVZgTmfyYAWylUy6Q4KH2gKpAa/o4IhqQV31BVgY="; }; buildInputs = [ From cb91872481465374ef03e170fa81c74998b75911 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:18 +0100 Subject: [PATCH 398/685] python3Packages.pytest-isort: 2.0.0 -> 3.0.0 --- pkgs/development/python-modules/pytest-isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index e628e6a158c..c06959b96c4 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "821a8c5c9c4f3a3c52cfa9c541fbe89ac9e28728125125af53724c4c3f129117"; + sha256 = "sha256-T+Sybq0q93ZzDsI/WHDXQh81qs4ipBxOk4WG702Hh8s="; }; propagatedBuildInputs = [ isort ]; From 8a2e1e42409208f36d1ec0821d0805c25532c6e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:18 +0100 Subject: [PATCH 399/685] python3Packages.pytest-mpl: 0.13 -> 0.14.0 --- pkgs/development/python-modules/pytest-mpl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 747411ad745..b5a5775f56e 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.13"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "582db6e14315f9b08cbd2df39b136dc344bfe8a27c2f05b995460fb0969ec19e"; + sha256 = "sha256-iE4HjS1TgK9WQzhOIzw1jpZZgl+y2X/9r48YXENMjYk="; }; buildInputs = [ From c7687801b9e2fb68700e7f71e8d07b6eedf17d3a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:18 +0100 Subject: [PATCH 400/685] python3Packages.pytest-mypy: 0.8.1 -> 0.9.1 --- pkgs/development/python-modules/pytest-mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 8c52fa2e698..bec0ee59d0c 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11"; + sha256 = "sha256-n/o79AXBLFxr6ekuIr67arLJG5wy9FsPDJOvRzJpq1w="; }; nativeBuildInputs = [ setuptools-scm ]; From a0e0dcb91b90a00703773e911d8bd070f4242de5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:18 +0100 Subject: [PATCH 401/685] python3Packages.pytest-regressions: 2.3.0 -> 2.3.1 --- .../development/python-modules/pytest-regressions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 6866df7b712..99099d3ac92 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-STWtZzbvhQ0NsSvl7jh0CjmYjmtRA/LTUQAAaze5Tg4="; + sha256 = "sha256-s+xM2zTo9idgYnXYuDTGXmDhowc+MmuzcnpCcnPQIh0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 2a2cc0763c4405279c1c592dbf94d46124bd3b12 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:19 +0100 Subject: [PATCH 402/685] python3Packages.pytest-runner: 5.3.1 -> 6.0.0 --- .../python-modules/pytest-runner/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-runner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix index d99f72299dd..baca23d7749 100644 --- a/pkgs/development/python-modules/pytest-runner/default.nix +++ b/pkgs/development/python-modules/pytest-runner/default.nix @@ -1,20 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pytest +}: buildPythonPackage rec { pname = "pytest-runner"; - version = "5.3.1"; + version = "6.0.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91"; + sha256 = "sha256-tNhTYu0ptMNIZ43nl99Djw8FCUl924xkcJbAKm2HtoU="; }; - nativeBuildInputs = [ setuptools-scm pytest ]; - postPatch = '' rm pytest.ini ''; + nativeBuildInputs = [ + setuptools-scm + pytest + ]; + checkPhase = '' py.test tests ''; From d8b5604f1a4ecc9ef7e1ec240946afe4cc5d51b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:19 +0100 Subject: [PATCH 403/685] python3Packages.pytest-socket: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/pytest-socket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix index 1376d3e8412..bcd4abb4d41 100644 --- a/pkgs/development/python-modules/pytest-socket/default.nix +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytest-socket"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "miketheman"; repo = pname; rev = version; - hash = "sha256-HdGkpIHFsoAG2+8UyL9jSb3Dm8bWkYzREdY3i15ls/Q="; + hash = "sha256-QKHnuq2pqWMVUhF9nnhJggEK6SSyp6zBEfQX9tGND2E="; }; nativeBuildInputs = [ From f1ca8acad6ab31ba697ebceb04323050a7abc9c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:19 +0100 Subject: [PATCH 404/685] python3Packages.pytest-testmon: 1.2.2 -> 1.3.0 --- pkgs/development/python-modules/pytest-testmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 1b291778b2a..3a397001865 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.2.2"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e69d5aeac4e371986f94e8ad06e56d70633870d026f2306fca44051f02fcb688"; + sha256 = "sha256-1Qyroq6Dv11EaCGRAj19bKQBfRz26XSh5TJY7xA/vBE="; }; propagatedBuildInputs = [ coverage ]; From 0476f56d7c555dc4a3e015398b7c08e8a06cd94c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:19 +0100 Subject: [PATCH 405/685] python3Packages.pytest-timeout: 2.0.2 -> 2.1.0 --- pkgs/development/python-modules/pytest-timeout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index f99340e48b3..e380068c59d 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112"; + sha256 = "sha256-wHygdATGEvirviIpSyPDaOLlEEtSHBeQGVVh834aw9k="; }; buildInputs = [ From c51ab22a29edb8e77544be8ce3ba48f4d835d8a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:19 +0100 Subject: [PATCH 406/685] python3Packages.python3-saml: 1.12.0 -> 1.14.0 --- pkgs/development/python-modules/python3-saml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index a21ee97eca5..8bc9cf3090f 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -3,14 +3,14 @@ isodate, lxml, xmlsec, freezegun }: buildPythonPackage rec { pname = "python3-saml"; - version = "1.12.0"; + version = "1.14.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "onelogin"; repo = "python3-saml"; rev = "v${version}"; - sha256 = "sha256-VPUsjuo4FIes8ti0tkR0kT3J3RdUt1wtl4QEahVsc2c="; + sha256 = "sha256-TAfVXh1fSKhNn/lsi7elq4wFyKCxCtCYUTrnH3ytBTw="; }; propagatedBuildInputs = [ From 87c097da10f2decb43464882cdd9040d030f0da3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:19 +0100 Subject: [PATCH 407/685] python3Packages.python-cinderclient: 8.2.0 -> 8.3.0 --- .../python-modules/python-cinderclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index fe421fa55d3..2f08341a2c4 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "8.2.0"; + version = "8.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7b2f08a2d1cc05d2c1f84f02fadb2208678b1acb501acfe2de33720078ec7b9f"; + sha256 = "sha256-4AEDh1Ap3IXLtZEx0AzMhTT2kpVqzeMrWjzFr0wkWAs="; }; propagatedBuildInputs = [ From eb2fdeaba0cf16811ec577d6bfe18c9d72d2862f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:20 +0100 Subject: [PATCH 408/685] python3Packages.python-dbusmock: 0.25.0 -> 0.26.1 --- pkgs/development/python-modules/python-dbusmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 60e6f2e7455..378c58f0236 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "0zg2aib0k6hc1vvlbdcmp003m85dvkv7pndzgkc4vv2y9qpi0jp9"; + sha256 = "sha256-kavbWMTgKU/rBIo7RMs9NkwReYQyEdeFwMBSzEM9wa0="; }; prePatch = '' From 788c5e57dc7998e1573cb165e95508519e9f942f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:20 +0100 Subject: [PATCH 409/685] python3Packages.python-glanceclient: 3.5.0 -> 3.6.0 --- .../python-modules/python-glanceclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 754bac51ea6..3d290ae5eda 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -19,11 +19,11 @@ buildPythonApplication rec { pname = "python-glanceclient"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "417b9d814b43e62df4351f26a0d5569b801e9f99f7758bd8c82ef994c3629356"; + sha256 = "sha256-gi1IYtWJL2pltoKTRy5gsHTRwHlp0GHoBMbh1UP5g9o="; }; postPatch = '' From 00154ce2689a5affe0320c49e8b300cf9113447e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:20 +0100 Subject: [PATCH 410/685] python3Packages.python-heatclient: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/python-heatclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index 8ba5c7dd21f..d78682a8c66 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -22,11 +22,11 @@ buildPythonApplication rec { pname = "python-heatclient"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "b610748eb3f18f6bd762e0808accdf872308289a77c3b19ed2d8b9f306393a42"; + sha256 = "sha256-3l7XyxKm18BAM1DhNsCmRwcZR224+8m/jQ1YHrwLHCs="; }; propagatedBuildInputs = [ From 50d5d5f72784e3eb1ddbcb7538598ed32fccc408 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:20 +0100 Subject: [PATCH 411/685] python3Packages.python-ironicclient: 4.10.0 -> 4.11.0 --- .../python-modules/python-ironicclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index c193cf7cd1a..83449a9285d 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonApplication rec { pname = "python-ironicclient"; - version = "4.10.0"; + version = "4.11.0"; src = fetchPypi { inherit pname version; - sha256 = "8f3ad8ae1fc4df524ea05a458ad2567b58144e881807dbbb985e282902d732fd"; + sha256 = "sha256-zGG/3Cq7mARyuGGvqa4KGWFmx/UN+W2KMuy+RNenzXM="; }; propagatedBuildInputs = [ From 4a07d3682ebef37a90b420b1072687f955e077e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:20 +0100 Subject: [PATCH 412/685] python3Packages.python-manilaclient: 3.2.0 -> 3.3.0 --- .../python-modules/python-manilaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index a2da2e4f4a7..09dc46ba955 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,11 +22,11 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo="; + sha256 = "sha256-JFfkbJHmDQFbiWXw0Wp+0xSLyXowIHnsw7+5irZwhXo="; }; nativeBuildInputs = [ From 340b69d7d27685a05ae3566c69edb87760c3aec1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:20 +0100 Subject: [PATCH 413/685] python3Packages.python-novaclient: 17.6.0 -> 17.7.0 --- pkgs/development/python-modules/python-novaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index afc8a51988e..e654c75bfe8 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "17.6.0"; + version = "17.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yRDCCFMQ2mNfs0NYXxBwcS/w+cs8j3nUTKPWMsTyMPU="; + sha256 = "sha256-Trwn9M4GwVW46ZGkRGO5NYWW5oVs8XHJr43HVo2Gi+0="; }; propagatedBuildInputs = [ From 43607344a5ccfb7830b4b47451e24e12e0bbb871 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:21 +0100 Subject: [PATCH 414/685] python3Packages.python-slugify: 6.1.0 -> 6.1.1 --- pkgs/development/python-modules/python-slugify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 16c4dc0f230..2f22a20afb3 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "6.1.0"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU="; + hash = "sha256-AAAzl/TjFBTpIs5WezpNoozxQ2pT0zLJrutRx9jEaf0="; }; propagatedBuildInputs = [ From a7765b82c9fc0b2084d119a97aaaf77915d37cbe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:21 +0100 Subject: [PATCH 415/685] python3Packages.python-snappy: 0.6.0 -> 0.6.1 --- .../python-modules/python-snappy/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index fe4d6ea7bda..397fcaa3dd0 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -4,35 +4,33 @@ , isPyPy , snappy , cffi -, nose +, python }: buildPythonPackage rec { pname = "python-snappy"; - version = "0.6.0"; + version = "0.6.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "06l9my361ig4x5ycyrmq33q83zcdib3y2zxfxv7k7dlpyp9ri2hn"; + sha256 = "sha256-tqEHqwYgasxTWdTFYyvZsi1EhwKnmzFpsMYuD7gIuyo="; }; buildInputs = [ snappy ]; propagatedBuildInputs = lib.optional isPyPy cffi; - checkInputs = [ nose ]; - checkPhase = '' - rm -r snappy # prevent local snappy from being picked up - nosetests test_snappy.py - '' + lib.optionalString isPyPy '' - nosetests test_snappy_cffi.py + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck ''; meta = with lib; { description = "Python library for the snappy compression library from Google"; homepage = "https://github.com/andrix/python-snappy"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From d70008b22cec9cc8f3d0f89902a5b50a71f52c3a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:21 +0100 Subject: [PATCH 416/685] python3Packages.python-swiftclient: 3.13.0 -> 3.13.1 --- .../development/python-modules/python-swiftclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index cb3b5b850e3..8c1e38ed45e 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.13.0"; + version = "3.13.1"; src = fetchPypi { inherit pname version; - sha256 = "b200dcfbc6842bd4cac29efd0ea9ef34d3b8625957472ba7aa3ae0242437e2cc"; + sha256 = "sha256-LSbJC2OS9r76f7sW/Np75Eqibiropb7icF0dHIE4M/A="; }; propagatedBuildInputs = [ pbr python-keystoneclient ]; From 6e76be083c8c76d67689c25b4efebdfb6e731533 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:21 +0100 Subject: [PATCH 417/685] python3Packages.pytools: 2021.2.9 -> 2022.1 --- pkgs/development/python-modules/pytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 7dcd86705a3..61201be9f04 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2021.2.9"; + version = "2022.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755"; + sha256 = "sha256-GXqs9uH11gxxW5JDh5Kst3Aq7Vnrv7FH+oTtp4DlT+4="; }; checkInputs = [ pytest ]; From a5c9b0ac748c8941be9e9a08dfe10fe238bef6fd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:21 +0100 Subject: [PATCH 418/685] python3Packages.pytorch-lightning: 1.5.8 -> 1.5.10 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index de75aa0ae8f..83cd9d175ad 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.5.8"; + version = "1.5.10"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = version; - sha256 = "161mz66l11z4350q93fmmq3x0jzbp5761lf4fx3yvz17qzp7ygkn"; + sha256 = "sha256-GP6/VZuRv8dS5wKQW7RbtOSa2vV9Af2Jp+ioEW3bIgc="; }; propagatedBuildInputs = [ From c51a47878a4d8de28b0e1693dae8227c942ef156 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:21 +0100 Subject: [PATCH 419/685] python3Packages.pytorch-metric-learning: 1.1.0 -> 1.2.0 --- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index e9728b3d676..64dfca2e94b 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "0qvlxgdml22fzrs47yzqpfzak8lfdrzayvapawfz93cq8903h7qp"; + sha256 = "sha256-M/iH+pIuamOmvxLtKMzWXiuMCnMXzpVFRb/HfYfCKdc="; }; propagatedBuildInputs = [ From abb7ae702f1984daab9091167a32d35392ffd143 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:22 +0100 Subject: [PATCH 420/685] python3Packages.pytorch-pfn-extras: 0.5.6 -> 0.5.7 --- .../development/python-modules/pytorch-pfn-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 46bd35b9cfb..3c239d97040 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "v${version}"; - sha256 = "1ch4vhz3zjanj5advqsj51yy7idrp8yvydvcg4ymwa3wsfjrx58g"; + sha256 = "sha256-gB575ZKXZRAy5K5CkBtfG6KG1yQ9WDREIobsy43CEOc="; }; propagatedBuildInputs = [ numpy pytorch typing-extensions ]; From f1e696d17163048dc57fa1900b61e12ea2744355 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:22 +0100 Subject: [PATCH 421/685] python3Packages.pyudev: 0.22.0 -> 0.23.2 --- pkgs/development/python-modules/pyudev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index aabf9cd5de5..99c2d033590 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.22.0"; + version = "0.23.2"; src = fetchPypi { inherit pname version; - sha256 = "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"; + sha256 = "sha256-Mq41hbMgpRvCg+CgQAD9iiVZnttEVB4vUDT2r+5dFcw="; }; postPatch = '' From a5d2d8ff0fb070c6341c1c6b43e56b7761401e68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:22 +0100 Subject: [PATCH 422/685] python3Packages.pywbem: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/pywbem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index db7bd82b652..0547f3edd93 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.4.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "52f668f7ee1f03bdd80485692b648588b3e1909e2dc0754dceca497f5e9cf059"; + sha256 = "sha256-rYu75Kt+eVciwPJ/JlbJL8Zzp+BqFM0VGlDwMGRU0X4="; }; propagatedBuildInputs = [ From bc476c77bb9d9264970178159484d716b899492d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:22 +0100 Subject: [PATCH 423/685] python3Packages.pywebview: 3.5 -> 3.6.1 --- pkgs/development/python-modules/pywebview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 67f11ed291f..2a369ca5704 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pywebview"; - version = "3.5"; + version = "3.6.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; rev = version; - sha256 = "sha256-+At/ToEylSPcLh/u2NHVTXQpMnw+2/afsevg5YAX/4c="; + sha256 = "sha256-9o9ghqvU9Hnmf2aj/BqX7WBgS9ilRSnicR+qd25OfjI="; }; nativeBuildInputs = [ From 9e307c9e47f30b6fd23ed6e46651f0bad63e5d80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:22 +0100 Subject: [PATCH 424/685] python3Packages.qiling: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/qiling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 51c762c8107..a24ecdb8ff1 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "qiling"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e72dc5856cbda975f962ddf063063a32bd6c3b825f75e0795e94ba6840a7d45f"; + sha256 = "sha256-myUGzNP4bf90d2gY5ZlYbVlTG640dj/Qha8/aMydvuw="; }; propagatedBuildInputs = [ From 5a34905a74a7f1b743935e937d6d506e16415c53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:22 +0100 Subject: [PATCH 425/685] python3Packages.qiskit-machine-learning: 0.3.0 -> 0.3.1 --- .../python-modules/qiskit-machine-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 511bc0b2a0b..ad00a16a880 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.3.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "0jycs18apnwrksarpwpmp7scndyx91vnv6fchil4jyx4kym8mnf9"; + sha256 = "sha256-8tnd6+tqofKuK/sBdqmClBtywHbu3VvwLjO9k4YoChA="; }; propagatedBuildInputs = [ From 5cae5b274ad91b658fd3862d74f6daff6a26bb78 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:23 +0100 Subject: [PATCH 426/685] python3Packages.QtPy: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/qtpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 5c4984ca3f8..ad5530712f2 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "777e333df4d711b2ec9743117ab319dadfbd743a5a0eee35923855ca3d35cd9d"; + sha256 = "sha256-rf0HP/vS3oHceqoLmDSZ71xZyWrc/cyd6mDULKiF648="; }; propagatedBuildInputs = [ From 2d9e3ed9f862230467a4fd5e4121cfc4a4ae2fed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:23 +0100 Subject: [PATCH 427/685] python3Packages.rasterio: 1.2.6 -> 1.2.10 --- .../python-modules/rasterio/default.nix | 78 ++++++++++++++++--- 1 file changed, 66 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 1ec6448d74c..3e5f7fb4503 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,30 +1,84 @@ -{ buildPythonPackage, lib, fetchFromGitHub, isPy3k -, cython, setuptools -, numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytest-cov, packaging, hypothesis, boto3, mock -, certifi, shapely +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build time +, cython +, gdal + +# runtime +, affine +, attrs +, boto3 +, click +, click-plugins +, cligj +, matplotlib +, numpy +, snuggs + +# tests +, hypothesis +, packaging +, pytest-randomly +, pytestCheckHook +, shapely }: buildPythonPackage rec { pname = "rasterio"; - version = "1.2.6"; + version = "1.2.10"; # not x.y[ab]z, those are alpha/beta versions + format = "pyproject"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { - owner = "mapbox"; + owner = "rasterio"; repo = "rasterio"; rev = version; - sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; + hash = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo="; }; - checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; - nativeBuildInputs = [ cython gdal ]; - propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; + nativeBuildInputs = [ + cython + gdal + ]; + + propagatedBuildInputs = [ + affine + attrs + boto3 + click + click-plugins + cligj + matplotlib + numpy + snuggs + ]; + + preCheck = '' + rm -rf rasterio + ''; + + checkInputs = [ + pytest-randomly + pytestCheckHook + packaging + hypothesis + shapely + ]; + + pytestFlagsArray = [ + "-m 'not network'" + ]; + + pythonImportsCheck = [ + "rasterio" + ]; meta = with lib; { description = "Python package to read and write geospatial raster data"; - license = licenses.bsd3; homepage = "https://rasterio.readthedocs.io/en/latest/"; + license = licenses.bsd3; maintainers = with maintainers; [ mredaelli ]; }; } From 18c0af6354c1a1a8b4e7013a12d1a1adef6c6bd0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:23 +0100 Subject: [PATCH 428/685] python3Packages.redis: 4.1.0 -> 4.1.4 --- pkgs/development/python-modules/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 0731487575b..7cd59a5528a 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.1.0"; + version = "4.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IfCiO85weQkHbmuizgdsulm/9g0qsily4GR/32IP/kc="; + sha256 = "sha256-HZoM34n92T+EJhcz4k9Vp7vUE6myGf2vVuPnKMqaIwY="; }; propagatedBuildInputs = [ From 12578139a64924cd8892662b21f6c9b9b8128555 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:23 +0100 Subject: [PATCH 429/685] python3Packages.regex: 2022.1.18 -> 2022.3.2 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 86e591eaf14..512a7162f0e 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.1.18"; + version = "2022.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-l/MtwDqAVKTEpatddh7Uhh6CiywgD+vU5GhXBppIORY="; + hash = "sha256-eeWvH/JYvA/gvdb2m8SuM5NaiY48vvu8zyLoiif6BTs="; }; checkPhase = '' From 4d7f7a9fc9b045aa814b9c3583b9947caf5b3944 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:23 +0100 Subject: [PATCH 430/685] python3Packages.reportlab: 3.6.5 -> 3.6.8 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 82d84dc26a9..629f8d0ec75 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.5"; + version = "3.6.8"; src = fetchPypi { inherit pname version; - sha256 = "d8fe27ad312671c9347cf5997f7c1017833fac17233f33296281ba9fa0de189a"; + sha256 = "sha256-3HZX/LC8PkhcPIaaRN3bUtcRNWoBpFZmS3vvgnIiyYI="; }; checkInputs = [ glibcLocales ]; From de0631c0ab80abc920ef30fad3afff2199fe982f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:23 +0100 Subject: [PATCH 431/685] python3Packages.requests-oauthlib: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/requests-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index aed6576c90d..d42de957791 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "requests-oauthlib"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml"; + sha256 = "sha256-db6sSkeIHuuU1epdatMe+IhWr/4jMrmq+1LGRSzPDXo="; }; propagatedBuildInputs = [ oauthlib requests ]; From d4a93a02e230b58432d6b5ac62286813c8851f91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:23 +0100 Subject: [PATCH 432/685] python3Packages.restructuredtext_lint: 1.3.2 -> 1.4.0 --- .../python-modules/restructuredtext_lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 01c7a5e78c6..0033794ef43 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "d3b10a1fe2ecac537e51ae6d151b223b78de9fafdd50e5eb6b08c243df173c80"; + sha256 = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; }; checkInputs = [ nose testtools ]; From b9202b81a17ac5b7a5e762855abc8dffddead0c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:24 +0100 Subject: [PATCH 433/685] python3Packages.s3fs: 2022.1.0 -> 2022.2.0 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index d90d1052282..8582c0ac729 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.1.0"; + version = "2022.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6bafc1f6b4e935ea59512c0f38d5cb9c299dbbfe738e40c3d1de8f67b4ee1fd4"; + sha256 = "sha256-RhHQ9+QeW8nawwCQcOCtN9qHpC9t73W0gTwG9+QEpzg="; }; buildInputs = [ From 4bb2196b18c4088df65b3a9790b1710ec399b319 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:24 +0100 Subject: [PATCH 434/685] python3Packages.sagemaker: 2.75.1 -> 2.77.1 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 80c4bd92a38..d18d939be60 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.75.1"; + version = "2.77.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MN/F7TWaKsQpKMR7Pxx0Vam1+O+PFEJ/H5jLJh3zpe4="; + sha256 = "sha256-RX3QcjGDWYaPC9lKz/nJSMTO3jeXxY7MW98fHYfcLq0="; }; propagatedBuildInputs = [ From 77440dac3a3a0fd8faa372b1a2ee56eccebd8a00 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:24 +0100 Subject: [PATCH 435/685] python3Packages.schema-salad: 8.2.20220103095339 -> 8.2.20220204150214 --- pkgs/development/python-modules/schema-salad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index bea5b766b5c..f7be7f0107c 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.2.20220103095339"; + version = "8.2.20220204150214"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "051690a2f89b98e35100cd2cb489406a5169a60c2f27a716f3f287a42d45be2d"; + sha256 = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ="; }; propagatedBuildInputs = [ From 8f597df0d966a6009d401f6e2610a490b6a7212d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:25 +0100 Subject: [PATCH 436/685] python3Packages.scikit-build: 0.12.0 -> 0.13.1 --- pkgs/development/python-modules/scikit-build/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index bc72f76bf22..3fefba47cbd 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.12.0"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe"; + sha256 = "sha256-XRd0ousVmI4IHFgsJUq0qXUgluajTyNUEct5vWFmDDc="; }; propagatedBuildInputs = [ @@ -66,6 +66,8 @@ buildPythonPackage rec { "test_install_command" # tries to alter out path "test_test_command" # tries to alter out path "test_setup" # tries to install using distutils + "test_pep518" # pip exits with code 1 + "test_dual_pep518" # pip exits with code 1 ]); checkPhase = '' From b9416a880dcd92179260b7a7b855e3c9f7694549 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:25 +0100 Subject: [PATCH 437/685] python3Packages.scipy: 1.7.3 -> 1.8.0 --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 9c3b28e0a9a..85708822cc2 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.7.3"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf"; + sha256 = "sha256-MdTy1rckvJqY5Se1hJuKflib8epjDDOqVj7akSyf8L0="; }; nativeBuildInputs = [ cython gfortran pythran ]; From ec95846697e58c80eded4737a39cfb74f7bd6a80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:25 +0100 Subject: [PATCH 438/685] python3Packages.Shapely: 1.8.0 -> 1.8.1.post1 --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 818cce6a567..8d5d0d2aa4f 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.8.0"; + version = "1.8.1.post1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "177g8wxsgnphhhn4634n6ca1qrk462ijqlznpj5ry6d49ghpwc7m"; + sha256 = "sha256-k/8G/wX74r6EO5PHsa2CkuVuZlugG0cI91rop1eXLp8="; }; nativeBuildInputs = [ From 234ed20f71d7c26d2ef6c2e3118e4b66f05141f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:25 +0100 Subject: [PATCH 439/685] python3Packages.simple-salesforce: 1.11.4 -> 1.11.6 --- pkgs/development/python-modules/simple-salesforce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index d2b36af12a3..a9319779060 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.4"; + version = "1.11.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "17d6g7zfhlgd2n4mimjarl2x4hl7ww2lb4izidlns1hzqm8igg4y"; + sha256 = "sha256-/uaFEQnilcelHKjbmrnyLm5Mzj2V8P4oEH+cgJn+KvI="; }; propagatedBuildInputs = [ From 2f7494d54e549569c38ab38231aba581ae4abef3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:25 +0100 Subject: [PATCH 440/685] python3Packages.sip: 6.5.0 -> 6.5.1 --- pkgs/development/python-modules/sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 5cd8136f84e..be9cae0e178 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.5.0"; + version = "6.5.1"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "a1cf8431a8eb9392b3ff6dc61d832d0447bfdcae5b3e4256a5fa74dbc25b0734"; + sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY="; }; propagatedBuildInputs = [ packaging toml ]; From 24a3ffd43d7e53b7fb2aef505edbccd3f3d1c881 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:26 +0100 Subject: [PATCH 441/685] python3Packages.smbprotocol: 1.8.3 -> 1.9.0 --- pkgs/development/python-modules/smbprotocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index b5d826c8f8e..562346b1a47 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m9C+uzwrEOcbkvBQ3Z+to2BsX2i7cLnUiV/+L7hMUdE="; + sha256 = "sha256-u3brP3WsnoqRy3R0OQQkIbq+avS7nemx9GKpvTq+vxg="; }; propagatedBuildInputs = [ From 585ab5126f4e8758adfddcc84aeaed757a44852e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:26 +0100 Subject: [PATCH 442/685] python3Packages.spacy-transformers: 1.1.3 -> 1.1.4 --- .../development/python-modules/spacy-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 2f70732caa3..d203f8709c3 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.3"; + version = "1.1.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f4f553d3d2a065147a8c1292b5d9adf050c0f78dd15bb05c9614341cf88c5574"; + sha256 = "sha256-G09bZiXTdEuukvKjPOYYTW/B19d406QSRDOU5ZflDDU="; }; postPatch = '' From b7a637680027f5a8d6f175f03c57a4af1b4c4de8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:26 +0100 Subject: [PATCH 443/685] python3Packages.spyder: 5.2.1 -> 5.2.2 --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index cfeaf08fb33..40e393b57d6 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.2.1"; + version = "5.2.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b318a70a75acd200018a547d2ff2d2f55e7507054469d0c77ec6f967ac3c2d28"; + sha256 = "sha256-3DIikQlsc7Ptagi8ddR5ia+u24dXeBdppRkIn/xp3bg="; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From e721236bef5ea635e517791614aa1f52bcb08be9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:27 +0100 Subject: [PATCH 444/685] python3Packages.starlette: 0.17.1 -> 0.18.0 --- pkgs/development/python-modules/starlette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 1084a50be77..00283cd9ec9 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.17.1"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-qT/w7r8PsrauLoBolwCGpxiwhDZo3z6hIqKVXeY5yqA="; + sha256 = "sha256-N2X9pjCiQ6TKRcm6VlyybLLyCdjQuIZHu1vK99gY8rY="; }; postPatch = '' From d2ce22d91d5af9e45b5425b07de33ace40cde9dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:27 +0100 Subject: [PATCH 445/685] python3Packages.stone: 3.2.1 -> 3.3.1 --- pkgs/development/python-modules/stone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 8ea42d1f279..a562840c1d2 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "stone"; - version = "3.2.1"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0xby5mpsms7b2rv8j6mvxzmzz5i9ii01brb9ylxz6kiv2i08piwv"; + sha256 = "sha256-TvA5dRL2CXV5dffsCbNWOdcrp+PhfOTd85lXg0a0y1A="; }; postPatch = '' From c43590b9892596a3ac693f639bfd96d3b9265da7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:27 +0100 Subject: [PATCH 446/685] python3Packages.sunpy: 3.1.3 -> 3.1.4 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 4e61f8665ba..9c88dc3462a 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.1.3"; + version = "3.1.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4acb05a05c7e6a2090cd0bb426b34c7e1620be0de2bf90a95a3f48ba15a5fce2"; + sha256 = "sha256-TDslY1KUohR9zyyJ6+B95MMMsUL1TBl49L+nSCvZ9nI="; }; nativeBuildInputs = [ From 95f1b9489481ba88c3a49fbc0b0520c5db748115 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:27 +0100 Subject: [PATCH 447/685] python3Packages.superqt: 0.2.5-1 -> 0.3.1 --- pkgs/development/python-modules/superqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index 9890a7000a9..717ac97fdcd 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -8,12 +8,12 @@ , pytestCheckHook }: buildPythonPackage rec { pname = "superqt"; - version = "0.2.5-1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rkTiCJ8mIogS9SDmLPiaAyhhuBx3kk6rXjCc19zbwiM="; + sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4="; }; format = "pyproject"; nativeBuildInputs = [ setuptools-scm ]; From d6c7eb3710604147b92f1206b910fd4ced4235ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:27 +0100 Subject: [PATCH 448/685] python3Packages.symengine: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/symengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index c2c22358661..ea093133ed5 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg="; + sha256 = "sha256-uyYVxBHkIiZVFcKZ1OKhcCQv42CISNKbCrfDCjKCeUA="; }; postConfigure = '' From 971afc6f8a5ca032c1efc1a69d04f8422a8b6c34 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:27 +0100 Subject: [PATCH 449/685] python3Packages.teletype: 1.1.0 -> 1.3.2 --- pkgs/development/python-modules/teletype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teletype/default.nix b/pkgs/development/python-modules/teletype/default.nix index c3878bf3c87..f7b5dad2324 100644 --- a/pkgs/development/python-modules/teletype/default.nix +++ b/pkgs/development/python-modules/teletype/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "teletype"; - version = "1.1.0"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "02mg0qmdf7hljq6jw1hwaid3hvkf70dfxgrxmpqybaxrph5pfg1y"; + sha256 = "sha256-9q46a4ui2kgSUL/vImR02r4T9huwLFwd70AqGBNJNzs="; }; # no tests From 895cec93e6caa8e49f32285d1bab71ee111e86b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:28 +0100 Subject: [PATCH 450/685] python3Packages.tempora: 5.0.0 -> 5.0.1 --- .../python-modules/tempora/default.nix | 59 +++++++++++++------ 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 6999655c5dc..ff837158fc2 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,36 +1,59 @@ -{ lib, buildPythonPackage, fetchPypi -, setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock -, six, pytz, jaraco_functools, pythonOlder -, pytest-flake8, pytest-cov, pytest-black, pytest-mypy +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build time +, setuptools-scm + +# runtime +, pytz +, jaraco_functools + +# tests +, freezegun +, pytest-freezegun +, pytestCheckHook }: buildPythonPackage rec { pname = "tempora"; - version = "5.0.0"; + version = "5.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "aa21dd1956e29559ecb2f2f2e14fcdb950085222fbbf86e6c946b5e1a8c36b26"; + sha256 = "sha256-y6Dxl6ZIg78+c2V++8AyTVvxcXnndpsThbTXXSbNkSc="; }; - disabled = pythonOlder "3.2"; - - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ six pytz jaraco_functools ]; - - checkInputs = [ - pytest-freezegun pytest freezegun backports_unittest-mock - pytest-flake8 pytest-cov pytest-black pytest-mypy + nativeBuildInputs = [ + setuptools-scm ]; - checkPhase = '' - pytest - ''; + propagatedBuildInputs = [ + jaraco_functools + pytz + ]; + + checkInputs = [ + freezegun + pytest-freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tempora" + "tempora.schedule" + "tempora.timing" + "tempora.utc" + ]; meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = "https://github.com/jaraco/tempora"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From ff3d1a100d7a6851d2cd0f12edc496095f28f758 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:28 +0100 Subject: [PATCH 451/685] python3Packages.tensorflow-datasets: 4.4.0 -> 4.5.2 --- .../python-modules/tensorflow-datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 98e38bba56a..90c9c8b2271 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -38,13 +38,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.4.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "v${version}"; - sha256 = "11kbpv54nwr0xf7z5mkj2lmrfqfmcdq8qcpapnqck1kiawr3yad6"; + sha256 = "sha256-OZpaY/6BMISq5IeDXyuyu5L/yG+DwlFliw4BsipPOLg="; }; patches = [ From 0346ec35dd516ad885775186b462394f432d5749 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:28 +0100 Subject: [PATCH 452/685] python3Packages.tensorflow-estimator: 2.7.0 -> 2.8.0 --- .../python-modules/tensorflow-estimator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index 5ad6d0ab6e5..7c7f155adb0 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.7.0"; + version = "2.8.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-MltaIkhkN5JCt7dsaYfKVEI5voJXnTPmjsfCvaV6vJ0="; + hash = "sha256-vujgUgxgrn6vbKjLRsWp9LRXJVMTgNuPvjj8tIR4trs="; }; propagatedBuildInputs = [ mock numpy absl-py ]; From 044ee9510ac8eae1f7722f98d7939f1f424113af Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:28 +0100 Subject: [PATCH 453/685] python3Packages.tensorflow-metadata: 1.5.0 -> 1.7.0 --- .../python-modules/tensorflow-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 2a80155c4cd..8839c2cddaa 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "v${version}"; - sha256 = "17p74k6rwswpmj7m16cw9hdam6b4m7v5bahirmc2l1kwfvrn4w33"; + sha256 = "sha256-CQlLEVNcD9u2pojz8r1eLzYzc9i2hjdZfzfYSQ/8Q4k="; }; patches = [ From a1bad1b6efbfcb302f025b63f532ce1e94f547a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:28 +0100 Subject: [PATCH 454/685] python3Packages.terminado: 0.12.1 -> 0.13.1 --- pkgs/development/python-modules/terminado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 28b0eb09dbe..6a63fe53716 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.12.1"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "b20fd93cc57c1678c799799d117874367cc07a3d2d55be95205b1a88fa08393f"; + sha256 = "sha256-W4K1xumR8HBadvlh9DJip/seVbCTwW3Kg/FjhKfzm3s="; }; propagatedBuildInputs = [ ptyprocess tornado ]; From 59b412808fb80331747da629b4571c6890cd52d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:28 +0100 Subject: [PATCH 455/685] python3Packages.testpath: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/testpath/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index e11ddeed50a..4db5aa362f4 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -2,18 +2,24 @@ , stdenv , buildPythonPackage , fetchPypi +, flit-core , pytestCheckHook }: buildPythonPackage rec { pname = "testpath"; - version = "0.5.0"; + version = "0.6.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "05z4s4d5i1ja16hiv4jhqv63fvg1a4vw77s0ay1sw11hrl5pmkqs"; + sha256 = "sha256-LxuX5kQsAmgevgG9hPUxAop8rqGvOCUAD1I0XDAoXg8="; }; + nativeBuildInputs = [ + flit-core + ]; + checkInputs = [ pytestCheckHook ]; From e9d5af6f88598c254485959d659ffbde30923b61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:29 +0100 Subject: [PATCH 456/685] python3Packages.tiledb: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/tiledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index b310defa45d..eabb2aff006 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = version; - sha256 = "0iz16sgr5dpwc1jvb6brcmgvvg0npjdd98q4wgkqmvg7qif92zls"; + sha256 = "sha256-ku+9kMXXrlPy4teV5KpTXAwExhIoPpAsGAHIBvsl9KI="; }; nativeBuildInputs = [ From 5fbafecfe7dc3943e3116830fdd998b896fef22d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:29 +0100 Subject: [PATCH 457/685] python3Packages.toggl-cli: 2.4.3 -> 3 --- pkgs/development/python-modules/toggl-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 30c3f08f52e..b1c0346b964 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "toggl-cli"; - version = "2.4.3"; + version = "3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "togglCli"; inherit version; - sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; + sha256 = "sha256-SkA/u1q//AyYn0v6uAXXsjANhFppxxjKhlhWhsK649w="; }; nativeBuildInputs = [ From 392eb5a52678f26bffe86798714c454334ba920c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:29 +0100 Subject: [PATCH 458/685] python3Packages.tomlkit: 0.8.0 -> 0.10.0 --- pkgs/development/python-modules/tomlkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 6c8455f060e..22f3ffab299 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.8.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1"; + sha256 = "sha256-2ZlGxq7TOHyYuJ2R+57f+PkBv5JVkBCBJmqE+1YErc0="; }; propagatedBuildInputs = From 9c0dd57650342880726181fe68a80e6f8fa0b5e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:29 +0100 Subject: [PATCH 459/685] python3Packages.towncrier: 21.3.0 -> 21.9.0 --- pkgs/development/python-modules/towncrier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 83215f5e0af..ae272c60651 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "towncrier"; - version = "21.3.0"; + version = "21.9.0"; src = fetchPypi { inherit pname version; - sha256 = "6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe"; + sha256 = "sha256-nLb0XBbhoe7J0OdlEWXnvmDNCrgdE6XJbKl6SYrof0g="; }; propagatedBuildInputs = [ From 69c14e851026d4b1451f177890101bb5bf0dac8c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:29 +0100 Subject: [PATCH 460/685] python3Packages.tpm2-pytss: 0.1.9 -> 1.0.0 --- pkgs/development/python-modules/tpm2-pytss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 544c1a3084a..5cd14c7704d 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { # Last version on github is 0.2.4, but it looks # like a mistake (it's missing commits from 0.1.9) - version = "0.1.9"; + version = "1.0.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-v5Xth0A3tFnLFg54nvWYL2TD201e/GWv+2y5Qc60CmU="; + sha256 = "sha256-Gx1nIXYuhTmQva9LmtTYvd1nyRH/pBQZ5bJ8OLcc1lo="; }; postPatch = '' substituteInPlace tpm2_pytss/config.py --replace \ From 629e4ebaeaa3a103147674fd12f57b6092d4dddf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:29 +0100 Subject: [PATCH 461/685] python3Packages.tqdm: 4.62.3 -> 4.63.0 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 3973d68b6c3..2613a2b587d 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.62.3"; + version = "4.63.0"; src = fetchPypi { inherit pname version; - sha256 = "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d"; + sha256 = "sha256-HZg17ejjlLuMncv/vKAtcXIXETrcZ5I2hz7qrFvAs80="; }; nativeBuildInputs = [ From 1295bdd6d4dd8ce7632a3a745253cdabb433d7f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:29 +0100 Subject: [PATCH 462/685] python3Packages.trio: 0.19.0 -> 0.20.0 --- .../python-modules/trio/default.nix | 44 ++++++++++++------- pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index e667f146afc..f9b325ecc29 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -13,19 +13,45 @@ , jedi , astor , yapf +, coreutils }: buildPythonPackage rec { pname = "trio"; - version = "0.19.0"; + version = "0.20.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "895e318e5ec5e8cea9f60b473b6edb95b215e82d99556a03eb2d20c5e027efe1"; + sha256 = "sha256-ZwpS0xFdDoeeGsg4pOuZmvMvhYFj46cE/kg53ipnYHA="; }; - checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi yapf ]; + propagatedBuildInputs = [ + attrs + sortedcontainers + async_generator + idna + outcome + sniffio + ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + + # tests are failing on Darwin + doCheck = !stdenv.isDarwin; + + checkInputs = [ + astor + jedi + pyopenssl + pytestCheckHook + trustme + yapf + ]; + + preCheck = '' + substituteInPlace trio/tests/test_subprocess.py \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" + ''; + # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. disabledTests = [ "getnameinfo" @@ -41,18 +67,6 @@ buildPythonPackage rec { "-W" "ignore::DeprecationWarning" ]; - propagatedBuildInputs = [ - attrs - sortedcontainers - async_generator - idna - outcome - sniffio - ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; - - # tests are failing on Darwin - doCheck = !stdenv.isDarwin; - meta = { description = "An async/await-native I/O library for humans and snake people"; homepage = "https://github.com/python-trio/trio"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2775766e1d..765a5e31724 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10084,7 +10084,9 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; - trio = callPackage ../development/python-modules/trio { }; + trio = callPackage ../development/python-modules/trio { + inherit (pkgs) coreutils; + }; trio-asyncio = callPackage ../development/python-modules/trio-asyncio { }; From 90edc9b417369f7e56b49196db7aeea9ac3f3bed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:29 +0100 Subject: [PATCH 463/685] python3Packages.trytond: 6.2.3 -> 6.2.6 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index c332a067a76..6a52dd869e0 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.2.3"; + version = "6.2.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9be5d27aff9ae9b0ab73a8805145b2cc89900b9b513e6d5bfce89e9b7167f8f4"; + sha256 = "sha256-Sof6A9lxU70YnCbboJr56CAdTL0cRbaRNxdvG5Tnqnw="; }; # Tells the tests which database to use From b0dc05e278ffa1bac8ed43c1e42a8668445782ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:30 +0100 Subject: [PATCH 464/685] python3Packages.tweepy: 4.5.0 -> 4.6.0 --- pkgs/development/python-modules/tweepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index a3526eb707b..c97fd85a8be 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.5.0"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-mRpYPuj2B/kEaaeZlNYYnViGxWiK1xtWfDObHNduIK8="; + sha256 = "sha256-7ogsocRTMTO5yegyY7BADu9NrHK7zMMbihBu8oF4UlQ="; }; propagatedBuildInputs = [ From 5bf27e9c710ca86fa9f223ed60ed90613e1b89bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:30 +0100 Subject: [PATCH 465/685] python3Packages.twilio: 7.5.0 -> 7.7.0 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ddc94541422..592cab7de77 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.5.0"; + version = "7.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0h6r9nz7dcvagrjhzvnirpnjazcy9r64cwlr2bnmlrbjhwdni9rq"; + sha256 = "sha256-PxLDAP/6Ddvf58eEyX3DHkdBNuLE5DlLdCEaRguqOy0="; }; propagatedBuildInputs = [ From 9ca8121a056a043849be4370b81cb21d03329f41 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:30 +0100 Subject: [PATCH 466/685] python3Packages.twine: 3.7.1 -> 3.8.0 --- pkgs/development/python-modules/twine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 82c157722d2..d6fea594211 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "twine"; - version = "3.7.1"; + version = "3.8.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8"; + sha256 = "sha256-jvpSZY4K53BoahO2dVaTKPH7qYN+XeGGe/5fRqmu/hk="; }; nativeBuildInputs = [ setuptools-scm ]; From d644daeae5550a74724aca31fa93bb7cdabfb3b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:30 +0100 Subject: [PATCH 467/685] python3Packages.Twisted: 21.7.0 -> 22.1.0 --- pkgs/development/python-modules/twisted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index b09ccebde19..055fdd44148 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -17,12 +17,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "21.7.0"; + version = "22.1.0"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "01lh225d7lfnmfx4f4kxwl3963gjc9yg8jfkn1w769v34ia55mic"; + sha256 = "sha256-t5ceyYBbD4Dh3LGjch17+tY21fkJ3mh0MM43OXnWe2E="; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; From f3ac3638c97d80bb968869798c9b785568b43824 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:30 +0100 Subject: [PATCH 468/685] python3Packages.txaio: 21.2.1 -> 22.2.1 --- pkgs/development/python-modules/txaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 074e7b8d509..23c24f3e514 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "txaio"; - version = "21.2.1"; + version = "22.2.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fW+JdFaAIz8cTbndt0jfXojSp6N5Yr4XTA/QTI26Hcg="; + sha256 = "sha256-LkWCtw8EsjRZCCVGhKmEIGwNm1DjB0okpMVauiHSTQE="; }; propagatedBuildInputs = [ From cf42c956151cf855ea953c8b20467122b2a3b94f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:30 +0100 Subject: [PATCH 469/685] python3Packages.typing-extensions: 4.0.1 -> 4.1.1 --- pkgs/development/python-modules/typing-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 1e29bc9a616..97f0d48cecc 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.0.1"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-TKCR3qFJ+UXsVq+0ja5xTyHoaS7yKjlSI7zTKJYbag4="; + hash = "sha256-GpRi3MM0enmx8cAnH7556ERYC7WYuvoe0gi5TaPNzUI="; }; nativeBuildInputs = [ From 1d91e765ed83bd8495b5249877555360fc1b49c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:30 +0100 Subject: [PATCH 470/685] python3Packages.ufo2ft: 2.25.2 -> 2.25.3 --- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index a3458b2f332..03ebd566b70 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "2.25.2"; + version = "2.25.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ooWIHvyMtrht4WcGPiacY8dfjPSb5uitHnTRTKvf2AA="; + sha256 = "sha256-4OuEol+YorvOeK5bj33Po8V9KD0trcgTMXCTQ+J7q94="; }; patches = [ From 05247d474867f6a574819b9f28a21823a52987fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:30 +0100 Subject: [PATCH 471/685] python3Packages.unidiff: 0.7.0 -> 0.7.3 --- pkgs/development/python-modules/unidiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 7dfd5c9d276..4c776070ae6 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.0"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447"; + sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU="; }; pythonImportsCheck = [ "unidiff" ]; From 686692133123f735a3d1157580079edcd0d148eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:31 +0100 Subject: [PATCH 472/685] python3Packages.unittest-xml-reporting: 3.0.4 -> 3.2.0 --- .../python-modules/unittest-xml-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index c8d1edc4210..de7f5669e23 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "3.0.4"; + version = "3.2.0"; disabled = isPy27; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695"; + sha256 = "sha256-7djTFwtAw6gbjPkQ9GxqMErihH7AEDbQLpwPm4V2LSg="; }; meta = with lib; { homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/"; From c14fa6ef87ff650c68178b55636ba2f2bd155b32 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:31 +0100 Subject: [PATCH 473/685] python3Packages.uproot: 4.1.9 -> 4.2.0 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index bf523046c61..8bf8e67b8e4 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.1.9"; + version = "4.2.0"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; rev = version; - sha256 = "035gljxm18hvpfvc7nsd7lhawwq3np5sg1y86pzcxc680c6rj6lx"; + sha256 = "sha256-ft2VXYGb+iPqRUrtOBvl7SgTPfPR4+IOdYFVTNbQAEw="; }; propagatedBuildInputs = [ From 53a230869983dc7aa04449ca73961743007e24b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:31 +0100 Subject: [PATCH 474/685] python3Packages.uvicorn: 0.16.0 -> 0.17.5 --- pkgs/development/python-modules/uvicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 4ce9228efee..a3238d4c548 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.16.0"; + version = "0.17.5"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; + sha256 = "sha256-66wPVnBLy2HK4p0m/b/DRxy12sk8AsVFZoFVcWRkL4s="; }; outputs = [ From 6e0c6410c4f82ea8780ff3bfd8cd817617338ecb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:31 +0100 Subject: [PATCH 475/685] python3Packages.virtualenv: 20.13.0 -> 20.13.2 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index c463c37747e..126bf4e6c6c 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.13.0"; + version = "20.13.2"; src = fetchPypi { inherit pname version; - sha256 = "d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd"; + sha256 = "sha256-AfX4B0TSSjdDzmGFgSNIjpHLLdHTvfkq2vG7o5/97fA="; }; nativeBuildInputs = [ From 45753ef770316cf822abdbe5a14ea5c9291703a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:31 +0100 Subject: [PATCH 476/685] python3Packages.websocket-client: 1.2.3 -> 1.3.1 --- pkgs/development/python-modules/websocket-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 116f45f16dd..37d926e5055 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.2.3"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5"; + sha256 = "sha256-YninUGU5VBgoP4h958O+r7OqaNraXKy+SyFOjSbaSZs="; }; propagatedBuildInputs = [ From 7b4ba31a0124a89acdece22a1c19b2dc4969bdfe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:32 +0100 Subject: [PATCH 477/685] python3Packages.werkzeug: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/werkzeug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index c75c59ac1c9..63c3ad1b420 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Werkzeug"; inherit version; - sha256 = "sha256-qiu2/I3ujWxQTArB5/X33FgQqZA+eTtvcVqfAVva25o="; + sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; }; propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [ From 8ec0f1582977ffda2477595bac4658bbcb09b132 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:32 +0100 Subject: [PATCH 478/685] python3Packages.wsproto: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/wsproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index d4dd7d08999..803ddd51d9f 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "wsproto"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.6"; # python versions <3.6 src = fetchPypi { inherit pname version; - sha256 = "868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38"; + sha256 = "sha256-ouVr/Vx82DwTadg7X+zNbTd5i3SHKGbmJhbg7PERvag="; }; propagatedBuildInputs = [ h11 ] ++ lib.optional isPy36 dataclasses; From 2531c18ff6277ef8699f9ac575e2f7eceddd75cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:32 +0100 Subject: [PATCH 479/685] python3Packages.xarray: 0.20.2 -> 2022.3.0 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 5f780a61ffc..85b8ac799c7 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.20.2"; + version = "2022.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wuvoDKgbEKAkH2h23MNKyWluXFzc30dY2nz0vXMsQfc="; + sha256 = "sha256-OYNEv30XBHeqzv9wIQ4R69aa9rFW/hOXgFTSXEhylEA="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; From 7d538f6e67d0bb05ba63bc749320e05b69b47bda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:32 +0100 Subject: [PATCH 480/685] python3Packages.xxhash: 2.0.2 -> 3.0.0 --- pkgs/development/python-modules/xxhash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index df3c0c85269..f70526da6a1 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "3.0.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49"; + sha256 = "sha256-MLLZeq8R+xIgI/a0TruXxpVengDXRhqWQVygMLXOucc="; }; meta = with lib; { From 5c7ca4ce545291b50689ee183dd5564f7afbc7c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:32 +0100 Subject: [PATCH 481/685] python3Packages.yq: 2.13.0 -> 2.14.0 --- pkgs/development/python-modules/yq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index b87982b20b6..5bcbf24dc30 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "yq"; - version = "2.13.0"; + version = "2.14.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/RMf2x9WcWrY1EzZ6q99OyLTm6iGHqZKQJzD9K4mPbg="; + sha256 = "sha256-9L8rKZ0eXH69dM+yXR9dm2QBBjusB6LQmhVhRMHWROE="; }; patches = [ From 38e635c3c223fe0244ca100cf45af47b847409b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:33 +0100 Subject: [PATCH 482/685] python3Packages.zarr: 2.10.3 -> 2.11.0 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 11c6f84850b..c943f34c52e 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.10.3"; + version = "2.11.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "76932665c2146ebdf15f6dba254f9e0030552fbfcf9322dea822bff96fbce693"; + sha256 = "sha256-sIc74nr1aQc4+hWOp6gC6uRUkEwzmVBWGFrMWnQltFE="; }; nativeBuildInputs = [ From ab9af820e92f3e3c880c222cf8e886dcd0b02cd3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:33 +0100 Subject: [PATCH 483/685] python3Packages.zimports: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/zimports/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index d350e204089..d4c6c6b7e47 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; rev = "v${version}"; - sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0"; + sha256 = "sha256-O8MHUt9yswL9fK9pEddkvnNS2E4vWA/S1BTs1OD1VbU="; }; disabled = !isPy3k; From 89fc3ff8d9ef9dd65bb37d97ac2f6d103454ecc4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:33 +0100 Subject: [PATCH 484/685] python3Packages.zope.exceptions: 4.4 -> 4.5 --- pkgs/development/python-modules/zope_exceptions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index 0586227c61c..fb1eb07154a 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.exceptions"; - version = "4.4"; + version = "4.5"; src = fetchPypi { inherit pname version; - sha256 = "0d72886b1bb8af4c346a117a540f28ab122577f5e3a105a261be72cd15776fda"; + sha256 = "sha256-TjW7oEiJxdEU3KpVKXQl1fM/YYqF7323Ehs7dxEAeE4="; }; propagatedBuildInputs = [ zope_interface ]; From 6df25afd5db94597444d637217b3cffcd52f6e01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Mar 2022 22:42:33 +0100 Subject: [PATCH 485/685] python3Packages.zopfli: 0.1.9 -> 0.2.0 --- pkgs/development/python-modules/zopfli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index d7e9cf507f0..1bc880456b6 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zopfli"; - version = "0.1.9"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b"; + sha256 = "sha256-x9PzVcSR84TkNNsuYmheq269pmuWTonhdUuxFLLTjOo="; extension = "zip"; }; From 3dcd2cd375e50d6d921aa41a620af31f46187396 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Mar 2022 16:05:57 -0800 Subject: [PATCH 486/685] python3Packages.mongoengine: relax pymongo deps --- pkgs/development/python-modules/mongoengine/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index b282332188b..269ebf2ef3c 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -36,12 +36,15 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "coverage==4.2" "coverage" + --replace "coverage==4.2" "coverage" \ + --replace "pymongo>=3.4,<=4.0" "pymongo" ''; # tests require mongodb running in background doCheck = false; + pythonImportsCheck = [ "mongoengine" ]; + meta = with lib; { description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB"; homepage = "http://mongoengine.org/"; From 9b22c1d2522d1af92fcc25025058489643169a86 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Mar 2022 16:06:30 -0800 Subject: [PATCH 487/685] python3Packages.lz4: remove stream import check, no longer exists --- pkgs/development/python-modules/lz4/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index bca476484c4..ce67f46d73b 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -42,7 +42,6 @@ buildPythonPackage rec { "lz4" "lz4.block" "lz4.frame" - "lz4.stream" ]; checkInputs = [ From 38e22a7f2f02db13fda9fa927e9480761e428244 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Mar 2022 16:26:54 -0800 Subject: [PATCH 488/685] python3Packages.lz4: fix build and tests --- pkgs/development/python-modules/lz4/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index ce67f46d73b..c6966e632f0 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, python # native inputs , pkgconfig @@ -42,6 +43,7 @@ buildPythonPackage rec { "lz4" "lz4.block" "lz4.frame" + "lz4.stream" ]; checkInputs = [ @@ -49,13 +51,13 @@ buildPythonPackage rec { psutil ]; - # leave build directory, so the installed library gets imported - preCheck = '' - pushd tests - ''; + # for lz4.steam + PYLZ4_EXPERIMENTAL = true; - postCheck = '' - popd + # prevent local lz4 directory from getting imported as it lacks native extensions + preCheck = '' + rm -r lz4 + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; meta = with lib; { From 59d328891228cfd8aa645e7f6ee6e760cf724268 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Mar 2022 13:35:01 +0100 Subject: [PATCH 489/685] python3Packages.aiohttp: disable tests causing warnings with pytest>=7.0 --- pkgs/development/python-modules/aiohttp/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f6d9b5d97ec..660e205fb48 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -75,6 +75,10 @@ buildPythonPackage rec { "test_client_session_timeout_zero" "test_mark_formdata_as_processed" "test_requote_redirect_url_default" + # Disable tests that trigger deprecation warnings in pytest + "test_async_with_session" + "test_session_close_awaitable" + "test_close_run_until_complete_not_deprecated" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] ++ lib.optionals stdenv.isDarwin [ From b24ffb8c9620623ae3a03f53256e3972fce34e19 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Mar 2022 15:27:25 +0100 Subject: [PATCH 490/685] python3Packages.anyio: 3.3.4 -> 3.5.0 --- pkgs/development/python-modules/anyio/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 382e64ea0f4..a9ae447d45f 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , setuptools-scm , idna @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.3.4"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,9 +28,17 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-aMnXZ+4dlybId2QhjE/3STY+Sj/vzI6K7wmqqx+P8yE="; + sha256 = "sha256-AZ9M/NBCBlMIUpRJgKbJRL/oReZDUh2Jhwtoxoo0tMs="; }; + patches = [ + (fetchpatch { + # Pytest 7.0 compatibility + url = "https://github.com/agronholm/anyio/commit/fed7cc4f95e196f68251bcb9253da3b143ea8e7e.patch"; + sha256 = "sha256-VmZmiQEmWJ4aPz0Wx+GTMZo7jXRDScnRYf2Hu2hiRVw="; + }) + ]; + preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION=${version} ''; From 19ff56c99b2e921bc12a53b34d61de5584583f63 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Mar 2022 07:52:26 -0800 Subject: [PATCH 491/685] python3Packages.httplib2: disable improperly marked tests --- pkgs/development/python-modules/httplib2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 8f74099a96a..852bcdff861 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -52,6 +52,10 @@ buildPythonPackage rec { # ValueError: Unable to load PEM file. # https://github.com/httplib2/httplib2/issues/192#issuecomment-993165140 "test_client_cert_password_verified" + + # improper pytest marking + "test_head_301" + "test_303" ] ++ lib.optionals stdenv.isDarwin [ # fails with "ConnectionResetError: [Errno 54] Connection reset by peer" "test_connection_close" From b8e5d4bb92de8e873a712ceb992fd2186558f4d2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Mar 2022 08:02:50 -0800 Subject: [PATCH 492/685] python3Packages.azure-mgmt-trafficmanager: fix build --- .../python-modules/azure-mgmt-trafficmanager/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix index ebb9466e9e2..68d14c49ef6 100644 --- a/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-trafficmanager/default.nix @@ -4,6 +4,7 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: @@ -22,6 +23,7 @@ buildPythonPackage rec { msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; From d713dfae5e9a5853c394221281683ad98c9940b4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Mar 2022 08:03:15 -0800 Subject: [PATCH 493/685] python3Packges.azure-identity: relax msal-extensions bounds --- pkgs/development/python-modules/azure-identity/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index ea0696e294a..44660e56f42 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "msal-extensions~=0.3.0" "msal-extensions" + ''; + propagatedBuildInputs = [ azure-common azure-core From 36ac329f39d30c33972062a1ccbe6b14ef612a33 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Mar 2022 23:35:07 +0100 Subject: [PATCH 494/685] python3Packages.django-appconf: rename from django_appconf, clean up --- .../default.nix | 33 ++++++++++++------- .../django-statici18n/default.nix | 4 +-- .../django_compressor/default.nix | 4 +-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 28 insertions(+), 16 deletions(-) rename pkgs/development/python-modules/{django_appconf => django-appconf}/default.nix (59%) diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix similarity index 59% rename from pkgs/development/python-modules/django_appconf/default.nix rename to pkgs/development/python-modules/django-appconf/default.nix index 5da9ed0ca26..bfa0cac6443 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -1,7 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, django, fetchpatch }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, django +, six +, python +}: + buildPythonPackage rec { pname = "django-appconf"; version = "1.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "django-compressor"; @@ -10,20 +21,20 @@ buildPythonPackage rec { sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h"; }; - propagatedBuildInputs = [ six django ]; - - patches = [ - (fetchpatch { - name = "backport_django_2_2.patch"; - url = "https://github.com/django-compressor/django-appconf/commit/1526a842ee084b791aa66c931b3822091a442853.patch"; - sha256 = "1vl2s6vlf15089s8p4c3g4d5iqm8jva66bdw683r8440f80ixgmw"; - }) + propagatedBuildInputs = [ + django + six ]; - checkPhase = '' + preCheck = '' # prove we're running tests against installed package, not build dir rm -r appconf - python -m django test --settings="tests.test_settings" + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m django test --settings=tests.test_settings + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 78c807903c4..db7d36c8993 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, django, django_appconf }: +{ lib, buildPythonPackage, fetchPypi, django, django-appconf }: buildPythonPackage rec { pname = "django-statici18n"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628"; }; - propagatedBuildInputs = [ django django_appconf ]; + propagatedBuildInputs = [ django django-appconf ]; # pypi package does not contains test harness # source tarball requires setting up a config diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index a8204eab5fa..82684b52374 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - rcssmin, rjsmin, django_appconf }: + rcssmin, rjsmin, django-appconf }: buildPythonPackage rec { pname = "django_compressor"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # requires django-sekizai, which we don't have packaged yet doCheck = false; - propagatedBuildInputs = [ rcssmin rjsmin django_appconf ]; + propagatedBuildInputs = [ rcssmin rjsmin django-appconf ]; meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 39e4c787f5e..0126ac46390 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -50,6 +50,7 @@ mapAliases ({ diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 + django_appconf = django-appconf; # added 2022-03-03 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 django_redis = django-redis; # added 2021-10-11 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 765a5e31724..c502b6751b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2219,7 +2219,7 @@ in { django-anymail = callPackage ../development/python-modules/django-anymail { }; - django_appconf = callPackage ../development/python-modules/django_appconf { }; + django-appconf = callPackage ../development/python-modules/django-appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; From ff4f42990cccc0da4260bb3f7cd57f22024e50cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Mar 2022 23:35:59 +0100 Subject: [PATCH 495/685] python3Packages.django-appconf: 1.0.3 -> 1.0.5 --- pkgs/development/python-modules/django-appconf/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django-appconf/default.nix b/pkgs/development/python-modules/django-appconf/default.nix index bfa0cac6443..66eef9d4728 100644 --- a/pkgs/development/python-modules/django-appconf/default.nix +++ b/pkgs/development/python-modules/django-appconf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-appconf"; - version = "1.0.3"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,13 +17,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-compressor"; repo = "django-appconf"; - rev = version; - sha256 = "06hwbz7362y0la9np3df25mms235fcqgpd2vn0mnf8dri9spzy1h"; + rev = "v${version}"; + hash = "sha256-nS4Hwp/NYg1XGvZO1tiE9mzJA7WFifyvgAjyp3YpqS4="; }; propagatedBuildInputs = [ django - six ]; preCheck = '' From 389beb05dc70172f9d67319190eeb56c3c07762f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Mar 2022 23:41:22 +0100 Subject: [PATCH 496/685] python3Packages.promise: fix build --- pkgs/development/python-modules/promise/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix index 403f0c09791..8833689cec1 100644 --- a/pkgs/development/python-modules/promise/default.nix +++ b/pkgs/development/python-modules/promise/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6"; }; + postPatch = '' + substituteInPlace tests/test_extra.py \ + --replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)" + ''; + propagatedBuildInputs = [ six ]; From da5aba49bc48daacd7c6c414ab5574902e8a60cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Mar 2022 23:45:59 +0100 Subject: [PATCH 497/685] python3Packages.ansi: fix build, enable tests --- .../python-modules/ansi/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 73873f8c4cb..5847e3ad0f9 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -1,17 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "ansi"; version = "0.3.6"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-EFRc4lCORw6SCNDMIAYWAy/cgbhJZ4gm+3yByCP9SLE="; + src = fetchFromGitHub { + owner = "tehmaze"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M="; }; - checkPhase = '' - python -c "import ansi.color" - ''; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ansi.colour" + "ansi.color" + ]; meta = with lib; { description = "ANSI cursor movement and graphics"; From f88a4d31f82ee0b16266b96bc562d94dccd2f4da Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Mar 2022 17:31:23 -0800 Subject: [PATCH 498/685] python3Packages.pybluez: mark disabled, requires use2to3 --- pkgs/development/python-modules/pybluez/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pybluez/default.nix b/pkgs/development/python-modules/pybluez/default.nix index 1cd7d91ef25..ae90c21bea9 100644 --- a/pkgs/development/python-modules/pybluez/default.nix +++ b/pkgs/development/python-modules/pybluez/default.nix @@ -2,11 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pkgs +, isPy3k }: buildPythonPackage rec { version = "unstable-20160819"; pname = "pybluez"; + # requires use2to3, which is no longer supported in setuptools>58 + disabled = isPy3k; propagatedBuildInputs = [ pkgs.bluez ]; From a99cc441ee2c45810c0e3455b897ca6f136fc70f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Mar 2022 17:39:15 -0800 Subject: [PATCH 499/685] python3Packages.azure-mgmt-loganalytics: prune unneeded dependency --- .../python-modules/azure-mgmt-loganalytics/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 947bb4a28ba..9629c6e7bba 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -4,7 +4,6 @@ , msrest , msrestazure , azure-common -, azure-mgmt-nspkg , azure-mgmt-core }: @@ -22,7 +21,6 @@ buildPythonPackage rec { msrest msrestazure azure-common - azure-mgmt-nspkg azure-mgmt-core ]; From e43897d2c235bab9c492391d216fc0f25ca8eaaa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Mar 2022 17:44:29 -0800 Subject: [PATCH 500/685] azure-cli: 2.32.0 -> 2.34.1 --- pkgs/tools/admin/azure-cli/default.nix | 4 +- .../tools/admin/azure-cli/python-packages.nix | 55 ++++++++++--------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index efd1ecfee3c..01cb5081cf4 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.32.0"; + version = "2.34.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-PXY32bfuK0bQGI0N+XHs9lakF6K7+WjrHMvuNgDFSJM="; + sha256 = "sha256-BEEwxf3UTShKi3K/uBK1yMxyPCvybL/BbKsu8XAwu0M="; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 9fbb9d3e50a..5b8732f5375 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -69,7 +69,8 @@ let postPatch = '' substituteInPlace setup.py \ --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ - --replace "cryptography>=3.2,<3.4" "cryptography" + --replace "cryptography>=3.2,<3.4" "cryptography" \ + --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" ''; checkInputs = with self; [ pytest ]; @@ -117,11 +118,11 @@ let ''; }; - azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" - "sha256-zl/bDsli7d/oXNgiBekXfLC720RSZXRuOLO7vx8W3HM="; + azure-batch = overrideAzureMgmtPackage super.azure-batch "12.0.0" "zip" + "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes="; - azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" - "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; + azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "3.0.0" "zip" + "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154"; azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "16.0.0" "zip" "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; @@ -156,8 +157,8 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.0.0" "zip" "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip" - "sha256-Sduw9RAG1VfL0LIpmcuezz6rwr5G2W78xtZRxrM3VLM="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "25.0.0" "zip" + "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -165,8 +166,8 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip" "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.1.0" "zip" - "sha256-NlTIrOK4ho0OqcTHjHT1HobiMzDH2KY20TIlN0fm8/Q="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "17.0.0" "zip" + "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "7.0.0b2" "zip" "sha256-hVvYW9gkfTVMwis3IdD0JXYDxdKcyyzIFx3hNk7VMLI="; @@ -183,11 +184,11 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.0.0" "zip" "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.1.0" "zip" - "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.2.0" "zip" + "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; - azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.0.0" "zip" - "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip" + "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0" "zip" "64df73df449a6f3717f3d0963e5869224ed3e6216c79de571493bea7c1b52cb6"; @@ -198,14 +199,14 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "5.1.0" "zip" - "sha256-MGCICI7hDobEzyTMgqnKYZ21zfwNo/ogfQDsf3fwbo4="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "6.0.1" "zip" + "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "12.0.0" "zip" - "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b2" "zip" + "sha256-j8CyWZGF7Z/5szJ+CD96E0EbNsceJ1SScrlPqWVLjnk="; azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.3.0" "zip" "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11"; @@ -216,8 +217,8 @@ let azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; - azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "0.1.0" "zip" - "sha256-/2LZgu3aY0o2Fgyx0Vo2epVypay0GeXnrTcejIO9R8c="; + azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "1.0.0" "zip" + "bab9bd532a1c34557f5b0ab9950e431e3f00bb96e8a3ce66df0f6ce2ae19cd73"; azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; @@ -231,8 +232,8 @@ let azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "4.0.0" "zip" - "sha256-5XQ3qTPn3qmwYY/nkODa3GP5hXc1NhrItfXoBiucKg0="; + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "6.1.0" "zip" + "c26635089276515b0488fcf014aab50a0446f54800c6e0e5583cc493ac8d738f"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.0.0" "zip" "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980"; @@ -291,11 +292,11 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "19.0.0" "zip" - "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "19.1.0" "zip" + "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "6.0.0" "zip" - "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "7.1.0" "zip" + "d8ae7905fb7d3e24822daa20aa7bc5014f41aa18b48ea2d0161e997fc11a3d36"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; @@ -413,12 +414,12 @@ let }); azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec { - version = "4.5.0b4"; + version = "4.5.0b6"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; - sha256 = "sha256-f43ZTMFc0IVIaa69gEZFOLALREcx3RRCFoYDY2FYLrY="; + sha256 = "sha256-WFSRJaia0+WnvGxoMYZIvf81ue51VPYXzTp8huUh1fc="; }; }); From 3f79fee1404cb3987e9ffb8b51a9f47a8d980c0e Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 4 Mar 2022 13:15:10 +0700 Subject: [PATCH 501/685] python3Packages.watchdog: fix build --- pkgs/development/python-modules/watchdog/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 9fba5785c44..1bc471c7287 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { --replace "--cov-report=term-missing" "" ''; + disabledTests = [ + # probably failing because of an encoding related issue + "test_create_wrong_encoding" + ]; + disabledTestPaths = [ # Tests are flaky "tests/test_inotify_buffer.py" From 7ad70102309a396203e1ead68acecc72230a012b Mon Sep 17 00:00:00 2001 From: DavHau Date: Fri, 4 Mar 2022 18:13:51 +0700 Subject: [PATCH 502/685] python3Packages.scikit-learn: disable more tests --- .../python-modules/scikit-learn/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 7e2096c9b9b..fe5dba10511 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -65,6 +65,22 @@ buildPythonPackage rec { "check_regressors_train" "check_classifiers_train" "xfail_ignored_in_check_estimator" + + # failing on x86_64-linux + "test_kernel_pca_consistent_transform" + "test_kernel_pca_raise_not_fitted_error" + "test_32_64_decomposition_shape" + "test_randomized_eigsh_reconst_low_rank" + "test_randomized_svd_low_rank_with_noise" + + "test_row_norms" + "test_randomized_svd_infinite_rank" + "test_randomized_svd_transpose_consistency" + "test_randomized_svd_sparse_warnings" + "test_randomized_svd_sign_flip" + "test_incremental_weighted_mean_and_variance_ignore_nan" + "test_randomized_svd_infinite_rank" + "test_randomized_eigsh_compared_to_others" ]; pytestFlagsArray = [ @@ -77,7 +93,7 @@ buildPythonPackage rec { # (https://github.com/joblib/joblib/issues/563). See also: # https://github.com/scikit-learn/scikit-learn/issues/17582 # Since we are overriding '-k' we need to include the 'disabledTests' from above manually. - "-k" "'not (NuSVC and memmap) ${toString (lib.forEach disabledTests (t: "and not ${t}"))}'" + "-k" "'not (NuSVC and memmap) and not KernelPCA ${toString (lib.forEach disabledTests (t: "and not ${t}"))}'" "-n" "$NIX_BUILD_CORES" ]; From 619184159255d82ba1db57ec4d5e362d20fbdec5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Mar 2022 09:42:37 -0800 Subject: [PATCH 503/685] python3Packages.meshio: add missing deps --- pkgs/development/python-modules/meshio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 7c7b67a0739..1471ea5b1e5 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -6,6 +6,7 @@ , h5py , exdown , pytestCheckHook +, rich }: buildPythonPackage rec { @@ -22,6 +23,7 @@ buildPythonPackage rec { numpy netcdf4 h5py + rich ]; checkInputs = [ From ddcd1d41c81d7d2d1ea9647c21b915c9eb03c3a0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Mar 2022 10:00:19 -0800 Subject: [PATCH 504/685] python3Packages.botocore: 1.24.11 -> 1.24.12 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 70e502993b3..0c69de1c0e0 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.24.11"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.24.12"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-Kvk95wTzEih4oyM+fPXeCwL2xMn6mTyoU7WD9Ze7HDg="; + sha256 = "sha256-AXSZmgSwouQkVxBgk6zps2+pR3KkQtm89gdQJj0dBz4="; }; propagatedBuildInputs = [ From 13e7bbe1076e2b7648ec3cb3fd1669ae31ec406b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Mar 2022 10:01:02 -0800 Subject: [PATCH 505/685] python3Packages.boto3: 1.21.11 -> 1.21.12 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 1c3fed6b1aa..d1a104f6ae9 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.21.11"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.21.12"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-8s7PXRdvOYo5v94ACN+DwD8hQrK+XqvjK/EElh32iBA="; + sha256 = "sha256-yS7CCmcHIbWhvAE7MFqE2yt/nHFmU7MFbOfi+9KhgO8="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From ba1ca789eb55f04c9d3e89889eb3b98592d86fb6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Mar 2022 10:01:46 -0800 Subject: [PATCH 506/685] awscli2: 2.4.19 -> 2.4.23 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 08fb92e4ea6..2be7a261ba8 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -33,13 +33,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.4.19"; # N.B: if you change this, change botocore to a matching version too + version = "2.4.23"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-ZOSZBZT4d5jv5lg8KkGoOJqAvStUsGZbiXp3dpsrOpo="; + sha256 = "sha256-zpkphlIfmexqZm0lZgDP3RoQJqTpFdT+5dGtaLiRr/U="; }; propagatedBuildInputs = [ From e2bfa582fffbdaaa540ef84788c6c06a556689a6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Mar 2022 10:02:15 -0800 Subject: [PATCH 507/685] awscli: 1.22.35 -> 1.22.67 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 11cf6c53076..1e82459f4c6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.22.35"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.22.67"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-GsMclLh/VtPaNjD+XDKqTYeSX29R2aRS7If9G918OWY="; + hash = "sha256-ofgxL9V/jTn/itxSOLGYkAmgQXES7aVUM/vM6nWdbBc="; }; # https://github.com/aws/aws-cli/issues/4837 From 728073f0e0837ac1338bd5397448c251da1760d5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Mar 2022 10:12:05 -0800 Subject: [PATCH 508/685] python310Packages.typeguard: disable python310 incompatible tests --- .../python-modules/typeguard/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 8b2ff2de512..dd3f62527aa 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -3,7 +3,7 @@ , pythonOlder , lib , setuptools-scm -, pytest +, pytestCheckHook , typing-extensions , glibcLocales }: @@ -26,12 +26,17 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace " --cov" "" ''; - checkInputs = [ pytest typing-extensions ]; + checkInputs = [ pytestCheckHook typing-extensions ]; - # mypy tests aren't passing with latest mypy - checkPhase = '' - py.test . --ignore=tests/mypy - ''; + disabledTestPaths = [ + # mypy tests aren't passing with latest mypy + "tests/mypy" + ]; + + disabledTests = [ + # not compatible with python3.10 + "test_typed_dict" + ]; disabled = pythonOlder "3.3"; From 5377b75a52156cf3cc94cb0fa3e8237ef76a0856 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 15:34:59 +0100 Subject: [PATCH 509/685] awscli2: prune dependency substitution for cryptography --- pkgs/tools/admin/awscli2/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 2be7a261ba8..16c547dbeba 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -69,7 +69,6 @@ with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.cfg \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ - --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ --replace "wcwidth<0.2.0" "wcwidth" \ From 98d4760be86d775e8c9665b2446d9080f3a7a381 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 20:36:20 +0100 Subject: [PATCH 510/685] python3Packages.deepdiff: 5.6.0 -> 5.7.0 Relaxes the ordered-set constraint. --- pkgs/development/python-modules/deepdiff/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 67f5347e1e7..2601eedc2fa 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -12,18 +12,21 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.6.0"; + version = "5.7.0"; format = "setuptools"; # pypi source does not contain all fixtures required for tests src = fetchFromGitHub { owner = "seperman"; repo = "deepdiff"; - rev = version; - sha256 = "sha256-ysaIeVefsTX7ZubOXaEzeS1kMyBp4/w3SHNFxsGVhzY="; + # 5.7.0 release not tagged https://github.com/seperman/deepdiff/issues/300 + rev = "f2ffdb83b2993f4f0bb7e854620f0acd0bf6339e"; + hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk="; }; postPatch = '' + substituteInPlace requirements.txt \ + --replace "ordered-set==4.0.2" "ordered-set" substituteInPlace tests/test_command.py \ --replace '/tmp/' "$TMPDIR/" ''; From f4328208135ae44533b3f69a5dce571c7e850447 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 20:53:04 +0100 Subject: [PATCH 511/685] python3Packages.tomli: 1.2.2 -> 2.0.1 https://github.com/hukkin/tomli/blob/2.0.1/CHANGELOG.md#201 --- .../python-modules/tomli/default.nix | 29 ++++++------------- .../fix-backwards-compatibility-load.patch | 21 -------------- .../python-modules/tomli/tests.nix | 21 -------------- 3 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch delete mode 100644 pkgs/development/python-modules/tomli/tests.nix diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index 551655eebf0..c9c9cb46b2c 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -3,6 +3,7 @@ , callPackage , fetchFromGitHub , flit-core +, python # important downstream dependencies , flit @@ -13,40 +14,28 @@ buildPythonPackage rec { pname = "tomli"; - version = "1.2.2"; + version = "2.0.1"; format = "pyproject"; - outputs = [ - "out" - "testsout" - ]; - src = fetchFromGitHub { owner = "hukkin"; repo = pname; rev = version; - sha256 = "sha256-oDjpNzWxTaCC1+WyBKrkR6kp90ZomcZQfyW+xKddDoM="; + sha256 = "sha256-v0ZMrHIIaGeORwD4JiBeLthmnKZODK5odZVL0SY4etA="; }; - patches = [ - # required for mypy - ./fix-backwards-compatibility-load.patch - ]; - nativeBuildInputs = [ flit-core ]; - postInstall = '' - mkdir $testsout - cp -R benchmark/ pyproject.toml tests/ $testsout/ - ''; - pythonImportsCheck = [ "tomli" ]; - # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm - doCheck = false; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; passthru.tests = { - pytest = callPackage ./tests.nix { }; + # test downstream dependencies inherit flit black mypy setuptools-scm; }; diff --git a/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch b/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch deleted file mode 100644 index edfc2f38349..00000000000 --- a/pkgs/development/python-modules/tomli/fix-backwards-compatibility-load.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/tomli/_parser.py b/tomli/_parser.py -index 89e81c3..6fb1bfd 100644 ---- a/tomli/_parser.py -+++ b/tomli/_parser.py -@@ -1,6 +1,6 @@ - import string - from types import MappingProxyType --from typing import Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple -+from typing import IO, Union, Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple - import warnings - - from tomli._re import ( -@@ -48,7 +48,7 @@ class TOMLDecodeError(ValueError): - """An error raised if a document is not valid TOML.""" - - --def load(fp: BinaryIO, *, parse_float: ParseFloat = float) -> Dict[str, Any]: -+def load(fp: Union[IO, BinaryIO], *, parse_float: ParseFloat = float) -> Dict[str, Any]: - """Parse TOML from a binary file object.""" - s_bytes = fp.read() - try: diff --git a/pkgs/development/python-modules/tomli/tests.nix b/pkgs/development/python-modules/tomli/tests.nix deleted file mode 100644 index 5d3d67dbd12..00000000000 --- a/pkgs/development/python-modules/tomli/tests.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ buildPythonPackage -, tomli -, pytestCheckHook -, python-dateutil -}: - -buildPythonPackage rec { - pname = "tomli-tests"; - inherit (tomli) version; - - src = tomli.testsout; - - dontBuild = true; - dontInstall = true; - - checkInputs = [ - pytestCheckHook - python-dateutil - tomli - ]; -} From ba276cf1e6045782813048441df763d4d26ad31d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 21:26:48 +0100 Subject: [PATCH 512/685] python3Packages.hatchling: init at 0.18.0 --- .../python-modules/hatchling/default.nix | 84 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/hatchling/default.nix diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix new file mode 100644 index 00000000000..b656c64baf9 --- /dev/null +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# runtime +, editables +, importlib-metadata # < 3.8 +, packaging +, pathspec +, pluggy +, tomli + +# tests +, build +, python +, requests +, toml +, virtualenv +}: + +let + pname = "hatchling"; + version = "0.18.0"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ofek"; + repo = "hatch"; + rev = "${pname}-v${version}"; + hash = "sha256-kCaEAM0cY1yQcuHfvnaLs3smN9MKATjrrQTXpCfGmWc="; + }; + + prePatch = '' + cd backend + ''; + + # listed in backend/src/hatchling/ouroboros.py + propagatedBuildInputs = [ + editables + packaging + pathspec + pluggy + tomli + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + pythonImportsCheck = [ + "hatchling" + ]; + + # tries to fetch packages from the internet + doCheck = false; + + # listed in /backend/tests/downstream/requirements.txt + checkInputs = [ + build + packaging + requests + toml + virtualenv + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} tests/downstream/integrate.py + runHook postCheck + ''; + + meta = with lib; { + description = "Modern, extensible Python build backend"; + homepage = "https://ofek.dev/hatch/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c502b6751b2..96ee3476ea3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3692,6 +3692,8 @@ in { hatasmota = callPackage ../development/python-modules/hatasmota { }; + hatchling = callPackage ../development/python-modules/hatchling { }; + haversine = callPackage ../development/python-modules/haversine { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; From 6194910f2ec5a40fb233da6f8ca23499193f16d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 22:08:59 +0100 Subject: [PATCH 513/685] python3Packages.devtools: ignore pytest8 deprecation warning --- pkgs/development/python-modules/devtools/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index 5d4f0871bf7..c9e0a79a241 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -34,6 +34,11 @@ buildPythonPackage rec { pytest-mock ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Passing None has been deprecated. + "-W ignore::pytest.PytestRemovedIn8Warning" + ]; + disabledTests = [ # Test for Windows32 "test_print_subprocess" From 291b6d4a0d0b21b6366c92ee0a88189cfd65aac2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 22:12:14 +0100 Subject: [PATCH 514/685] python3Packages.pyownet: drop use_2to3 from setup.py https://github.com/miccoli/pyownet/issues/12 --- pkgs/development/python-modules/pyownet/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyownet/default.nix b/pkgs/development/python-modules/pyownet/default.nix index 2bdc18e1e24..9a368c26087 100644 --- a/pkgs/development/python-modules/pyownet/default.nix +++ b/pkgs/development/python-modules/pyownet/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { sha256 = "4f2fa4471c2f806b35090bdc6c092305c6eded3ff3736f8b586d35bdb157de62"; }; + postPatch = '' + sed -i '/use_2to3/d' setup.py + ''; + # tests access network doCheck = false; From 10741a330bd47005d10f69ab4c52eb5bb80358f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 22:20:36 +0100 Subject: [PATCH 515/685] python3Packages.datadog: 0.43.0 -> 0.44.0 --- pkgs/development/python-modules/datadog/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index c15e673fa3e..7d32650302f 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, hatchling , decorator , requests , typing ? null @@ -17,17 +18,22 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.43.0"; + version = "0.44.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1f2123083d9e1add6f238c62714b76ac2fc134d7d1c435cd82b976487b191b96"; + sha256 = "sha256-BxFw8MfvIlEdv3+b12xL5QDuLT1SBykApch7VJXSxzM="; }; postPatch = '' find . -name '*.pyc' -exec rm {} \; ''; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ decorator requests ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optional (pythonOlder "3.0") configparser; From 518c1876fe34cef78b47484d571745a6a4c04d56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Mar 2022 22:29:03 +0100 Subject: [PATCH 516/685] python3Packages.chalice: 1.26.4 -> 1.26.6 --- pkgs/development/python-modules/chalice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 762846ab34c..93499d0f563 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.26.4"; + version = "1.26.6"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "sha256-Xn8OqeEihLxZS9QZtrhzau2zLg9SzQrrigK70PoImhU="; + sha256 = "sha256-6Y5pJg6N/F97zvkyo4r6MoThi79kI53AvlHNOmOCpFA="; }; propagatedBuildInputs = [ From dcfccc56221499354f3f304bcb9112285904b576 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 00:55:54 +0100 Subject: [PATCH 517/685] python3Packages.django_2: drop The package goes EOL in 2022/04 and is therefore being removed. Closes: #157905 --- .../django/1.10-gis-libs.template.patch | 24 ------------ pkgs/development/python-modules/django/2.nix | 39 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - 4 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 pkgs/development/python-modules/django/1.10-gis-libs.template.patch delete mode 100644 pkgs/development/python-modules/django/2.nix diff --git a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch b/pkgs/development/python-modules/django/1.10-gis-libs.template.patch deleted file mode 100644 index da154554d1b..00000000000 --- a/pkgs/development/python-modules/django/1.10-gis-libs.template.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py ---- a/django/contrib/gis/gdal/libgdal.py -+++ b/django/contrib/gis/gdal/libgdal.py -@@ -17,7 +17,7 @@ try: - lib_path = settings.GDAL_LIBRARY_PATH - except (AttributeError, EnvironmentError, - ImportError, ImproperlyConfigured): -- lib_path = None -+ lib_path = "@gdal@/lib/libgdal@extension@" - - if lib_path: - lib_names = None -diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py ---- a/django/contrib/gis/geos/libgeos.py -+++ b/django/contrib/gis/geos/libgeos.py -@@ -26,7 +26,7 @@ try: - lib_path = settings.GEOS_LIBRARY_PATH - except (AttributeError, EnvironmentError, - ImportError, ImproperlyConfigured): -- lib_path = None -+ lib_path = "@geos@/lib/libgeos_c@extension@" - - # Setting the appropriate names for the GEOS-C library. - if lib_path: diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix deleted file mode 100644 index 727bf304fdb..00000000000 --- a/pkgs/development/python-modules/django/2.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, - isPy3k, - geos, gdal, pytz, sqlparse, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "django"; - version = "2.2.27"; - - disabled = !isPy3k; - - src = fetchPypi { - pname = "Django"; - inherit version; - sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM="; - }; - - patches = lib.optional withGdal - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ; - - propagatedBuildInputs = [ pytz sqlparse ]; - - # too complicated to setup - doCheck = false; - - meta = with lib; { - description = "A high-level Python Web framework"; - homepage = "https://www.djangoproject.com/"; - license = licenses.bsd3; - maintainers = with maintainers; [ georgewhewell ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0126ac46390..ed64f987d95 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -50,6 +50,7 @@ mapAliases ({ diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 + django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 django_appconf = django-appconf; # added 2022-03-03 django_environ = django-environ; # added 2021-12-25 django_extensions = django-extensions; # added 2022-01-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96ee3476ea3..1293b085386 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2209,7 +2209,6 @@ in { django = self.django_3; # Current LTS - django_2 = callPackage ../development/python-modules/django/2.nix { }; django_3 = callPackage ../development/python-modules/django/3.nix { }; # Current latest From f8c288f13d448ebcef738f529f9e52ef6d9b775b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 00:57:19 +0100 Subject: [PATCH 518/685] python3Packages.django-raster: drop django version condition --- pkgs/development/python-modules/django-raster/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 713e7214cfb..f590aca527f 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -2,9 +2,7 @@ numpy, django_colorful, pillow, psycopg2, pyparsing, django, celery, boto3, importlib-metadata }: -if lib.versionOlder django.version "2.0" -then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2." -else + buildPythonPackage rec { version = "0.8.1"; pname = "django-raster"; From d9fc0dafbb7f78383f23d2ffba5fe0d5669d46b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 01:36:48 +0100 Subject: [PATCH 519/685] home-assistant: update pytest-aiohttp and related overrides --- pkgs/servers/home-assistant/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2bb62161547..ae61ce4568e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -37,8 +37,11 @@ let version = "0.3.0"; src = oldAttrs.src.override { inherit version; - sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + hash = "sha256-ySmFQzljeXc3WDhwO2L+9jUoWYvAqdRRY566lfSqpE8="; }; + propagatedBuildInputs = with python3.pkgs; [ aiohttp pytest ]; + doCheck = false; + patches = []; }); aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 @@ -46,6 +49,9 @@ let hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + snitun = super.snitun.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); From abb594d4334332f0f32c33ecb2ab6669ce2534e2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 13:56:52 +0100 Subject: [PATCH 520/685] python3Packages.sanic-testing: relax httpx constraint --- .../development/python-modules/sanic-testing/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 4bc446c2e14..1e405955eb9 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -19,11 +19,14 @@ buildPythonPackage rec { sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8"; }; + outputs = [ + "out" + "testsout" + ]; + postPatch = '' - # https://github.com/sanic-org/sanic-testing/issues/19 substituteInPlace setup.py \ - --replace '"websockets==8.1",' '"websockets>=9.1",' \ - --replace "httpx==0.18.*" "httpx" + --replace "httpx>=0.18,<0.22" "httpx" ''; propagatedBuildInputs = [ From 5035d7b6505ca2519ab16e4782b2066bd69c0cfb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 13:57:10 +0100 Subject: [PATCH 521/685] python3Packages.sanic-testing: extract tests into passthru.pytest Previously the pytestCheckHook had no meaning, since the tests were always executed using by other means. Extracting the tests into a dedicated package has become the standard way to escape infinite recursion issues and offers a cleaner approach here. --- .../python-modules/sanic-testing/default.nix | 23 ++++++++-------- .../python-modules/sanic-testing/tests.nix | 26 +++++++++++++++++++ 2 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/sanic-testing/tests.nix diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 1e405955eb9..3fb60ebaa9e 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -1,11 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , httpx -, pytest-asyncio , sanic , websockets +, callPackage }: buildPythonPackage rec { @@ -35,18 +34,18 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ - pytest-asyncio - pytestCheckHook - ]; + postInstall = '' + mkdir $testsout + cp -R tests $testsout/tests + ''; - # `sanic` is explicitly set to null when building `sanic` itself - # to prevent infinite recursion. In that case we skip running - # the package at all. - doCheck = sanic != null; - dontUsePythonImportsCheck = sanic == null; + # check in passthru.tests.pytest to escape infinite recursion with sanic + doCheck = false; + doInstallCheck = false; - pythonImportsCheck = [ "sanic_testing" ]; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { description = "Core testing clients for the Sanic web framework"; diff --git a/pkgs/development/python-modules/sanic-testing/tests.nix b/pkgs/development/python-modules/sanic-testing/tests.nix new file mode 100644 index 00000000000..6a228a98231 --- /dev/null +++ b/pkgs/development/python-modules/sanic-testing/tests.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, sanic +, sanic-testing +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage { + pname = "sanic-testing-tests"; + inherit (sanic-testing) version; + + src = sanic-testing.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + sanic + ]; + + pythonImportsCheck = [ + "sanic_testing" + ]; +} From 1506981a95b07080129d492fe65a41561a779ba8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 13:58:45 +0100 Subject: [PATCH 522/685] python3Packages.sanic: update dependency pins, disable failing test --- pkgs/development/python-modules/sanic/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 63c24e9936f..460927719ad 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -40,9 +40,12 @@ buildPythonPackage rec { postPatch = '' # Loosen dependency requirements. substituteInPlace setup.py \ - --replace '"pytest==6.2.5"' '"pytest"' \ - --replace '"gunicorn==20.0.4"' '"gunicorn"' \ - --replace '"pytest-sanic",' "" \ + --replace "pytest==6.2.5" "pytest" \ + --replace "gunicorn==20.0.4" "gunicorn" \ + --replace "multidict>=5.0,<6.0" "multidict" + + sed '/pytest-sanic/d' setup.py + # Patch a request headers test to allow brotli encoding # (we build httpx with brotli support, upstream doesn't). substituteInPlace tests/test_headers.py \ @@ -118,6 +121,8 @@ buildPythonPackage rec { "test_num_workers" "test_server_run" "test_version" + # Sensitive comparison of raw HTTP header fails + "test_raw_headers" ]; disabledTestPaths = [ From ad97d8e5d82c02dd714ad9f527699df2eb8fc631 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 14:20:19 +0100 Subject: [PATCH 523/685] python3Packages.typing-inspect: switch to pytest and disable failing test --- .../python-modules/typing-inspect/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index 1e5303b7b09..d5401604936 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -3,6 +3,7 @@ , fetchPypi , typing-extensions , mypy-extensions +, pytestCheckHook }: buildPythonPackage rec { @@ -20,6 +21,19 @@ buildPythonPackage rec { mypy-extensions ]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/ilevkivskyi/typing_inspect/issues/84 + "test_typed_dict_typing_extension" + ]; + + pythonImportsCheck = [ + "typing_inspect" + ]; + meta = with lib; { description = "Runtime inspection utilities for Python typing module"; homepage = "https://github.com/ilevkivskyi/typing_inspect"; From fdce940eeca7d6439daddb09a94a3c2206775a96 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 14:27:53 +0100 Subject: [PATCH 524/685] python3Packages.sentry-sdk: disable failing tests --- pkgs/development/python-modules/sentry-sdk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index dbb85c91110..87c2ebc4b66 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -126,6 +126,8 @@ buildPythonPackage rec { "tests/integrations/chalice/" # broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274 "tests/integrations/rq/" + # broken since pytest 7.0.1; AssertionError: previous item was not torn down properly + "tests/utils/test_contextvars.py" ]; pythonImportsCheck = [ From 615f3a5c74f2003f173b8185b2a5e5edbffd5493 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 15:16:37 +0100 Subject: [PATCH 525/685] python3Packages.twilio: migrate to pytest --- pkgs/development/python-modules/twilio/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 592cab7de77..4404b743bc5 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub -, mock -, nose -, pyjwt , pythonOlder + +, pyjwt , pytz , requests + +, mock +, pytestCheckHook }: buildPythonPackage rec { @@ -31,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ mock - nose + pytestCheckHook ]; pythonImportsCheck = [ From 29786bae65eb3079452748c5fd9bf42991d5b3eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 15:44:01 +0100 Subject: [PATCH 526/685] python3Packages.xmlsec: disable failing test --- pkgs/development/python-modules/xmlsec/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 0a9a0af0e54..76ce32e5e8f 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { pname = "xmlsec"; version = "1.3.12"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -35,7 +36,14 @@ buildPythonPackage rec { # Full git clone required for test_doc_examples checkInputs = [ pytestCheckHook hypothesis ]; - disabledTestPaths = [ "tests/test_doc_examples.py" ]; + + disabledTestPaths = [ + "tests/test_doc_examples.py" + # test_reinitialize_module segfaults python + # https://github.com/mehcode/python-xmlsec/issues/203 + "tests/test_xmlsec.py" + ]; + pythonImportsCheck = [ "xmlsec" ]; From da856f86b1390898cb3921e117bcdc713bff6e4f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 16:18:36 +0100 Subject: [PATCH 527/685] python3Packages.plumbum: disable failing test --- pkgs/development/python-modules/plumbum/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index ae3c4941f68..20914d4b356 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -52,6 +52,12 @@ buildPythonPackage rec { "test_local" ]; + disabledTestPaths = [ + # incompatible with pytest7 + # https://github.com/tomerfiliba/plumbum/issues/594 + "tests/test_remote.py" + ]; + meta = with lib; { description = " Plumbum: Shell Combinators "; homepage = " https://github.com/tomerfiliba/plumbum "; From ac3b97e4fbb80ddb7c041293bda1ce04a64152be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 16:55:09 +0100 Subject: [PATCH 528/685] python3Packages.metar: patch flaky test --- pkgs/development/python-modules/metar/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix index 4a7bf9edc5a..2c518561b99 100644 --- a/pkgs/development/python-modules/metar/default.nix +++ b/pkgs/development/python-modules/metar/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook }: @@ -15,6 +16,14 @@ buildPythonPackage rec { sha256 = "sha256-pl2NWRfFCYyM2qvBt4Ic3wgbGkYZvAO6pX2Set8zYW8="; }; + patches = [ + (fetchpatch { + # Fix flapping test; https://github.com/python-metar/python-metar/issues/161 + url = "https://github.com/python-metar/python-metar/commit/716fa76682e6c2936643d1cf62e3d302ef29aedd.patch"; + hash = "sha256-y82NN+KDryOiH+eG+2ycXCO9lqQLsah4+YpGn6lM2As="; + }) + ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "metar" ]; From 7e491988f3c1b9a04812a5b9afbcd6e2c2d3ac21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 17:03:40 +0100 Subject: [PATCH 529/685] python3Packages.zeep: apply patch to fix pytest-httpx testcase --- pkgs/development/python-modules/zeep/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 1b3e0c5fcdf..83ee3f37f7e 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -6,6 +6,7 @@ , cached-property , defusedxml , fetchFromGitHub +, fetchpatch , freezegun , httpx , isodate @@ -38,6 +39,14 @@ buildPythonPackage rec { sha256 = "sha256-fJLr2LJpbNQTl183R56G7sJILfm04R39qpJxLogQLoo="; }; + patches = [ + (fetchpatch { + # fixes pytest_httpx test case; https://github.com/mvantellingen/python-zeep/pull/1293 + url = "https://github.com/mvantellingen/python-zeep/commit/2907848185adcb4e6d8c093db6c617c64cb8c8bf.patch"; + hash = "sha256-hpksgMfrBLvYtI1QIs1aHBtFq7C1PWpnAj8BW5ak1/4="; + }) + ]; + propagatedBuildInputs = [ attrs cached-property From 8fde457ce90af05efe06016fe4d10c8d960402d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 18:00:32 +0100 Subject: [PATCH 530/685] python3Packages.imageio: fix tests --- .../python-modules/imageio/default.nix | 39 ++++++++++++------- .../python-modules/imageio/libgl-path.patch | 13 +++++++ 2 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/imageio/libgl-path.patch diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 5a0d75acc02..9c449c69b77 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,14 +1,17 @@ { lib +, stdenv , buildPythonPackage , isPy27 , fetchPypi -, fetchpatch +, substituteAll , imageio-ffmpeg , numpy , pillow , psutil , pytestCheckHook , tifffile +, fsspec +, libGL }: buildPythonPackage rec { @@ -21,6 +24,13 @@ buildPythonPackage rec { inherit pname version; }; + patches = [ + (substituteAll { + src = ./libgl-path.patch; + libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + propagatedBuildInputs = [ imageio-ffmpeg numpy @@ -28,34 +38,33 @@ buildPythonPackage rec { ]; checkInputs = [ + fsspec psutil pytestCheckHook tifffile ]; - preCheck = '' - export IMAGEIO_USERDIR="$TMP" - export IMAGEIO_NO_INTERNET="true" - export HOME="$(mktemp -d)" - ''; - - disabledTests = [ - # tries to pull remote resources, even with IMAGEIO_NO_INTERNET - "test_png_remote" - # needs git history - "test_mvolread_out_of_bytes" - "test_imiter" - "test_memory_size" - "test_legacy_write_empty" + pytestFlagsArray = [ + "-m 'not needs_internet'" ]; + preCheck = '' + export IMAGEIO_USERDIR="$TMP" + export HOME=$TMPDIR + ''; + disabledTestPaths = [ + # tries to fetch fixtures over the network + "tests/test_freeimage.py" "tests/test_pillow.py" + "tests/test_spe.py" + "tests/test_swf.py" ]; meta = with lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; homepage = "http://imageio.github.io/"; license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/imageio/libgl-path.patch b/pkgs/development/python-modules/imageio/libgl-path.patch new file mode 100644 index 00000000000..f2a2bbfa093 --- /dev/null +++ b/pkgs/development/python-modules/imageio/libgl-path.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_core.py b/tests/test_core.py +index 2cdbb3a..032974c 100644 +--- a/tests/test_core.py ++++ b/tests/test_core.py +@@ -129,7 +129,7 @@ def test_findlib2(): + open(os.path.join(fi_dir, "notalib.test.so"), "wb") + + # Loading libs +- gllib = ctypes.util.find_library("GL") ++ gllib = "@libgl@" + core.load_lib([gllib], []) + # Fail + raises(ValueError, core.load_lib, [], []) # Nothing given From 9b13c3712f1c2a9f528ff75011c75262613cc367 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 18:06:07 +0100 Subject: [PATCH 531/685] home-assistant: pin hatasmota at 0.3.1 --- pkgs/servers/home-assistant/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ae61ce4568e..f070fa1f982 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -57,6 +57,18 @@ let }); }) + (self: super: { + hatasmota = super.hatasmota.overridePythonAttrs (oldAttrs: { + version = "0.3.1"; + src = fetchFromGitHub { + owner = "emontnemery"; + repo = "hatasmota"; + rev = "0.3.1"; + sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw="; + }; + }); + }) + (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { version = "1.4.18"; From 92e60268f15c5f08f24fff2c11adb4a913bd97fe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 18:44:51 +0100 Subject: [PATCH 532/685] python3Packages.pymongo: 3.12.2 -> 3.12.3 --- pkgs/development/python-modules/pymongo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index bae4f7c25fb..ba184f68b4b 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.12.2"; + version = "3.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "64ea5e97fca1a37f83df9f3460bf63640bc0d725e12f3471e6acbf3a6040dd37"; + sha256 = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8="; }; # Tests call a running mongodb instance From e149d7e7f0719bb212edfa6edb2664dea109c948 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 19:34:39 +0100 Subject: [PATCH 533/685] python3Packages.cattrs: disable failing test --- pkgs/development/python-modules/cattrs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index e3d694d28e3..7d3efc9fb3b 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -75,6 +75,8 @@ buildPythonPackage rec { disabledTests = [ # orjson is not available as it requires Rust nightly features to compile its requirements "test_orjson" + # tomlkit is pinned to an older version and newer versions raise InvalidControlChar exception + "test_tomlkit" ]; pythonImportsCheck = [ From ece3282c7bcc00fd868a17ba3ab27860645ee6cf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 19:37:13 +0100 Subject: [PATCH 534/685] python3Packages.cattrs: use pytest-xdist Upstream uses it as well and it cuts the complete build down from ~14 minutes to ~1m30s. --- pkgs/development/python-modules/cattrs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index 7d3efc9fb3b..94a357df98b 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -7,6 +7,7 @@ , motor , msgpack , poetry-core +, pytest-xdist , pytestCheckHook , pythonOlder , pyyaml @@ -44,12 +45,17 @@ buildPythonPackage rec { immutables motor msgpack + pytest-xdist pytestCheckHook pyyaml tomlkit ujson ]; + pytestFlagsArray = [ + "--numprocesses $NIX_BUILD_CORES" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" \ From c0412ea024a263b1b71b72dcbddac2c4bf4aea91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 20:03:15 +0100 Subject: [PATCH 535/685] python3Packages.apsw: patch tests --- pkgs/development/python-modules/apsw/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 46ae3fc34e5..5adee7244dd 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -29,6 +29,14 @@ buildPythonPackage rec { pytestCheckHook ]; + # Works around the following error by dropping the call to that function + # def print_version_info(write=write): + # > write(" Python " + sys.executable + " " + str(sys.version_info) + "\n") + # E TypeError: 'module' object is not callable + preCheck = '' + sed -i '/print_version_info(write)/d' tests.py + ''; + pytestFlagsArray = [ "tests.py" ]; From c8e2dc12c893826577648605fa3597f0d411918e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 4 Mar 2022 15:07:11 -0800 Subject: [PATCH 536/685] python3Packages.plumbum: disable pytest==7.* incompatible tests --- pkgs/development/python-modules/plumbum/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 20914d4b356..70b4421778f 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -50,6 +50,8 @@ buildPythonPackage rec { "test_change_env" "test_dictlike" "test_local" + # incompatible with pytest 7 + "test_incorrect_login" ]; disabledTestPaths = [ From 87658e75f32dd4ed2799edeb4ae45df7acaa7dc0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 22:29:59 +0100 Subject: [PATCH 537/685] platformio: relax dependency constraints --- pkgs/development/embedded/platformio/core.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index f19458fa84f..c40f2f45f31 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -153,7 +153,8 @@ with python.pkgs; buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ - --replace "zeroconf==0.37.*" "zeroconf" + --replace "wsproto==1.0.*" "wsproto" \ + --replace "zeroconf==0.38.*" "zeroconf" ''; meta = with lib; { From 270b07fcc537000a570c54504eb4724803c0aa87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 23:46:59 +0100 Subject: [PATCH 538/685] python3Packages.tensorboard: rename from tensorflow-tensorboard, relax deps --- pkgs/development/python-modules/objax/default.nix | 4 ++-- .../python-modules/pytorch-lightning/default.nix | 4 ++-- pkgs/development/python-modules/pytorch/default.nix | 4 ++-- .../{tensorflow-tensorboard => tensorboard}/1/default.nix | 0 .../{tensorflow-tensorboard => tensorboard}/default.nix | 8 ++++---- pkgs/development/python-modules/tensorboardx/default.nix | 4 ++-- pkgs/development/python-modules/tensorflow/bin.nix | 6 +++--- pkgs/development/python-modules/tensorflow/default.nix | 8 ++++---- pkgs/development/python-modules/test-tube/default.nix | 4 ++-- .../python-modules/torch-tb-profiler/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 12 files changed, 26 insertions(+), 25 deletions(-) rename pkgs/development/python-modules/{tensorflow-tensorboard => tensorboard}/1/default.nix (100%) rename pkgs/development/python-modules/{tensorflow-tensorboard => tensorboard}/default.nix (92%) diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index da0a70aafb4..84d56962cc4 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -7,7 +7,7 @@ , parameterized , pillow , scipy -, tensorflow-tensorboard +, tensorboard }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { parameterized pillow scipy - tensorflow-tensorboard + tensorboard ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 83cd9d175ad..d3c9a965515 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -6,7 +6,7 @@ , pytestCheckHook , pytorch , pyyaml -, tensorflow-tensorboard +, tensorboard , tqdm }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { future pytorch pyyaml - tensorflow-tensorboard + tensorboard tqdm ]; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index c370eaf6a94..50d1342cacd 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -25,7 +25,7 @@ ninja, # dependencies for torch.utils.tensorboard - pillow, six, future, tensorflow-tensorboard, protobuf, + pillow, six, future, tensorboard, protobuf, isPy3k, pythonOlder }: @@ -230,7 +230,7 @@ in buildPythonPackage rec { pyyaml typing-extensions # the following are required for tensorboard support - pillow six future tensorflow-tensorboard protobuf + pillow six future tensorboard protobuf ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorboard/1/default.nix similarity index 100% rename from pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix rename to pkgs/development/python-modules/tensorboard/1/default.nix diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix similarity index 92% rename from pkgs/development/python-modules/tensorflow-tensorboard/default.nix rename to pkgs/development/python-modules/tensorboard/default.nix index ceebad2a476..502c17e5636 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -22,14 +22,13 @@ # buildBazelPackage. buildPythonPackage rec { - pname = "tensorflow-tensorboard"; + pname = "tensorboard"; version = "2.6.0"; format = "wheel"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { - pname = "tensorboard"; - inherit version format; + inherit pname version format; dist = "py3"; python = "py3"; sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s="; @@ -42,7 +41,8 @@ buildPythonPackage rec { pushd unpacked/tensorboard-${version} substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" + --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" \ + --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" popd wheel pack ./unpacked/tensorboard-${version} diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index eacb5b4cdc8..2dc421e3c8a 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -13,7 +13,7 @@ , pytorch , six , soundfile -, tensorflow-tensorboard +, tensorboard , torchvision }: @@ -56,7 +56,7 @@ buildPythonPackage rec { pillow pytestCheckHook pytorch - tensorflow-tensorboard + tensorboard torchvision ]; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 2556a8039c1..2c47f8674e0 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -18,7 +18,7 @@ , opt-einsum , backports_weakref , tensorflow-estimator -, tensorflow-tensorboard +, tensorboard , cudaSupport ? false , cudatoolkit , cudnn @@ -74,7 +74,7 @@ in buildPythonPackage { google-pasta wrapt tensorflow-estimator - tensorflow-tensorboard + tensorboard keras-applications keras-preprocessing h5py @@ -168,7 +168,7 @@ in buildPythonPackage { ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # and the propagated input tensorboard, which causes environment collisions. # Another possibility would be to have tensorboard only in the buildInputs # See https://github.com/NixOS/nixpkgs/pull/44381 for more information. postInstall = '' diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 517faef3f8f..039e6c129b9 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -3,7 +3,7 @@ # Python deps , buildPythonPackage, pythonOlder, python # Python libraries -, numpy, tensorflow-tensorboard, absl-py +, numpy, tensorboard, absl-py , setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator @@ -94,8 +94,8 @@ let setuptools six tblib + tensorboard tensorflow-estimator - tensorflow-tensorboard termcolor typing-extensions wheel @@ -439,7 +439,7 @@ in buildPythonPackage { ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow - # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # and the propagated input tensorboard, which causes environment collisions. # Another possibility would be to have tensorboard only in the buildInputs # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 postInstall = '' @@ -469,7 +469,7 @@ in buildPythonPackage { typing-extensions wrapt ] ++ lib.optionals withTensorboard [ - tensorflow-tensorboard + tensorboard ]; # remove patchelfUnstable once patchelf 0.14 with https://github.com/NixOS/patchelf/pull/256 becomes the default diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index 1cc20cc2cca..5eac0d60b6c 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -8,7 +8,7 @@ , numpy , pandas , pytorch -, tensorflow-tensorboard +, tensorboard }: buildPythonPackage rec { @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy pandas pytorch - tensorflow-tensorboard + tensorboard ]; meta = with lib; { diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix index fc53c5ba823..28439106136 100644 --- a/pkgs/development/python-modules/torch-tb-profiler/default.nix +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -4,7 +4,7 @@ , pandas , pytestCheckHook , pytorch -, tensorflow-tensorboard +, tensorboard , torchvision }: @@ -25,7 +25,7 @@ buildPythonPackage rec { # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830. src = "${repo}/tb_plugin"; - propagatedBuildInputs = [ pandas tensorflow-tensorboard ]; + propagatedBuildInputs = [ pandas tensorboard ]; checkInputs = [ pytestCheckHook pytorch torchvision ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ed64f987d95..b8ea307917d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -123,6 +123,7 @@ mapAliases ({ tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 + tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 topydo = throw "topydo was moved to pkgs.topydo"; # added 2017-09-22 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1293b085386..4d2659f35db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9780,6 +9780,8 @@ in { tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { }; + tensorboard = callPackage ../development/python-modules/tensorboard { }; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { @@ -9812,8 +9814,6 @@ in { tensorflow = self.tensorflow-build; - tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; From 88ef0388de899088bc60c3489a20a22ad5d9daf0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 6 Mar 2022 23:47:56 +0100 Subject: [PATCH 539/685] python3Packages.tensorboard: drop leftover 1.15 packaging Couldn't find any remaining reference --- .../python-modules/tensorboard/1/default.nix | 65 ------------------- 1 file changed, 65 deletions(-) delete mode 100644 pkgs/development/python-modules/tensorboard/1/default.nix diff --git a/pkgs/development/python-modules/tensorboard/1/default.nix b/pkgs/development/python-modules/tensorboard/1/default.nix deleted file mode 100644 index f58b1a20771..00000000000 --- a/pkgs/development/python-modules/tensorboard/1/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k -, numpy -, wheel -, werkzeug -, protobuf -, grpcio -, markdown -, futures -, absl-py -}: - -# tensorflow/tensorboard is built from a downloaded wheel, because -# https://github.com/tensorflow/tensorboard/issues/719 blocks -# buildBazelPackage. - -buildPythonPackage rec { - pname = "tensorflow-tensorboard"; - version = "1.15.0"; - format = "wheel"; - - src = fetchPypi ({ - pname = "tensorboard"; - inherit version format; - } // (if isPy3k then { - python = "py3"; - sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; - } else { - python = "py2"; - sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1"; - })); - - propagatedBuildInputs = [ - numpy - werkzeug - protobuf - markdown - grpcio - absl-py - # not declared in install_requires, but used at runtime - # https://github.com/NixOS/nixpkgs/issues/73840 - wheel - ] ++ lib.optional (!isPy3k) futures; - - # in the absence of a real test suite, run cli and imports - checkPhase = '' - $out/bin/tensorboard --help > /dev/null - ''; - - pythonImportsCheck = [ - "tensorboard" - "tensorboard.backend" - "tensorboard.compat" - "tensorboard.data" - "tensorboard.plugins" - "tensorboard.summary" - "tensorboard.util" - ]; - - meta = with lib; { - description = "TensorFlow's Visualization Toolkit"; - homepage = "http://tensorflow.org"; - license = licenses.asl20; - maintainers = with maintainers; [ abbradar ]; - }; -} From c458cde109d6e1851f209a0c887b3e054aac8b5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 01:23:48 +0100 Subject: [PATCH 540/685] python3Packages.pytomlpp: disable tests incompatible with pytest7 --- pkgs/development/python-modules/pytomlpp/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 271d193ce01..73c1987fb3c 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -38,6 +38,14 @@ buildPythonPackage rec { # pelican requires > 2.7 doCheck = !pythonOlder "3.6"; + disabledTests = [ + # incompatible with pytest7 + # https://github.com/bobfang1992/pytomlpp/issues/66 + "test_loads_valid_toml_files" + "test_round_trip_for_valid_toml_files" + "test_decode_encode_binary" + ]; + preCheck = '' cd tests ''; From e58cb73878dcccff2655b9fae0fe4c9ec4fd4275 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 01:43:25 +0100 Subject: [PATCH 541/685] python3Packages.sqlalchemy: 1.4.31 -> 1.4.32 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 1d6406c5db1..d379fc92942 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.31"; + version = "1.4.32"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WCtZ0eV4CkR6raIrRh5QtASp3AV2jaHYc2itgZBGhBg="; + sha256 = "sha256-b90txZMdqrd4wrZbA99q5oN24CijCY62JNCQnZmYhbw="; }; propagatedBuildInputs = [ From 5bf915475ec616eb7dbe6dcab195cf8fe8622d40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 10:39:23 +0100 Subject: [PATCH 542/685] python3Packages.aionotify: patch away loop kwarg in wait_for call Fixes python3.10 compat --- pkgs/development/python-modules/aionotify/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aionotify/default.nix b/pkgs/development/python-modules/aionotify/default.nix index e653f4cca74..13ae51d2522 100644 --- a/pkgs/development/python-modules/aionotify/default.nix +++ b/pkgs/development/python-modules/aionotify/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; + preCheck = '' + substituteInPlace tests/test_usage.py \ + --replace "asyncio.wait_for(task, timeout, loop=self.loop)" "asyncio.wait_for(task, timeout)" + ''; + checkInputs = [ asynctest ]; From 168515a53e1e4464ffee5cf8f06507e04d6abaf5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 11:05:10 +0100 Subject: [PATCH 543/685] python310Packages.tornado_5: disable --- pkgs/development/python-modules/tornado/5.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix index 2f3ba5c1c2a..f0dc14b5fa2 100644 --- a/pkgs/development/python-modules/tornado/5.nix +++ b/pkgs/development/python-modules/tornado/5.nix @@ -3,12 +3,13 @@ , buildPythonPackage , fetchPypi , isPy27 +, pythonAtLeast }: buildPythonPackage rec { pname = "tornado"; version = "5.1.1"; - disabled = isPy27; + disabled = isPy27 || pythonAtLeast "3.10"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 From 4cfdaeb6e32fa408aff3e2f810004902236bc502 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 11:08:14 +0100 Subject: [PATCH 544/685] python310Packages.pyuv: disable --- pkgs/development/python-modules/pyuv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index 2d276c6dcca..2f1870dd1c8 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub , libuv }: @@ -7,6 +8,7 @@ buildPythonPackage rec { pname = "pyuv"; version = "1.4.0"; + disabled = pythonAtLeast "3.10"; # https://github.com/saghul/pyuv/issues/273 src = fetchFromGitHub { owner = "saghul"; From a9482cac4e9f565df859f7a2ada15069a18552ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 12:29:25 +0100 Subject: [PATCH 545/685] python310Packages.pyopengl-accelerate: disable --- pkgs/development/python-modules/pyopengl-accelerate/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index c6839bba989..195ec563d50 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchPypi }: buildPythonPackage rec { pname = "pyopengl-accelerate"; version = "3.1.5"; + disabled = pythonAtLeast "3.10"; # fails to compile src = fetchPypi { pname = "PyOpenGL-accelerate"; From 16c45bb17361d82ac88346062f652c29c3c0d465 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 12:16:21 +0100 Subject: [PATCH 546/685] python3Packages.hatchling: 0.18.0 -> 0.20.0 --- pkgs/development/python-modules/hatchling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index b656c64baf9..0b433083519 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -21,7 +21,7 @@ let pname = "hatchling"; - version = "0.18.0"; + version = "0.20.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { owner = "ofek"; repo = "hatch"; rev = "${pname}-v${version}"; - hash = "sha256-kCaEAM0cY1yQcuHfvnaLs3smN9MKATjrrQTXpCfGmWc="; + hash = "sha256-Sm3utqkuofVDn815HPj501KEuypnaYKm06ehsu+m3i4="; }; prePatch = '' From 455f910e03b35e32387a3781b1c4419e7c7537f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 18:39:07 +0100 Subject: [PATCH 547/685] python3Packages.hatchling: 0.20.0 -> 0.20.1 Switches to the PyPi source per the upstream maintainers request in https://github.com/NixOS/nixpkgs/pull/163088#issuecomment-1060748447 --- .../python-modules/hatchling/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 0b433083519..09cbdead671 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder # runtime @@ -21,23 +21,17 @@ let pname = "hatchling"; - version = "0.20.0"; + version = "0.20.1"; in buildPythonPackage { inherit pname version; format = "pyproject"; - src = fetchFromGitHub { - owner = "ofek"; - repo = "hatch"; - rev = "${pname}-v${version}"; - hash = "sha256-Sm3utqkuofVDn815HPj501KEuypnaYKm06ehsu+m3i4="; + src = fetchPypi { + inherit pname version; + hash = "sha256-l1VRce5H3CSAwZBeuxRyy7bNpOM6zX5s2L1/DXPo/Bg="; }; - prePatch = '' - cd backend - ''; - # listed in backend/src/hatchling/ouroboros.py propagatedBuildInputs = [ editables @@ -51,6 +45,7 @@ buildPythonPackage { pythonImportsCheck = [ "hatchling" + "hatchling.build" ]; # tries to fetch packages from the internet @@ -79,6 +74,6 @@ buildPythonPackage { description = "Modern, extensible Python build backend"; homepage = "https://ofek.dev/hatch/latest/"; license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ hexa ofek ]; }; } From b3b04b7b69600ea6222c1ca3dd17e04c10cfa425 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 12:44:57 +0100 Subject: [PATCH 548/685] python3Packages.tensorboard: 2.6.0 -> 2.8.0 --- pkgs/development/python-modules/tensorboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 502c17e5636..47025bf4a28 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,15 +23,15 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.6.0"; + version = "2.8.0"; format = "wheel"; - disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s="; + hash = "sha256-ZaM45EJOkHnyYEkjvb4wF5KtzirOG+aNprPd8AUXDe8="; }; postPatch = '' From 9666419d54e59421284ade46c330375ac2d2efb3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 7 Mar 2022 14:34:16 +0100 Subject: [PATCH 549/685] python3Packages.tensorflow: 2.7.1 -> 2.8.0 https://github.com/tensorflow/tensorflow/releases/tag/v2.8.0 --- .../python-modules/tensorflow/default.nix | 67 ++++++++++--------- .../tensorflow/system-protobuf.patch | 13 ---- 2 files changed, 35 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/python-modules/tensorflow/system-protobuf.patch diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 039e6c129b9..2d5a302521b 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin +{ stdenv, bazel_4, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin , addOpenGLRunpath, fetchpatch, patchelfUnstable # Python deps , buildPythonPackage, pythonOlder, python @@ -7,13 +7,13 @@ , setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator -, dill, flatbuffers-python, tblib, typing-extensions +, dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps , git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries -, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp +, jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp, nsync , curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core -# Upsteam by default includes cuda support since tensorflow 1.15. We could do +# Upstream by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.7.1"; + version = "2.8.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -179,20 +179,15 @@ let stdenv = llvmPackages_11.stdenv; })) { name = "${pname}-${version}"; - bazel = bazel_3; + bazel = bazel_4; src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "1qwzbqq899swrwrwmm6z7mq9sc55gyh0r4ca0mcnchbvn7w0qbkh"; + hash = "sha256-w78ehpsnXElIyYftgZEq3b/+TSrRN1gyWVUVlSZpGFM="; }; - patches = [ - # Patch the sources to compile with protobuf >= 3.16. - ./system-protobuf.patch - ]; - # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow @@ -207,20 +202,20 @@ let git # libs taken from system through the TF_SYS_LIBS mechanism - grpc - sqlite boringssl - jsoncpp curl + double-conversion + flatbuffers-core + giflib + grpc + icu + jsoncpp + libjpeg_turbo + libpng + lmdb-core pybind11 snappy - flatbuffers-core - icu - double-conversion - libpng - libjpeg_turbo - giflib - lmdb-core + sqlite ] ++ lib.optionals cudaSupport [ cudatoolkit cudnn @@ -229,6 +224,8 @@ let ] ++ lib.optionals stdenv.isDarwin [ Foundation Security + ] ++ lib.optionals (!stdenv.isDarwin) [ + nsync ]; # arbitrarily set to the current latest bazel version, overly careful @@ -237,7 +234,7 @@ let # Take as many libraries from the system as possible. Keep in sync with # list of valid syslibs in # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl - TF_SYSTEM_LIBS = lib.concatStringsSep "," [ + TF_SYSTEM_LIBS = lib.concatStringsSep "," ([ "absl_py" "astor_archive" "astunparse_archive" @@ -253,7 +250,6 @@ let "cython" "dill_archive" "double_conversion" - "enum34_archive" "flatbuffers" "functools32_archive" "gast_archive" @@ -264,7 +260,6 @@ let "libjpeg_turbo" "lmdb" "nasm" - # "nsync" # not packaged in nixpkgs "opt_einsum_archive" "org_sqlite" "pasta" @@ -277,7 +272,9 @@ let "typing_extensions_archive" "wrapt" "zlib" - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ + "nsync" # fails to build on darwin + ]); INCLUDEDIR = "${includes_joined}/include"; @@ -361,12 +358,12 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "sha256-+szc2mRoImwijzbj3nw6HmZp3DeRjjPRU5yC+5AEbkg=" + "sha256-dQEyfueuQPcGvbhuh8Al45np3nRLDw2PCfC2lEqAH50=" else if stdenv.isDarwin then - "sha256-+bwIzp6t7gRJPcI8B5oyuf9z0AjCAyggUR7x+vv5kFs=" + "sha256-yfnZVtKWqNQGvlfq2owXhem0LmzDYriVfYgf1ZRlaDo=" else - "sha256-5yOYmeGpJq4Chi55H7iblxyRXVktgnePtpYTPvBs538="; + "sha256:12i1ix2xwq77f3h8qr4h57g0aazrdsjjqa536cpwx3n1mvl5p6qi"; }; buildAttrs = { @@ -428,11 +425,13 @@ in buildPythonPackage { # Adjust dependency requirements: # - Relax gast version requirement that doesn't match what we have packaged + # - Relax tf-estimator, that would require a nightly version # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. postPatch = '' sed -i setup.py \ -e "s/'gast[^']*',/'gast',/" \ + -e "s/'tf-estimator-nightly[^']*',/'tensorflow-estimator',/" \ -e "/'libclang[^']*',/d" \ -e "/'keras[^']*',/d" \ -e "/'tensorflow-io-gcs-filesystem[^']*',/d" @@ -452,7 +451,6 @@ in buildPythonPackage { propagatedBuildInputs = [ absl-py astunparse - dill flatbuffers-python gast google-pasta @@ -463,7 +461,6 @@ in buildPythonPackage { opt-einsum protobuf-python six - tblib tensorflow-estimator termcolor typing-extensions @@ -486,7 +483,13 @@ in buildPythonPackage { # Actual tests are slow and impure. # TODO try to run them anyway # TODO better test (files in tensorflow/tools/ci_build/builds/*test) - checkInputs = [ keras ]; + # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py + checkInputs = [ + dill + keras + portpicker + tblib + ]; checkPhase = '' ${python.interpreter} < Date: Mon, 7 Mar 2022 11:47:44 -0800 Subject: [PATCH 550/685] python310Packages.devtools: skip python 3.10 incompatible tests --- pkgs/development/python-modules/devtools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index c9e0a79a241..34004769b1f 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { "test_print_subprocess" # sensitive to timing "test_multiple_not_verbose" + # sensitive to interpreter output + "test_simple_vars" ]; pythonImportsCheck = [ From 8fbc6dca17c62059be5b09b018eef3443badcb32 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Mar 2022 11:54:10 -0800 Subject: [PATCH 551/685] python3Packages.numba: relax numpy version bounds --- pkgs/development/python-modules/numba/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index d2204b34fb6..3a1192d4678 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -22,11 +22,12 @@ buildPythonPackage rec { }; postPatch = '' + # numpy substituteInPlace setup.py \ - --replace "1.21" "1.22" + --replace "1.22" "2" substituteInPlace numba/__init__.py \ - --replace "(1, 20)" "(1, 21)" + --replace "(1, 21)" "(2, 0)" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; From d23b6fca744d82e63e51947b11f481a203feeb79 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Mar 2022 11:56:08 -0800 Subject: [PATCH 552/685] python3Packages.robotstatuschecker: fix src --- pkgs/development/python-modules/robotstatuschecker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 63e87609ac2..74810c7761f 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "robotframework"; repo = "statuschecker"; - rev = version; + rev = "refs/tags/v${version}"; sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz"; }; From 549773d1359e0be3edcd5e7bec936bc3ddc9706a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Mar 2022 12:11:07 -0800 Subject: [PATCH 553/685] python3Packages.pygit2: use libgit2 1.4.x --- pkgs/top-level/python-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d2659f35db..ba13d0bdd63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6982,9 +6982,7 @@ in { pygetwindow = callPackage ../development/python-modules/pygetwindow { }; - pygit2 = callPackage ../development/python-modules/pygit2 { - libgit2 = pkgs.libgit2_1_3_0; - }; + pygit2 = callPackage ../development/python-modules/pygit2 { }; PyGithub = callPackage ../development/python-modules/pyGithub { }; From c03cd2675fd137ccf3d5bd1fcad219a4764ca9a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Mar 2022 12:45:10 -0800 Subject: [PATCH 554/685] python3Packages.openapi-spec-validator: update build --- .../python-modules/openapi-spec-validator/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 3bd5c4e8916..7ef70ab3d3f 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,17 +1,23 @@ { lib, buildPythonPackage, isPy27, fetchPypi , jsonschema, openapi-schema-validator, pyyaml, six, pathlib -, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }: +, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools +, poetry-core +, requests +}: buildPythonPackage rec { pname = "openapi-spec-validator"; version = "0.4.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "sha256-l/JYhQr8l7BI98JlOFXg+I+masEDwr5Qd8eWCsoq1Jo="; }; - propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools requests ] ++ (lib.optionals (isPy27) [ pathlib ]); checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ]; From aaf28be7d0f1424bbde3b36488ce6efe667ebb6e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Mar 2022 18:28:39 -0800 Subject: [PATCH 555/685] python3Packages.jupyter_core: fix tests --- .../python-modules/jupyter_core/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index e093706fa8e..b7838ff5915 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -2,11 +2,13 @@ , buildPythonPackage , fetchPypi , isPy3k +, fetchpatch +, python , ipython , traitlets , glibcLocales , mock -, pytest +, pytestCheckHook , nose }: @@ -20,15 +22,34 @@ buildPythonPackage rec { sha256 = "sha256-1puuuf+xKLjNJlf88nA/icdp0Wc8hRgSEZ46Kg6TrZo="; }; - checkInputs = [ pytest mock glibcLocales nose ]; + checkInputs = [ pytestCheckHook mock glibcLocales nose ]; propagatedBuildInputs = [ ipython traitlets ]; - patches = [ ./tests_respect_pythonpath.patch ]; + patches = [ + # install jupyter_core/*.py files + (fetchpatch { + url = "https://github.com/jupyter/jupyter_core/pull/253/commits/3bbeaebec0a53520523162d5e8d5c6ca02b1b782.patch"; + sha256 = "sha256-QeAfj7wLz4egVUPMAgrZ9Wn/Tv60LrIXLgHGVoH41wQ="; + }) + ./tests_respect_pythonpath.patch + ]; - checkPhase = '' - HOME=$TMPDIR LC_ALL=en_US.utf8 py.test + preCheck = '' + export HOME=$TMPDIR + export LC_ALL=en_US.utf8 ''; + disabledTests = [ + # creates a temporary script, which isn't aware of PYTHONPATH + "test_argv0" + ]; + + postCheck = '' + $out/bin/jupyter --help > /dev/null + ''; + + pythonImportsCheck = [ "jupyter_core" ]; + meta = with lib; { description = "Jupyter core package. A base package on which Jupyter projects rely"; homepage = "https://jupyter.org/"; From c5f465e4c58b957fc967640260e43b7046f66644 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Mar 2022 18:35:42 -0800 Subject: [PATCH 556/685] python3Packages.lektor: fix src and build --- pkgs/development/python-modules/lektor/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 442dec03aee..918cbd2591c 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , click +, filetype , watchdog , exifread , requests @@ -17,6 +18,7 @@ , pytest-mock , pytest-pylint , pytest-click +, python-slugify , isPy27 , functools32 , setuptools @@ -25,17 +27,18 @@ buildPythonPackage rec { pname = "lektor"; version = "3.3.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "lektor"; repo = "lektor"; - rev = version; + rev = "v${version}"; sha256 = "sha256-PNHQ87aO+b1xseupIOsO7MXdr16s0gjoHGnZhPlKKRY="; }; propagatedBuildInputs = [ - click watchdog exifread requests mistune inifile Babel jinja2 - flask pyopenssl ndg-httpsclient setuptools + click filetype watchdog exifread requests mistune inifile Babel jinja2 + flask pyopenssl python-slugify ndg-httpsclient setuptools ] ++ lib.optionals isPy27 [ functools32 ]; checkInputs = [ From caa73bb55fef8e9d246adec641f01a24973803f6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 7 Mar 2022 18:38:42 -0800 Subject: [PATCH 557/685] python3Packages.python-daemon: disable obsolete version test --- pkgs/development/python-modules/python-daemon/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 074e5699e3d..cc12b14aa15 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -51,6 +51,11 @@ buildPythonPackage rec { }) ]; + disabledTestPaths = [ + # requires removed distutils.command + "test_version.py" + ]; + disabledTests = [ "begin_with_TestCase" "changelog_TestCase" From 615f756cd27161d5ecfe4e9c1a33e66bea06cb58 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 17:08:19 +0100 Subject: [PATCH 558/685] python3Packages.pytorch: fix compatibility with recent setuptools versions --- .../development/python-modules/pytorch/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 50d1342cacd..a1803f4fab0 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python, +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, cudaSupport ? false, cudatoolkit, cudnn, nccl, magma, mklDnnSupport ? true, useSystemNccl ? true, MPISupport ? false, mpi, @@ -135,7 +135,17 @@ in buildPythonPackage rec { sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = [ + (fetchpatch { + # Import distutils directly, not from setuptools + url = "https://github.com/pytorch/pytorch/commit/07767569c964552702bf374da753212eb9cde327.patch"; + hash = "sha256-XNqKzIG3JYlQFeyng3UDkuEI9CC6mFD3aislM0H6W34="; + excludes = [ + # we don't run the tests anyway + "test/run_test.py" + ]; + }) + ] ++ lib.optionals stdenv.isDarwin [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current From 2ea8e712b7d0afa42bb42bca0992c7bda0d236cd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 17:24:15 +0100 Subject: [PATCH 559/685] python3Packages.backports-zoneinfo: disable for python3.9 and newer --- pkgs/development/python-modules/backports-zoneinfo/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix index 0b4703e2651..d2b6d06c4cd 100644 --- a/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub +, pythonAtLeast , pythonOlder , python , substituteAll @@ -12,6 +13,8 @@ buildPythonPackage rec { pname = "backports-zoneinfo"; version = "0.2.1"; + disabled = pythonAtLeast "3.9"; + src = fetchFromGitHub { owner = "pganssle"; repo = "zoneinfo"; From e810e4e0a18fde642a32449ddbb7ba150b07300c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Mar 2022 09:22:07 -0800 Subject: [PATCH 560/685] python3Packages.xgboost: limit tests to just basic tests --- pkgs/development/python-modules/xgboost/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 3717ca2473c..f6c63db4505 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -48,7 +48,8 @@ buildPythonPackage { ln -s ${xgboost}/bin/xgboost ../xgboost ''; - pytestFlagsArray = ["../tests/python"]; + # tests are extremely cpu intensive, only run basic tests to ensure package is working + pytestFlagsArray = ["../tests/python/test_basic.py"]; disabledTestPaths = [ # Requires internet access: https://github.com/dmlc/xgboost/blob/03cd087da180b7dff21bd8ef34997bf747016025/tests/python/test_ranking.py#L81 "../tests/python/test_ranking.py" From 93dfcc2038997675e9d0384b9d161dea9fbe6faf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 18:59:32 +0100 Subject: [PATCH 561/685] python3Packages.jaraco_itertools: switch to pep518 build --- pkgs/development/python-modules/jaraco_itertools/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 7c4d0d3bf12..95d20fd7e6b 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "jaraco.itertools"; version = "6.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; From d8dbe622f075349c7543587fb61fb27bc0c1e5f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 19:17:38 +0100 Subject: [PATCH 562/685] python3Packages.findpython: init at 0.1.3 --- .../python-modules/findpython/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/findpython/default.nix diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix new file mode 100644 index 00000000000..ad35f379b90 --- /dev/null +++ b/pkgs/development/python-modules/findpython/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build time +, pdm-pep517 + +# runtime +, packaging + +# tests +, pytestCheckHook +}: + +let + pname = "findpython"; + version = "0.1.3"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tVpBa5/PLShyG/vqHOsqbLZ6APmexLlKdtoix6IAKHA="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + packaging + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "findpython" + ]; + + meta = with lib; { + description = "A utility to find python versions on your system"; + homepage = "https://github.com/frostming/findpython"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba13d0bdd63..5cfc1521a8a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2866,6 +2866,8 @@ in { findimports = callPackage ../development/python-modules/findimports { }; + findpython = callPackage ../development/python-modules/findpython { }; + fingerprints = callPackage ../development/python-modules/fingerprints { }; finitude = callPackage ../development/python-modules/finitude { }; From 2d0c351c676a4ae74d02bf09758cb291869ec3ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 19:27:47 +0100 Subject: [PATCH 563/685] pdm: 1.12.6 -> 1.13.3 https://github.com/pdm-project/pdm/releases/tag/1.13.3 https://github.com/pdm-project/pdm/releases/tag/1.13.2 https://github.com/pdm-project/pdm/releases/tag/1.13.1 https://github.com/pdm-project/pdm/releases/tag/1.13.0.post0 https://github.com/pdm-project/pdm/releases/tag/1.13.0 https://github.com/pdm-project/pdm/releases/tag/1.12.8 https://github.com/pdm-project/pdm/releases/tag/1.12.7 --- pkgs/tools/package-management/pdm/default.nix | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 4e59333ed79..cae4431ea65 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,13 +24,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "1.12.6"; + version = "1.13.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MXKER2ijU+2yPnsBFH0cu/hjHI4uNt++AqggH5rhnaU="; + sha256 = "sha256-5+bjjljmk3AHaDVjYzNuC7lkkvlpLa9/grKgdmERC7k="; }; # this patch allows us to run additional tests that invoke pdm, which checks @@ -41,19 +41,12 @@ buildPythonApplication rec { # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream patches = [ ./check-update.patch - (fetchurl { - # Mark test that require network access - url = "https://github.com/pdm-project/pdm/files/7911962/mark-network-tests.patch.txt"; - hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd"; - }) ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "pdm-pep517>=0.9,<0.10" "pdm-pep517" - ''; propagatedBuildInputs = [ blinker click + findpython installer packaging pdm-pep517 @@ -82,22 +75,19 @@ buildPythonApplication rec { "-m 'not network'" ]; - preCheck = "HOME=$TMPDIR"; + preCheck = '' + export HOME=$TMPDIR + ''; disabledTests = [ # sys.executable and expected executable are different "test_set_non_exist_python_path" # pythonfinder isn't aware of nix's python infrastructure "test_auto_isolate_site_packages" - "test_use_invalid_wrapper_python" "test_use_wrapper_python" - # tries to read/write files without proper permissions - "test_completion_command" - "test_plugin_add" - "test_plugin_list" - "test_plugin_remove" - # tries to treat a gzip file as a zipfile and fails - "test_resolve_local_artifacts" + "test_find_python_in_path" + # calls pip install and exits != 0 + "test_pre_and_post_hooks" ]; meta = with lib; { From 9cb1c5875d8ddae9f05248f9e421e6cffe6bd2b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 19:33:41 +0100 Subject: [PATCH 564/685] python3Packages.matrix-nio: relax h11 constraint --- pkgs/development/python-modules/matrix-nio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 665167e290e..724a1459b77 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ + --replace 'h11 = "^0.12.0"' 'h11 = "*"' \ --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \ --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }' ''; From 7f5915b04801f383a3504a011601e2fb09dfedf8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Mar 2022 11:05:10 -0800 Subject: [PATCH 565/685] update-python-libraries.py: Always use ref/tags/ for specifying rev Avoids situations where a branch and tag share the same label. Github will silently return a non-valid artifact and will fail the build. Since all github releases correspond to an annotated tag, it's safe to assume that if we found a release for a tag, that the tag will exist. --- .../update-python-libraries.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 5f55ed5ecaf..3843497d94e 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -356,17 +356,19 @@ def _update_package(path, target): text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': - # in the case of fetchFromGitHub, it's common to see `rev = version;` - # in which no string value is meant to be substituted. - # Verify that the attribute is set to a variable - regex = '(rev\s+=\s+([_a-zA-Z][_a-zA-Z0-9\.]*);)' + # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` + # in which no string value is meant to be substituted. However, we can just overwrite the previous value. + regex = '(rev\s+=\s+[^;]*;)' regex = re.compile(regex) - value = regex.findall(text) - n = len(value) + matches = regex.findall(text) + n = len(matches) if n == 0: - # value is set to a string, e.g. `rev = "v${version}";` - text = _replace_value('rev', f"{prefix}${{version}}", text) + raise ValueError("Unable to find rev value for {}.".format(pname)) + else: + # forcefully rewrite rev, incase tagging conventions changed for a release + match = matches[0] + text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') # incase there's no prefix, just rewrite without interpolation text = text.replace('"${version}";', 'version;') From 92367700d63282a2b3e7f06874ff0fc705da3cb7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Mar 2022 11:06:34 -0800 Subject: [PATCH 566/685] python3Packages.adblock: fix src --- pkgs/development/python-modules/adblock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 53385102529..c8ae5cc1c4d 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ArniDagur"; repo = "python-adblock"; - rev = version; + rev = "refs/tags/${version}"; sha256 = "sha256-6FH+AVK7+Yg1a6oKbFV80TuGGE4Y7I3mMVzwVHdHYO4="; }; From 9f4a378aef1410412d36e73ce3085e0cf025cfaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 20:30:12 +0100 Subject: [PATCH 567/685] python3Packages.towncrier: let towncrier find its executable during tests --- pkgs/development/python-modules/towncrier/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index ae272c60651..f2fbf856555 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -29,12 +29,18 @@ buildPythonPackage rec { # zope.interface collision doCheck = !isPy27; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + checkInputs = [ git mock twisted pytestCheckHook ]; + pythonImportsCheck = [ "towncrier" ]; meta = with lib; { From d5631f0038010f2c016c56454e0d028674e09ad7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 20:35:23 +0100 Subject: [PATCH 568/685] python3Packages.flask-compress: fix build, enable tests --- .../python-modules/flask-compress/default.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 11aea3ce69c..26e5feca03e 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,25 +1,43 @@ -{ lib, fetchPypi, buildPythonPackage, flask +{ lib +, fetchPypi +, buildPythonPackage +, setuptools-scm +, flask , brotli +, pytestCheckHook }: buildPythonPackage rec { version = "1.11"; pname = "Flask-Compress"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw="; }; - postPatch = '' - sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py - ''; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ flask brotli ]; + propagatedBuildInputs = [ + flask + brotli + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flask_compress" + ]; meta = with lib; { description = "Compress responses in your Flask app with gzip"; - homepage = "https://libwilliam.github.io/flask-compress/"; + homepage = "https://github.com/colour-science/flask-compress"; + changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; license = licenses.mit; }; } From 9554c3721f8a6a4bc51882ee116d46f9bf04c517 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 20:41:21 +0100 Subject: [PATCH 569/685] python3Packages.commoncode: relax intbitset constraint --- pkgs/development/python-modules/commoncode/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 7a2416728c8..ff642c8930e 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "commoncode"; version = "30.0.0"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -29,6 +29,11 @@ buildPythonPackage rec { sha256 = "sha256-6SeU4u6pfDuGCgCYAO5fdbWBxW9XN3WvM8j6DwUlFwM="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "intbitset >= 2.3.0, < 3.0" "intbitset >= 2.3.0" + ''; + dontConfigure = true; nativeBuildInputs = [ From 0cee23629e31fa32e6503df4d137d8dc1dbd4992 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 21:34:04 +0100 Subject: [PATCH 570/685] python3Packages.dask: 2022.02.0 -> 2022.02.1 --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 7af0eca747e..ffdca65a606 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2022.02.0"; + version = "2022.02.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-tDqpIS8j6a16YbJak+P1GkCEZvJyheWV5vkUrkhScRY="; + hash = "sha256-A8ktvfpow/QKAEEt9SUnkTqYFJCrV1mgnuDIP3gdyrE="; }; propagatedBuildInputs = [ From bc524e8b3cde03d628d00a9a9134ba8f0e6f3913 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 21:34:33 +0100 Subject: [PATCH 571/685] python3Packages.nibabel: disable failing test --- pkgs/development/python-modules/nibabel/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 60f5fcde63f..dc0a6d12f0c 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , packaging -, pytest +, pytestCheckHook , nose , numpy , h5py @@ -23,11 +23,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; - checkInputs = [ nose pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest - ''; + disabledTests = [ + # https://github.com/nipy/nibabel/issues/951 + "test_filenames" + ]; meta = with lib; { homepage = "https://nipy.org/nibabel"; From b1ff4fbad943342b891231912693caf327f71044 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 22:29:05 +0100 Subject: [PATCH 572/685] python3Packages.doit: add toml dependency --- pkgs/development/python-modules/doit/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index c7c66fceaa7..95b7adc474a 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -8,6 +8,7 @@ , cloudpickle , pyinotify , macfsevents +, toml }: buildPythonPackage rec { @@ -21,8 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-OIER+Kals7RGIM7rKH0FhZJ8hdDW0/h5DTT7tFwM9sM="; }; - propagatedBuildInputs = [ cloudpickle ] - ++ lib.optional stdenv.isLinux pyinotify + propagatedBuildInputs = [ + cloudpickle + toml + ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; # hangs on darwin From 204c75581f563f00d6e82b4a2006ec689cbecd81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 22:36:07 +0100 Subject: [PATCH 573/685] python3Packages.pooch: use pyproject format --- pkgs/development/python-modules/pooch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 3ea5b0ef3b4..238e6ad6223 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "pooch"; version = "1.6.0"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { From 01d4b19c6b020c4e038d1fa6c7e6f9fa3a367a29 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 22:38:04 +0100 Subject: [PATCH 574/685] python3Packages.pyvcf: mark as broken --- pkgs/development/python-modules/pyvcf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyvcf/default.nix b/pkgs/development/python-modules/pyvcf/default.nix index 7c513617754..919477298b1 100644 --- a/pkgs/development/python-modules/pyvcf/default.nix +++ b/pkgs/development/python-modules/pyvcf/default.nix @@ -28,5 +28,6 @@ buildPythonPackage rec { vcf will attempt to parse the content of each record based on the data types specified in the meta-information lines ''; + broken = true; # uses the 2to3 feature, that got removed in setuptools 0.58 }; } From c9c62eec8159fdc27565147dc538afe8953833c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 23:00:02 +0100 Subject: [PATCH 575/685] python3Packages.ftfy: disable failing tests --- pkgs/development/python-modules/ftfy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 8bd25bea7c6..d214cb4f0a4 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -29,6 +29,12 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; + disabledTestPaths = [ + # Calls poetry and fails to match output exactly + "tests/test_cli.py" + ]; + + meta = with lib; { description = "Given Unicode text, make its representation consistent and possibly less broken"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; From 2d50b18e6f0a9189090e2031735b1352990bcb39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 23:18:16 +0100 Subject: [PATCH 576/685] python3Packages.can: unstable-2022-01-11 -> 4.0.0 --- pkgs/development/python-modules/can/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index a68d73e1242..18077ce78cc 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-can"; - version = "unstable-2022-01-11"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hardbyte"; repo = pname; - rev = "2e24af08326ecd69fba9f02fed7b9c26f233c92b"; - hash = "sha256-ZP5qtbjDtBZ2uT9DOSvSnfHyTlirr0oCEXhiLO1ydz0="; + rev = version; + hash = "sha256-/z7zBfVbO7x4UtzWOXolH2YrtYWgsvRLObWwz8sqOEc="; }; propagatedBuildInputs = [ @@ -56,6 +56,9 @@ buildPythonPackage rec { # Tests require access socket "BasicTestUdpMulticastBusIPv4" "BasicTestUdpMulticastBusIPv6" + # pytest.approx is not supported in a boolean context (since pytest7) + "test_pack_unpack" + "test_receive" ]; preCheck = '' From 546a8a0c25c1c1ee1f5f85f7b8a8dd1ad0028adf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 8 Mar 2022 23:21:22 +0100 Subject: [PATCH 577/685] python3Packages.pytools: fix build --- .../python-modules/pytools/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 61201be9f04..f4710872cbe 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -3,10 +3,9 @@ , fetchPypi , pythonOlder , decorator -, appdirs -, six , numpy -, pytest +, platformdirs +, pytestCheckHook }: buildPythonPackage rec { @@ -19,18 +18,21 @@ buildPythonPackage rec { sha256 = "sha256-GXqs9uH11gxxW5JDh5Kst3Aq7Vnrv7FH+oTtp4DlT+4="; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ decorator - appdirs - six numpy + platformdirs ]; - checkPhase = '' - py.test -k 'not test_persistent_dict' - ''; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytools" + "pytools.batchjob" + "pytools.lex" + ]; meta = { homepage = "https://github.com/inducer/pytools/"; From 6d39611743bc2c3b140508e48cab175a4da07887 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Mar 2022 16:22:04 -0800 Subject: [PATCH 578/685] python3Packages.adblock: update cargoSha --- pkgs/development/python-modules/adblock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index c8ae5cc1c4d..3655c7456e5 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-x0mcykHWhheD2ycELcfR1ZQ/6WfFQzY+L/LmMipP4Rc="; + hash = "sha256-JI/C+Woi/dJWUGUum8daecjFWiQgxY6BFYZ5MpTcRvU="; }; nativeBuildInputs = [ From eee94912383a09d4b678fe9cc3c2d30bf29c6644 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Mar 2022 20:38:34 -0800 Subject: [PATCH 579/685] python3Packages.datatable: reduce test suite to small subset test suite is very cpu intensive --- .../development/python-modules/datatable/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 9008270fc79..004e47a60b5 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -44,15 +44,9 @@ buildPythonPackage rec { LLVM = llvm; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; - pytestFlagsArray = let - # ini file (not included in tarball) required to change python_files setting, - pytestIni = writeText "pytest.ini" '' - [pytest] - python_files = test_*.py test-*.py - ''; - in [ - "-c ${pytestIni}" - ]; + # test suite is very cpu intensive, only run small subset to ensure package is working as expected + pytestFlagsArray = [ "tests/test-sets.py" ]; + disabledTests = [ # skip tests which are irrelevant to our installation or use way too much memory "test_xfunction_paths" From b28dbebec226837f85b275d19f957fa0142a872f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 12:43:29 +0100 Subject: [PATCH 580/685] python3Packages.ciscoconfparse: propagate toml --- pkgs/development/python-modules/ciscoconfparse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index e6db689a45c..49b36a5c658 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { passlib dnspython loguru + toml ]; checkInputs = [ From 280bb85b3c62f28994c65cb2d14de1440203b6a8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 07:26:29 -0800 Subject: [PATCH 581/685] python3Packages.qutip: don't run expensive test suite by default --- .../python-modules/qutip/default.nix | 118 ++++++++++-------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 8d19e360ca4..c1f078ecc13 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -1,57 +1,69 @@ { lib, stdenv, fetchFromGitHub, buildPythonPackage, python, packaging, numpy -, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures }: +, cython, scipy, matplotlib, pytestCheckHook, pytest-rerunfailures +, doCheck ? false +}: -buildPythonPackage rec { - pname = "qutip"; - version = "4.6.3"; +let + self = buildPythonPackage rec { + pname = "qutip"; + version = "4.6.3"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk="; + }; + + # QuTiP says it needs specific (old) Numpy versions. We overwrite them here + # as the tests work perfectly fine with up-to-date packages. + postPatch = '' + substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6" + ''; + + # Disabling OpenMP support on Darwin. + setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp"; + + propagatedBuildInputs = [ + packaging + numpy + cython + scipy + matplotlib + ]; + + checkInputs = [ + pytestCheckHook + pytest-rerunfailures + ]; + + # test suite is very cpu intensive + inherit doCheck; + # - QuTiP tries to access the home directory to create an rc file for us. + # This of course fails and therefore, we provide a writable temp dir as HOME. + # - We need to go to another directory to run the tests from there. + # This is due to the Cython-compiled modules not being in the correct location + # of the source tree. + # - For running tests, see: + # https://qutip.org/docs/latest/installation.html#verifying-the-installation + checkPhase = '' + export OMP_NUM_THREADS=$NIX_BUILD_CORES + export HOME=$(mktemp -d) + mkdir -p test && cd test + ${python.interpreter} -c "import qutip.testing; qutip.testing.run()" + ''; + + pythonImportsCheck = [ "qutip" ]; + + passthru.tests = { + all-tests = self.override { doCheck = true; }; + }; + + meta = with lib; { + description = "Open-source software for simulating the dynamics of closed and open quantum systems"; + homepage = "https://qutip.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.fabiangd ]; + }; }; - - # QuTiP says it needs specific (old) Numpy versions. We overwrite them here - # as the tests work perfectly fine with up-to-date packages. - postPatch = '' - substituteInPlace setup.cfg --replace "numpy>=1.16.6,<1.20" "numpy>=1.16.6" - ''; - - # Disabling OpenMP support on Darwin. - setupPyGlobalFlags = lib.optional (!stdenv.isDarwin) "--with-openmp"; - - propagatedBuildInputs = [ - packaging - numpy - cython - scipy - matplotlib - ]; - - checkInputs = [ - pytestCheckHook - pytest-rerunfailures - ]; - - # - QuTiP tries to access the home directory to create an rc file for us. - # This of course fails and therefore, we provide a writable temp dir as HOME. - # - We need to go to another directory to run the tests from there. - # This is due to the Cython-compiled modules not being in the correct location - # of the source tree. - # - For running tests, see: - # https://qutip.org/docs/latest/installation.html#verifying-the-installation - checkPhase = '' - export OMP_NUM_THREADS=$NIX_BUILD_CORES - export HOME=$(mktemp -d) - mkdir -p test && cd test - ${python.interpreter} -c "import qutip.testing; qutip.testing.run()" - ''; - - meta = with lib; { - description = "Open-source software for simulating the dynamics of closed and open quantum systems"; - homepage = "https://qutip.org/"; - license = licenses.bsd3; - maintainers = [ maintainers.fabiangd ]; - }; -} +in self From e6ccf2a707003faaae9cc53780c79b67913f847c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 07:34:26 -0800 Subject: [PATCH 582/685] python3Packages.pydmd: only run unit tests Entire test suite can take 100+ vCPU hours --- pkgs/development/python-modules/pydmd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index f80f9003478..68a19afddba 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -35,9 +35,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # Those tests take over 1.5 h on hydra. Also, an error and two failures - "tests/test_spdmd.py" + pytestFlagsArray = [ + # test suite takes over 100 vCPU hours, just run small subset of it. + # TODO: Add a passthru.tests with all tests + "tests/test_dmdbase.py" ]; pythonImportsCheck = [ From 1c14120c30398372710d7442eb328ce3c1ef9882 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 16:56:53 +0100 Subject: [PATCH 583/685] python3Packages.cssselect2: build using flit-core --- pkgs/development/python-modules/cssselect2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 9d30ec09312..987e84ffcee 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, flit-core , pythonOlder , fetchPypi , tinycss2 @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "cssselect2"; version = "0.5.0"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { @@ -20,6 +22,10 @@ buildPythonPackage rec { sed -i '/^addopts/d' pyproject.toml ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ tinycss2 ]; checkInputs = [ pytestCheckHook ]; From 96df984a7e0c0bc72ffef0d5ddbd05fbb42459af Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 08:25:50 -0800 Subject: [PATCH 584/685] python3Packages.stumpy: limit default test suite to core tests Full test suite is very CPU intensive --- pkgs/development/python-modules/stumpy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 68e35a1d0ec..66a9b7e0d82 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # whole testsuite is very CPU intensive, only run core tests + # TODO: move entire test suite to passthru.tests + "tests/test_core.py" + ]; + meta = with lib; { description = "A powerful and scalable library that can be used for a variety of time series data mining tasks"; homepage = "https://github.com/TDAmeritrade/stumpy"; From 1a4c9e490e0725dbcd29314635658cc091d07dd6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 08:27:28 -0800 Subject: [PATCH 585/685] python3Packages.scikitimage: move CPU expensive test suite to passthru.tests --- .../python-modules/scikit-image/default.nix | 169 +++++++++--------- 1 file changed, 89 insertions(+), 80 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index b06c1cb5db4..45239f64fbe 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -16,89 +16,98 @@ , imageio , tifffile , pytestCheckHook +, doCheck ? false }: let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; -in buildPythonPackage rec { - pname = "scikit-image"; - version = "0.18.3"; + self = buildPythonPackage rec { + pname = "scikit-image"; + version = "0.18.3"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh"; + }; + + patches = [ ./add-testing-data.patch ]; + + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ + cloudpickle + dask + imageio + matplotlib + networkx + numpy + pillow + pywavelets + scipy + six + tifffile + ]; + + # test suite is very cpu intensive, move to passthru.tests + inherit doCheck; + checkInputs = [ pytestCheckHook ]; + + # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; + # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; + # (3) Therefore, tests should be run on the installed package in nix store. + + # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed. + preCheck = '' + rm -r skimage + ''; + + disabledTestPaths = [ + # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error). + "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py" + ]; + pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([ + # These tests require network access + "skimage/data/test_data.py::test_skin" + "skimage/data/tests/test_data.py::test_skin" + "skimage/io/tests/test_io.py::test_imread_http_url" + "skimage/restoration/tests/test_rolling_ball.py::test_ndim" + ] ++ lib.optionals stdenv.isDarwin [ + # Matplotlib tests are broken inside darwin sandbox + "skimage/feature/tests/test_util.py::test_plot_matches" + "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" + "skimage/io/tests/test_mpl_imshow.py::" + ]); + + # Check cythonized modules + pythonImportsCheck = [ + "skimage" + "skimage._shared" + "skimage.draw" + "skimage.feature" + "skimage.restoration" + "skimage.filters" + "skimage.future.graph" + "skimage.graph" + "skimage.io" + "skimage.measure" + "skimage.morphology" + "skimage.transform" + "skimage.util" + "skimage.segmentation" + ]; + + passthru.tests = { + all-tests = self.override { doCheck = true; }; + }; + + meta = { + description = "Image processing routines for SciPy"; + homepage = "https://scikit-image.org"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yl3dy ]; + }; }; - - patches = [ ./add-testing-data.patch ]; - - nativeBuildInputs = [ cython ]; - - propagatedBuildInputs = [ - cloudpickle - dask - imageio - matplotlib - networkx - numpy - pillow - pywavelets - scipy - six - tifffile - ]; - - checkInputs = [ pytestCheckHook ]; - - # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; - # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; - # (3) Therefore, tests should be run on the installed package in nix store. - - # See e.g. https://discourse.nixos.org/t/cant-import-cythonized-modules-at-checkphase/14207 on why the following is needed. - preCheck = '' - rm -r skimage - ''; - - disabledTestPaths = [ - # Requires network access (actually some data is loaded via `skimage._shared.testing.fetch` in the global scope, which calls `pytest.skip` when a network is unaccessible, leading to a pytest collection error). - "${installedPackageRoot}/skimage/filters/rank/tests/test_rank.py" - ]; - pytestFlagsArray = [ "${installedPackageRoot}" "--pyargs" "skimage" ] ++ builtins.map (testid: "--deselect=" + testid) ([ - # These tests require network access - "skimage/data/test_data.py::test_skin" - "skimage/data/tests/test_data.py::test_skin" - "skimage/io/tests/test_io.py::test_imread_http_url" - "skimage/restoration/tests/test_rolling_ball.py::test_ndim" - ] ++ lib.optionals stdenv.isDarwin [ - # Matplotlib tests are broken inside darwin sandbox - "skimage/feature/tests/test_util.py::test_plot_matches" - "skimage/filters/tests/test_thresholding.py::TestSimpleImage::test_try_all_threshold" - "skimage/io/tests/test_mpl_imshow.py::" - ]); - - # Check cythonized modules - pythonImportsCheck = [ - "skimage" - "skimage._shared" - "skimage.draw" - "skimage.feature" - "skimage.restoration" - "skimage.filters" - "skimage.future.graph" - "skimage.graph" - "skimage.io" - "skimage.measure" - "skimage.morphology" - "skimage.transform" - "skimage.util" - "skimage.segmentation" - ]; - - meta = { - description = "Image processing routines for SciPy"; - homepage = "https://scikit-image.org"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ yl3dy ]; - }; -} +in + self From 17dab50baa5c93737f38e4bda24d05d35a19c65a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 08:36:09 -0800 Subject: [PATCH 586/685] python310Packages.joblib: disable test which doesn't emit warning in python3.10 --- pkgs/development/python-modules/joblib/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 2b011f56c1e..80ce4de2b9f 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,4 +1,5 @@ { lib +, pythonAtLeast , pythonOlder , buildPythonPackage , fetchPypi @@ -30,6 +31,9 @@ buildPythonPackage rec { "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests ] ++ lib.optionals stdenv.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # expected warning doesn't trigger in 3.10 + "test_nested_parallel_warnings" ]; meta = with lib; { From db8716173e093226282f49ff66726e35ae7df08b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 17:48:52 +0100 Subject: [PATCH 587/685] python3Packages.pytest-pythonpath: drop Obsoleted by https://github.com/pytest-dev/pytest/pull/9134, which was released as part of pytest 7.0.0. It has pytest<7 pinned, and we only have the single pytest version, so it can be removed. --- .../python-modules/nplusone/default.nix | 3 +-- .../pytest-pythonpath/default.nix | 26 ------------------- .../python-modules/pyverilog/default.nix | 7 +++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 5 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/pytest-pythonpath/default.nix diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index d9a340d8249..898d209d913 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -8,7 +8,6 @@ , mock , peewee , pytest-django -, pytest-pythonpath , pytestCheckHook , six , sqlalchemy @@ -38,7 +37,6 @@ buildPythonPackage rec { mock peewee pytest-django - pytest-pythonpath pytestCheckHook sqlalchemy webtest @@ -54,6 +52,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ + --replace "python_paths" "pythonpath" \ --replace "--cov nplusone --cov-report term-missing" "" ''; diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix deleted file mode 100644 index 8c3fb48b430..00000000000 --- a/pkgs/development/python-modules/pytest-pythonpath/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, pytest }: - -buildPythonPackage rec { - pname = "pytest-pythonpath"; - version = "0.7.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-ZOGVsjqPjAxjH7Fogtmtb6QTftHylh3dFdUgZc1DXbY="; - }; - - buildInputs = [ pytest ]; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; - - meta = with lib; { - description = - "Pytest plugin for adding to the PYTHONPATH from command line or configs"; - homepage = "https://github.com/bigsassy/pytest-pythonpath"; - maintainers = with maintainers; [ cript0nauta ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix index 8e41d26921f..115014a25bb 100644 --- a/pkgs/development/python-modules/pyverilog/default.nix +++ b/pkgs/development/python-modules/pyverilog/default.nix @@ -5,7 +5,6 @@ , jinja2 , ply , verilog -, pytest-pythonpath , pytestCheckHook }: @@ -32,8 +31,12 @@ buildPythonPackage rec { verilog ]; + preCheck = '' + substituteInPlace pytest.ini \ + --replace "python_paths" "pythonpath" + ''; + checkInputs = [ - pytest-pythonpath pytestCheckHook ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b8ea307917d..05ebce6357c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -92,6 +92,7 @@ mapAliases ({ pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 + pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cfc1521a8a..989f0680881 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7891,8 +7891,6 @@ in { pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; - pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; - pytest-qt = callPackage ../development/python-modules/pytest-qt { }; pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; From 637bb39f4fb7960548080936edc075e731e01461 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 08:56:46 -0800 Subject: [PATCH 588/685] python3Packages.suds-jurko: mark broken --- pkgs/development/python-modules/suds-jurko/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index af307919387..f2776265b06 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { description = "Lightweight SOAP client (Jurko's fork)"; homepage = "https://bitbucket.org/jurko/suds"; license = licenses.lgpl3; + broken = true; # Uses use2to3, which has been removed in setuptools>=58 }; } From 3f2cf51f1cb71232390c7f13dd91cb490f75a80e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 09:18:48 -0800 Subject: [PATCH 589/685] buildbot: disable sdist incompatible tests --- pkgs/development/python-modules/buildbot/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 2836ee24c34..5190c1fa74f 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -92,6 +92,9 @@ let preCheck = '' export LC_ALL="en_US.UTF-8" export PATH="$out/bin:$PATH" + + # remove testfile which is missing configuration file from sdist + rm buildbot/test/integration/test_graphql.py ''; disabled = !isPy3k; From e14adf92b3815a1f1766330aeeba9b27e0cfe3b0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 09:23:20 -0800 Subject: [PATCH 590/685] python3Packages.openapi-core: disable sandbox incompatible tests --- pkgs/development/python-modules/openapi-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 0d48ab04a1d..338615a06b1 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -61,6 +61,8 @@ buildPythonPackage rec { disabledTestPaths = [ # AttributeError: 'str' object has no attribute '__name__' "tests/integration/validation" + # requires secrets and additional configuration + "tests/integration/contrib/test_django.py" ]; disabledTests = [ From 2ffbe5d84b21500664cf573b7510960cf8aa8369 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 09:25:56 -0800 Subject: [PATCH 591/685] Revert "python3Packages.Shapely: 1.8.0 -> 1.8.1.post1" This reverts commit ff0ad9ef441df73253ad29e767c4ed645cf2f477. --- pkgs/development/python-modules/shapely/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 8d5d0d2aa4f..818cce6a567 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.8.1.post1"; + version = "1.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k/8G/wX74r6EO5PHsa2CkuVuZlugG0cI91rop1eXLp8="; + sha256 = "177g8wxsgnphhhn4634n6ca1qrk462ijqlznpj5ry6d49ghpwc7m"; }; nativeBuildInputs = [ From 66fc60c71186ed81f5ceabf1fd1212c2abc82cb3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 09:27:35 -0800 Subject: [PATCH 592/685] python3Packages.unittest-xml-reporting: add missing dependency --- .../python-modules/unittest-xml-reporting/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index de7f5669e23..c4ee1f955e4 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -1,11 +1,14 @@ -{lib, fetchPypi, buildPythonPackage, isPy27, six}: +{lib, fetchPypi, buildPythonPackage, isPy27, six, lxml }: buildPythonPackage rec { pname = "unittest-xml-reporting"; version = "3.2.0"; disabled = isPy27; - propagatedBuildInputs = [six]; + propagatedBuildInputs = [ + lxml + six + ]; # The tarball from Pypi doesn't actually contain the unit tests doCheck = false; From 38317cd91cf34f84037604dbe9e08db1ff76c8ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 18:34:14 +0100 Subject: [PATCH 593/685] python3Packages.stone: pull src from github --- .../python-modules/stone/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index a562840c1d2..f5a4f8a5a35 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -1,5 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi -, coverage +{ lib +, buildPythonPackage +, fetchFromGitHub , mock , ply , pytest-runner @@ -11,24 +12,23 @@ buildPythonPackage rec { pname = "stone"; version = "3.3.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-TvA5dRL2CXV5dffsCbNWOdcrp+PhfOTd85lXg0a0y1A="; + # pypi sdist misses requirements.txt + src = fetchFromGitHub { + owner = "dropbox"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner == 5.2.0" "pytest-runner" \ - --replace "pytest < 5" "pytest" - substituteInPlace test/requirements.txt \ - --replace "coverage==5.3" "coverage" + sed -i '/pytest-runner/d' setup.py ''; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ply six ]; - checkInputs = [ pytestCheckHook coverage mock ]; + checkInputs = [ pytestCheckHook mock ]; # try to import from `test` directory, which is exported by the python interpreter # and cannot be overriden without removing some py3 to py2 support From c5cafcd1951afa101ec66f890120f300ac9a660f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 18:45:03 +0100 Subject: [PATCH 594/685] python3Packages.clldutils: disable test that fail with pytest7 --- pkgs/development/python-modules/clldutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 563ad08381c..08f05a80c2c 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -44,6 +44,12 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = [ + # uses pytest.approx which is not supported in a boolean context in pytest7 + "test_to_dec" + "test_roundtrip" + ]; + meta = with lib; { description = "CSV on the Web"; homepage = "https://github.com/cldf/csvw"; From 803cfa509287ec3041d133c15999601a4b6b1bde Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 9 Mar 2022 18:47:23 +0100 Subject: [PATCH 595/685] python3Packages.clldutils: fix meta description and homepage --- pkgs/development/python-modules/clldutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 08f05a80c2c..697296d9a20 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -51,8 +51,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "CSV on the Web"; - homepage = "https://github.com/cldf/csvw"; + description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; + homepage = "https://github.com/clld/clldutils"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 7d2de8f2030879368a95556525411a2bdd2bc236 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 09:55:22 -0800 Subject: [PATCH 596/685] python3Packages.pyres: mark broken --- .../python-modules/pyres/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index bb15a4d927a..a5b618d5690 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -1,26 +1,10 @@ { lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }: -let - - # the requirements of `pyres` support Redis 3.x (due to a missing upper-bound), - # but it doesn't support Redis 3.x. - redis' = redis.overridePythonAttrs (old: rec { - pname = "redis"; - version = "2.10.6"; - src = fetchPypi { - inherit pname version; - sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52"; - }; - }); - -in - buildPythonPackage rec { pname = "pyres"; version = "1.5"; - # ps is used in Worker.worker_pids method - propagatedBuildInputs = [ simplejson setproctitle redis' pkgs.ps ]; + propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ]; checkInputs = [ nose pkgs.redis ]; # PyPI tarball doesn't contain tests so let's use GitHub @@ -44,5 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/binarydud/pyres"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; + broken = true; # not compatible with latest redis }; } From 711326a69d60b7e3fb01845e0fd14291c7445089 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Mar 2022 00:19:54 +0100 Subject: [PATCH 597/685] diffoscope: disable failing test --- pkgs/tools/misc/diffoscope/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 7f1655b9843..90cb0803473 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -80,6 +80,9 @@ python3Packages.buildPythonApplication rec { # fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" + + # We don't care if the is correctly formatted + "test_code_is_black_clean" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" From 29a0b8d913d45399d9e85e34d592f286a065814c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 15:27:02 -0800 Subject: [PATCH 598/685] python3Packages.bsblan: fix build --- pkgs/development/python-modules/bsblan/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix index 2bf4c63df8e..ed13a3a3a7b 100644 --- a/pkgs/development/python-modules/bsblan/default.nix +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -5,6 +5,8 @@ , aresponses , coverage , mypy +, poetry-core +, pydantic , pytest-asyncio , pytest-cov , pytest-mock @@ -18,7 +20,7 @@ buildPythonPackage rec { pname = "bsblan"; version = "0.5.5"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,10 +31,15 @@ buildPythonPackage rec { sha256 = "sha256-kq4cML7D9XC/QRPjGfaWcs0H78OOc2IXGua7qJpWYOQ="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp attrs cattrs + pydantic yarl ]; From 302bddeb3b65386eb3a1e0c2a438ac1066e5b7f5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 9 Mar 2022 15:31:58 -0800 Subject: [PATCH 599/685] python3Packages.superqt: fix build --- pkgs/development/python-modules/superqt/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index 717ac97fdcd..af600f62342 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -3,12 +3,16 @@ , fetchFromGitHub , setuptools-scm , pyqt5 +, qtpy , typing-extensions , pytest , pytestCheckHook -}: buildPythonPackage rec { +}: + +buildPythonPackage rec { pname = "superqt"; version = "0.3.1"; + src = fetchFromGitHub { owner = "napari"; repo = pname; @@ -17,7 +21,7 @@ }; format = "pyproject"; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ pyqt5 typing-extensions ]; + propagatedBuildInputs = [ pyqt5 qtpy typing-extensions ]; checkInputs = [ pytestCheckHook pytest ]; doCheck = false; # Segfaults... SETUPTOOLS_SCM_PRETEND_VERSION = version; From 140f2baeaf03402e884234f77a85c2a74168a17f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Mar 2022 00:57:45 +0100 Subject: [PATCH 600/685] python3Packages.stone: drop pytest-runner --- pkgs/development/python-modules/stone/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index f5a4f8a5a35..55f74b58fb5 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , mock , ply -, pytest-runner , pytestCheckHook , six }: @@ -24,8 +23,6 @@ buildPythonPackage rec { sed -i '/pytest-runner/d' setup.py ''; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ ply six ]; checkInputs = [ pytestCheckHook mock ]; From a0d59d618aea75eb1e36c0cf962ec1efd8f27cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 10 Mar 2022 14:29:03 +0100 Subject: [PATCH 601/685] python310Packages.osc-lib: disable broken tests --- pkgs/development/python-modules/osc-lib/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 95c5e5d6a32..c218f0d7ae0 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -38,7 +38,13 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + # tests parse cli output which slightly changed + stestr run -e <(echo " + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_filtering_option_to_parser + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_create + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_set + osc_lib.tests.utils.test_tags.TestTagHelps.test_add_tag_option_to_parser_for_unset + ") ''; pythonImportsCheck = [ "osc_lib" ]; From 5446ad857a9aecc5813d2925ecf90b10ad73f013 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Mar 2022 17:46:08 +0100 Subject: [PATCH 602/685] python3Packages.pytorch: 1.10.2 -> 1.11.0 --- .../pytorch/breakpad-sigstksz.patch | 13 +++++++ .../python-modules/pytorch/default.nix | 34 ++++++------------- 2 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch diff --git a/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch b/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch new file mode 100644 index 00000000000..33a2304cb9b --- /dev/null +++ b/pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c4099..499be0a986 100644 +--- a/third_party/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/third_party/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small. diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a1803f4fab0..24ba74a1013 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -12,7 +12,7 @@ numactl, # Propagated build inputs - dataclasses, numpy, pyyaml, cffi, click, typing-extensions, + numpy, pyyaml, cffi, click, typing-extensions, # Unit tests hypothesis, psutil, @@ -117,9 +117,10 @@ let in buildPythonPackage rec { pname = "pytorch"; # Don't forget to update pytorch-bin to the same version. - version = "1.10.2"; + version = "1.11.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7.0"; outputs = [ "out" # output standard python package @@ -132,19 +133,14 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU="; + sha256 = "sha256-CEu63tdRBAF8CTchO3Qu8gUNObQylX6U08yDTI4/c/0="; }; patches = [ - (fetchpatch { - # Import distutils directly, not from setuptools - url = "https://github.com/pytorch/pytorch/commit/07767569c964552702bf374da753212eb9cde327.patch"; - hash = "sha256-XNqKzIG3JYlQFeyng3UDkuEI9CC6mFD3aislM0H6W34="; - excludes = [ - # we don't run the tests anyway - "test/run_test.py" - ]; - }) + # Fix for a breakpad incompatibility with glibc>2.33 + # https://github.com/pytorch/pytorch/issues/70297 + # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e + ./breakpad-sigstksz.patch ] ++ lib.optionals stdenv.isDarwin [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) @@ -154,13 +150,6 @@ in buildPythonPackage rec { ./pthreadpool-disable-gcd.diff ]; - # The dataclasses module is included with Python >= 3.7. This should - # be fixed with the next PyTorch release. - postPatch = '' - substituteInPlace setup.py \ - --replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'" - ''; - preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ @@ -218,7 +207,7 @@ in buildPythonPackage rec { # https://github.com/pytorch/pytorch/issues/22346 # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: - # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17 + # https://github.com/pytorch/pytorch/blob/v1.11.0/setup.py#L17 NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; nativeBuildInputs = [ @@ -241,8 +230,7 @@ in buildPythonPackage rec { typing-extensions # the following are required for tensorboard support pillow six future tensorboard protobuf - ] ++ lib.optionals MPISupport [ mpi ] - ++ lib.optionals (pythonOlder "3.7") [ dataclasses ]; + ] ++ lib.optionals MPISupport [ mpi ]; checkInputs = [ hypothesis ninja psutil ]; From 1f7b9c4f85780617c5c040539aa897ab00656a21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Mar 2022 21:45:04 +0100 Subject: [PATCH 603/685] python3Packages.pygls: propagate toml, use pyproject build --- pkgs/development/python-modules/pygls/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 4c557b2676c..22cea8c0709 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , setuptools-scm , pydantic +, toml , typeguard , mock , pytest-asyncio @@ -13,6 +14,7 @@ buildPythonPackage rec { pname = "pygls"; version = "0.11.3"; + format = "setuptools"; disabled = !isPy3k; src = fetchFromGitHub { @@ -27,6 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pydantic + toml typeguard ]; # We don't know why an early version of pydantic is required, see: From 659f92160d6d267af84778b84a6089f08f881467 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Mar 2022 21:47:04 +0100 Subject: [PATCH 604/685] python3Packages.teletype: fix build --- pkgs/development/python-modules/teletype/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/teletype/default.nix b/pkgs/development/python-modules/teletype/default.nix index f7b5dad2324..47f6357a568 100644 --- a/pkgs/development/python-modules/teletype/default.nix +++ b/pkgs/development/python-modules/teletype/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "teletype"; version = "1.3.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; From 8e5e5e1de2565cf94bb4cf2f74f603ca82bfa3a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Mar 2022 22:05:35 +0100 Subject: [PATCH 605/685] python3Packages.pytesseract: propagate packaging --- .../python-modules/pytesseract/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 42628e9cfdd..13cfdaea214 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll }: +{ buildPythonPackage, fetchPypi, lib, packaging, pillow, tesseract, substituteAll }: buildPythonPackage rec { pname = "pytesseract"; version = "0.3.9"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -16,8 +17,14 @@ buildPythonPackage rec { }) ]; - buildInputs = [ tesseract ]; - propagatedBuildInputs = [ pillow ]; + buildInputs = [ + tesseract + ]; + + propagatedBuildInputs = [ + packaging + pillow + ]; # the package doesn't have any tests. doCheck = false; From 117038a41dcb29e68c6ed8f69219ba98a9822c97 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Mar 2022 22:08:07 +0100 Subject: [PATCH 606/685] python3Packages.diff-cover: disable tests that fails with pytest7 --- pkgs/development/python-modules/diff-cover/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 5414f7522db..3a370d3323b 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -52,6 +52,8 @@ buildPythonPackage rec { "file_does_not_exist" # AssertionError: assert '.c { color:... "test_style_defs" + # uses pytest.approx in a boolean context, which is unsupported since pytest7 + "test_percent_covered" ]; pythonImportsCheck = [ From d565a2140ca82387aee6dfa771b23e3ddcfaac06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 9 Feb 2022 23:09:13 +0000 Subject: [PATCH 607/685] python3Packages.pylama: 8.3.6 -> 8.3.7 --- .../python-modules/pylama/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 3f93aef0a3f..5d8674aac02 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -10,12 +10,14 @@ , pydocstyle , pyflakes , vulture +, isort +, pylint , pytestCheckHook }: buildPythonPackage rec { pname = "pylama"; - version = "8.3.6"; + version = "8.3.7"; format = "setuptools"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "klen"; repo = "pylama"; rev = version; - hash = "sha256-KU/G+2Fm4G/dUuNhhk8xM0Y8+7YOUUgREONM8CQGugw="; + hash = "sha256-//mrvZb4bT4aATURqa4g1DUagYe9SoP3o3OrwmiEJnI="; }; patches = [ @@ -45,14 +47,22 @@ buildPythonPackage rec { ]; checkInputs = [ + # avoid infinite recursion pylint -> isort -> pylama + (pylint.override { + isort = isort.overridePythonAttrs (old: { + doCheck = false; + }); + }) pytestCheckHook ]; + preCheck = '' + export HOME=$TEMP + ''; + disabledTests = [ - "test_pylint" # infinite recursion "test_quotes" # FIXME package pylama-quotes "test_radon" # FIXME package radon - "test_sort" ]; pythonImportsCheck = [ From ba147405c4fc74f5e3c2d25626619397ae79b2a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Mar 2022 10:46:23 +0100 Subject: [PATCH 608/685] python3Packages.mutagen: refactor - use pyproject build - disable flaky test case - prune dependencies - create documentation output - update meta --- .../python-modules/mutagen/default.nix | 67 ++++++++++++++----- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 33fc3c02dae..6308b6fceb6 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -1,37 +1,74 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi -, isPy27 -, flake8 + +# docs +, python +, sphinx +, sphinx_rtd_theme + +# tests , hypothesis -, pycodestyle -, pyflakes -, pytest -, setuptools -, pkgs +, pytestCheckHook }: buildPythonPackage rec { pname = "mutagen"; version = "1.45.1"; - disabled = isPy27; # abandoned + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1"; }; - propagatedBuildInputs = [ setuptools ]; - checkInputs = [ - pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis flake8 + outputs = [ + "doc" + "out" + ]; + + nativeBuildInputs = [ + sphinx + sphinx_rtd_theme + ]; + + postInstall = '' + ${python.interpreter} setup.py build_sphinx --build-dir=$doc + ''; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + disabledTests = [ + # Hypothesis produces unreliable results: Falsified on the first call but did not on a subsequent one + "test_test_fileobj_save" + ]; + + disabledTestPaths = [ + # we are not interested in code quality measurements + "tests/quality/test_flake8.py" ]; - LC_ALL = "en_US.UTF-8"; meta = with lib; { - description = "Python multimedia tagging library"; + description = "Python module for handling audio metadata"; + longDescription = '' + Mutagen is a Python module to handle audio metadata. It supports + ASF, FLAC, MP4, Monkey's Audio, MP3, Musepack, Ogg Opus, Ogg FLAC, + Ogg Speex, Ogg Theora, Ogg Vorbis, True Audio, WavPack, OptimFROG, + and AIFF audio files. All versions of ID3v2 are supported, and all + standard ID3v2.4 frames are parsed. It can read Xing headers to + accurately calculate the bitrate and length of MP3s. ID3 and APEv2 + tags can be edited regardless of audio format. It can also + manipulate Ogg streams on an individual packet/page level. + ''; homepage = "https://mutagen.readthedocs.io"; - license = licenses.lgpl2Plus; + changelog = "https://mutagen.readthedocs.io/en/latest/changelog.html#release-${lib.replaceStrings [ "." ] [ "-" ] version}"; + license = licenses.gpl2Plus; platforms = platforms.all; }; } From 156d553239a69c7d2bcda7d19bc97c19de6afb9e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 11 Mar 2022 11:30:34 -0800 Subject: [PATCH 609/685] python3Packages.intensity-normalization.src: fix pname --- .../python-modules/intensity-normalization/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 2cb4b51de2c..5e658953fc8 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -21,7 +21,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "intensity_normalization"; + inherit version; sha256 = "sha256-0tc21NBj3Cajklk9mWbKfBzbSwjUrBWs/SlakjEHC1U="; }; From 97ce54171136b1569add80b259db1a5e4c519e95 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 11 Mar 2022 11:36:06 -0800 Subject: [PATCH 610/685] python3Packages.bitcoinlib: fix openssl lib reference --- pkgs/development/python-modules/bitcoinlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index 71b032a34e4..f3eb86c7bbb 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -17,7 +17,7 @@ in buildPythonPackage rec { postPatch = '' substituteInPlace bitcoin/core/key.py --replace \ "ctypes.util.find_library('ssl') or 'libeay32'" \ - "'${openssl.out}/lib/libssl.${ext}'" + "'${lib.getLib openssl}/lib/libssl.${ext}'" ''; meta = { From d233cd039c5fb8aec9adc30b6d404ee23de2f19d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Mar 2022 15:59:24 +0100 Subject: [PATCH 611/685] python3Packages.tensorflow-metadata: fix build --- .../python-modules/tensorflow-metadata/build.patch | 9 --------- .../python-modules/tensorflow-metadata/default.nix | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch index ff81c5d1e86..5b570bf7206 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/build.patch +++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch @@ -2,15 +2,6 @@ diff --git a/setup.py b/setup.py index 7a09b2f..94c5aa6 100644 --- a/setup.py +++ b/setup.py -@@ -125,7 +125,7 @@ setup( - ], - namespace_packages=[], - install_requires=[ -- 'absl-py>=0.9,<0.13', -+ 'absl-py>=0.9', - 'googleapis-common-protos>=1.52.0,<2', - 'protobuf>=3.13,<4', - ], @@ -137,8 +137,5 @@ setup( long_description_content_type='text/markdown', keywords='tensorflow metadata tfx', diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 8839c2cddaa..b39f1211d0c 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , googleapis-common-protos +, protobuf , lib }: @@ -31,8 +32,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ absl-py googleapis-common-protos + protobuf ]; + # has no tests + doCheck = false; + pythonImportsCheck = [ "tensorflow_metadata" ]; From 6b052fee2f14f196cea7cfa0ffbf66d857720bf1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Mar 2022 21:13:57 +0100 Subject: [PATCH 612/685] python3Packages.pytest-cid: relax pytest constraint --- pkgs/development/python-modules/pytest-cid/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index c1c918c4d60..767d300f7dd 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "sha256-H2RtMGYWukowTTfqZSx+hikxzkqw1v5bA4AfZfiVl8U="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "pytest >= 5.0, < 7.0" "pytest >= 5.0" + ''; + propagatedBuildInputs = [ py-cid ]; From 76f186423cf770c8684fa920e1db0567538c4f93 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Mar 2022 21:14:22 +0100 Subject: [PATCH 613/685] python3Packages.tensorboardx: disable caffe2 tests We don't have that dependency packaged. --- pkgs/development/python-modules/tensorboardx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 2dc421e3c8a..7aa29f34baa 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -70,6 +70,8 @@ buildPythonPackage rec { disabledTestPaths = [ # we are not interested in linting errors "tests/test_lint.py" + # missing caffe2 dependency + "tests/test_caffe2.py" ]; meta = with lib; { From 570a349d1bc829898caa2dbbfcba2f449a4f5b5f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Mar 2022 22:32:20 +0100 Subject: [PATCH 614/685] python3Packages.pynndescent: disable incompatible tests --- .../development/python-modules/pynndescent/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index f15cfef63c6..79b914f6122 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -34,6 +34,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # numpy.core._exceptions._UFuncNoLoopError + "test_sparse_nn_descent_query_accuracy_angular" + "test_nn_descent_query_accuracy_angular" + "test_alternative_distances" + # scipy: ValueError: Unknown Distance Metric: wminkowski + # https://github.com/scikit-learn/scikit-learn/pull/21741 + "test_weighted_minkowski" + ]; + pythonImportsCheck = [ "pynndescent" ]; From c06ee1153ed3ba94d4629f6761a4b19c6b34a58b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Mar 2022 00:18:17 +0100 Subject: [PATCH 615/685] python3Packages.cython: 0.29.24 -> 0.29.28 --- pkgs/development/python-modules/Cython/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index e22037cbbb9..5ceabe766b8 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -25,11 +25,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.24"; + version = "0.29.28"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM="; + sha256 = "sha256-1vrCNCgCww5RQmgo/ghP9N6xszhzZ8+Yl2uy5ktvjkU="; }; nativeBuildInputs = [ @@ -44,13 +44,6 @@ in buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; patches = [ - # https://github.com/cython/cython/issues/2752, needed by sage (https://trac.sagemath.org/ticket/26855) and up to be included in 0.30 - (fetchpatch { - name = "non-int-conversion-to-pyhash.patch"; - url = "https://github.com/cython/cython/commit/28251032f86c266065e4976080230481b1a1bb29.patch"; - sha256 = "19rg7xs8gr90k3ya5c634bs8gww1sxyhdavv07cyd2k71afr83gy"; - }) - # backport Cython 3.0 trashcan support (https://github.com/cython/cython/pull/2842) to 0.X series. # it does not affect Python code unless the code explicitly uses the feature. # trashcan support is needed to avoid stack overflows during object deallocation in sage (https://trac.sagemath.org/ticket/27267) From 9b74eef20aadb05b080049dc756c4a022ef99596 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Mar 2022 00:19:04 +0100 Subject: [PATCH 616/685] Revert "python3Packages.numpy: 1.21.5 -> 1.22.2" This reverts commit 940af4b22772a13b2fe57e3f082e8d04634b5074. Causes problems with scikit-learn, details can be found over in https://github.com/NixOS/nixpkgs/pull/156578. --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 6ecad79b7f2..2fbe1a7a694 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -44,7 +44,7 @@ in buildPythonPackage rec { # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so # build both to verify they don't break. # https://github.com/scipy/scipy/issues/15414 - version = "1.22.2"; + version = "1.21.5"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; @@ -52,7 +52,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-B2ruWjdj1B2mvvlWX988uYdgb1Z82LEEre0rOLe0er8="; + sha256 = "sha256-alkovGJBJk3OXtUJ5m8zZ2/Jf0ZOepGe3GcvtVMiIe4="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 0f446086d17fbfc22f78d0f825b7313ec6f210f7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Mar 2022 00:20:56 +0100 Subject: [PATCH 617/685] Revert "python3Packages.scikit-learn: disable more tests" This reverts commit 6cc7b4715feb572f53b37efef5abb6e35d256a76. Disabling these tests hides crashing issues that are encountered in the test suite. They are ultimately caused by an update to numpy>=1.22.0 that was reverted so that these tests can be reenabled. --- .../python-modules/scikit-learn/default.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index fe5dba10511..7e2096c9b9b 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -65,22 +65,6 @@ buildPythonPackage rec { "check_regressors_train" "check_classifiers_train" "xfail_ignored_in_check_estimator" - - # failing on x86_64-linux - "test_kernel_pca_consistent_transform" - "test_kernel_pca_raise_not_fitted_error" - "test_32_64_decomposition_shape" - "test_randomized_eigsh_reconst_low_rank" - "test_randomized_svd_low_rank_with_noise" - - "test_row_norms" - "test_randomized_svd_infinite_rank" - "test_randomized_svd_transpose_consistency" - "test_randomized_svd_sparse_warnings" - "test_randomized_svd_sign_flip" - "test_incremental_weighted_mean_and_variance_ignore_nan" - "test_randomized_svd_infinite_rank" - "test_randomized_eigsh_compared_to_others" ]; pytestFlagsArray = [ @@ -93,7 +77,7 @@ buildPythonPackage rec { # (https://github.com/joblib/joblib/issues/563). See also: # https://github.com/scikit-learn/scikit-learn/issues/17582 # Since we are overriding '-k' we need to include the 'disabledTests' from above manually. - "-k" "'not (NuSVC and memmap) and not KernelPCA ${toString (lib.forEach disabledTests (t: "and not ${t}"))}'" + "-k" "'not (NuSVC and memmap) ${toString (lib.forEach disabledTests (t: "and not ${t}"))}'" "-n" "$NIX_BUILD_CORES" ]; From b1ce3a653ef028914cfb22d70e89c18907140a53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Mar 2022 12:34:06 +0100 Subject: [PATCH 618/685] python3Packages.joblib: disable flaky test --- pkgs/development/python-modules/joblib/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 80ce4de2b9f..ad7db290d67 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -29,11 +29,9 @@ buildPythonPackage rec { disabledTests = [ "test_disk_used" # test_disk_used is broken: https://github.com/joblib/joblib/issues/57 "test_parallel_call_cached_function_defined_in_jupyter" # jupyter not available during tests + "test_nested_parallel_warnings" # tests is flaky under load ] ++ lib.optionals stdenv.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. - ] ++ lib.optionals (pythonAtLeast "3.10") [ - # expected warning doesn't trigger in 3.10 - "test_nested_parallel_warnings" ]; meta = with lib; { From 49151eb21487d156a0e44fd941dd09a1aafb39e5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Mar 2022 15:29:12 +0100 Subject: [PATCH 619/685] python3Packages.pgspecial: disable test that requires postgres instance --- pkgs/development/python-modules/pgspecial/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 8eec0190fe5..e7b4e62ab57 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # requires a postgresql server + "test_slash_dp_pattern_schema" + ]; + meta = with lib; { description = "Meta-commands handler for Postgres Database"; homepage = "https://pypi.python.org/pypi/pgspecial"; From b8734c50e2942560be9ab5bb1da1b93ea55c8f93 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 5 Mar 2022 23:37:43 +0000 Subject: [PATCH 620/685] pkgsMusl.systemdMinimal: fix build Use latest patches from OpenEmbedded. pkgsMusl.systemd doesn't build yet because pkgsMusl.libnetfilter_conntrack is currently broken. --- pkgs/os-specific/linux/systemd/default.nix | 9 +++------ pkgs/os-specific/linux/systemd/musl.diff | 12 ------------ 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/musl.diff diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 39679b31764..fda8092ec98 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -181,8 +181,8 @@ stdenv.mkDerivation { ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-14c6e5a4b72d0e4665279158a0740dd1dc21f72f.tar.bz2"; - sha256 = "1jixya4czkr5p5rdcw3d6ips8zzr82dvnanvzvgjh67730scflya"; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-7e35a575ef09a85e625a81e0b4d80b020e3e3a92.tar.bz2"; + sha256 = "0dvz4685nk0y7nnq3sr2q8ab3wfx0bi8ilwcgn0h6kagwcnav2n8"; }; musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; in @@ -191,7 +191,6 @@ stdenv.mkDerivation { (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch") (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch") (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch") - (musl-patches + "/0006-Include-netinet-if_ether.h.patch") (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch") (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch") (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch") @@ -210,9 +209,7 @@ stdenv.mkDerivation { (musl-patches + "/0025-Handle-__cpu_mask-usage.patch") (musl-patches + "/0026-Handle-missing-gshadow.patch") (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch") - - # Being discussed upstream: https://lists.openembedded.org/g/openembedded-core/topic/86411771#157056 - ./musl.diff + (musl-patches + "/0001-Adjust-for-musl-headers.patch") ] ); diff --git a/pkgs/os-specific/linux/systemd/musl.diff b/pkgs/os-specific/linux/systemd/musl.diff deleted file mode 100644 index cab135dd8fc..00000000000 --- a/pkgs/os-specific/linux/systemd/musl.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c -index ef3527e..cc1ba23 100644 ---- a/src/shared/mount-setup.c -+++ b/src/shared/mount-setup.c -@@ -32,6 +32,7 @@ - #include "strv.h" - #include "user-util.h" - #include "virt.h" -+#include "missing_type.h" - - typedef enum MountMode { - MNT_NONE = 0, From 2cc5ec86571c6f22ecb9d49f48b0b1ee2e160b52 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Mar 2022 00:49:28 +0000 Subject: [PATCH 621/685] pkgsMusl.libnetfilter_conntrack: fix build --- .../libraries/libnetfilter_conntrack/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 32f7bc43316..e960c8d1bf4 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libnfnetlink, libmnl }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnfnetlink, libmnl }: stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z72d9J/jTouCFE9t+5OzIPOEqOpZcn6S/40YtfS1eag="; }; + patches = [ + # Fix Musl build. + (fetchpatch { + url = "https://git.netfilter.org/libnetfilter_conntrack/patch/?id=21ee35dde73aec5eba35290587d479218c6dd824"; + sha256 = "00rp82jrx5ygcw8la3c7bv7sigw9qzbn956dk71qjx981a2g2kqk"; + }) + ]; + buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; nativeBuildInputs = [ pkg-config ]; From dd6b901a38c1b734cba404ed1295f4e3de61f8a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Mar 2022 14:36:37 +0100 Subject: [PATCH 622/685] qt515.qtwebengine: drop obsoleted patch regarding glibc2.34 compat It does not apply anymore, which makes the build fail. --- pkgs/development/libraries/qt-5/5.15/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 74b92dda1df..5943a80a701 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -56,13 +56,7 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ - # glibc 2.34 compat - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch"; - sha256 = "sha256-1zS7nvbe5ZVuW/wSNOUBc2Qz0aB483Kfnz1JbzKEI+M="; - }) - ] ++ lib.optionals stdenv.isDarwin [ + qtwebengine = lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ]; From 4e0daeeee4701eb4fab61a903e288301668f6c9d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Mar 2022 18:23:33 +0100 Subject: [PATCH 623/685] nss: 3.75 -> 3.76 https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_76.rst --- pkgs/development/libraries/nss/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index d17f4c4a783..454c09e1b02 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -27,7 +27,8 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.75"; + version = "3.76"; + underscoreVersion = lib.replaceStrings [ "." ] [ "_" ] version; in stdenv.mkDerivation rec { @@ -35,8 +36,8 @@ stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "10l5qn68gly2l4ifv0v6by1qc8nsmhra08nm9m7n913jh83iamzx"; + url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + sha256 = "0c0nmajcvnm8gqz2v6wrlq04yzy3y7hcs806wjnx4r6kml8073hv"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -190,6 +191,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; + changelog = "https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_${underscoreVersion}.rst"; maintainers = with maintainers; [ ]; license = licenses.mpl20; platforms = platforms.all; From 1bce36cfb7cb1204150c6c7e58e24910be6876d4 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 14 Mar 2022 14:08:48 -0700 Subject: [PATCH 624/685] python3Packages.sphinx: fix tests on darwin --- pkgs/development/python-modules/sphinx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 19961cc2ec1..7d79aaa457a 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -92,9 +92,11 @@ buildPythonPackage rec { # Due to lack of network sandboxing can't guarantee port 7777 isn't bound "test_inspect_main_url" "test_auth_header_uses_first_match" + "test_linkcheck_allowed_redirects" "test_linkcheck_request_headers" "test_linkcheck_request_headers_no_slash" "test_follows_redirects_on_HEAD" + "test_get_after_head_raises_connection_error" "test_invalid_ssl" "test_connect_to_selfsigned_with_tls_verify_false" "test_connect_to_selfsigned_with_tls_cacerts" From 8d35d7e2bf15511da2207c8b667604e64aad9efc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 23:58:05 +0000 Subject: [PATCH 625/685] shadow: 4.8.1 -> 4.8.11 --- pkgs/os-specific/linux/shadow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 2e4ae1649ea..5537f9f6aac 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.8.1"; + version = "4.11.1"; src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; - rev = version; - sha256 = "13407r6qwss00504qy740jghb2dzd561la7dhp47rg8w3g8jarpn"; + rev = "v${version}"; + sha256 = "sha256-PxLX5V0t18JftT5wT41krNv18Ew7Kz3MfZkOi/80ODA="; }; buildInputs = lib.optional (pam != null && stdenv.isLinux) pam; From a4bb1d210d0d5f58feea1872321f56a7b186793a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Mar 2022 08:10:18 +0000 Subject: [PATCH 626/685] curl: 7.81.0 -> 7.82.0 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index bfd48893165..c032ba61c12 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -54,14 +54,14 @@ assert zstdSupport -> zstd != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.81.0"; + version = "7.82.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-Hno41wGOwGDx8W34OYVPCInpThIsTPpdOjfC3Fbx4lg="; + sha256 = "sha256-RtmgQAozQI/ZkncLBKRKdDSzA28ugImsKLV1c9WdNx8="; }; patches = [ From ac896239be7091aaa243891aa150042c42b5ffc2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Mar 2022 17:55:49 +1000 Subject: [PATCH 627/685] sqlite: 3.38.0 -> 3.38.1 https://www.sqlite.org/releaselog/3_38_1.html --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- pkgs/development/libraries/sqlite/tools.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 604e3a31dde..4112d5af7c4 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -11,13 +11,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.38.0"; + version = "3.38.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-HHbiXcY9nzk14PQGrsUgoz7nfPVOpRR9/+H66Dae/2g="; + sha256 = "sha256-jjqM65eU2Wg5lZDS3fnVwESpfdg9OLlhM2SiReyKL8Q="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 1a5d709016d..6b07c762881 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { inherit pname; - version = "3.38.0"; + version = "3.38.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-d8U9SBLK14VvXxoeB9KiwqNETSapZSdCefjdn6pv9IA="; + sha256 = "sha256-F3rv2oF/qfUoJeF0hYf3wnqbXmtTpIHNQ0YfJ0bZMdg="; }; nativeBuildInputs = [ unzip ]; From 70f0ca34808a0e9ffde8358124245a4af7e69b34 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Mar 2022 19:36:52 +1000 Subject: [PATCH 628/685] sqlite: add sqldiff, sqlite-analyzer to passthru.tests --- pkgs/development/libraries/sqlite/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 4112d5af7c4..6cb2eb4b2d1 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, zlib, interactive ? false, readline, ncurses , python3Packages , enableDeserialize ? false +, sqldiff, sqlite-analyzer }: with lib; @@ -85,6 +86,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (python3Packages) sqlalchemy; + inherit sqldiff sqlite-analyzer; }; meta = { From 66ea96f9421d032734bd065fb9ac26ed1a8f88c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Tue, 4 Jan 2022 14:45:58 +0100 Subject: [PATCH 629/685] unbound: optionally build the Python module It works both with Python2 and 3 Example usage: https://github.com/NLnetLabs/pythonunbound --- pkgs/tools/networking/unbound/default.nix | 20 ++++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 416d8863cb4..d9935950f34 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -8,6 +8,8 @@ , libsodium , protobufc , hiredis +, python ? null +, swig , dns-root-data , pkg-config , makeWrapper @@ -35,6 +37,7 @@ # Avoid .lib depending on openssl.out # The build gets a little hacky, so in some cases we disable this approach. , withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP +, withPythonModule ? false , libnghttp2 }: @@ -49,11 +52,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ] - ++ lib.optionals withDoH [ libnghttp2 ]; + ++ lib.optionals withDoH [ libnghttp2 ] + ++ lib.optionals withPythonModule [ python ]; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -69,6 +74,8 @@ stdenv.mkDerivation rec { "--disable-flto" ] ++ lib.optionals withSystemd [ "--enable-systemd" + ] ++ lib.optionals withPythonModule [ + "--with-pythonmodule" ] ++ lib.optionals withDoH [ "--with-libnghttp2=${libnghttp2.dev}" ] ++ lib.optionals withECS [ @@ -100,12 +107,21 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = lib.optionalString withPythonModule '' + substituteInPlace Makefile.in \ + --replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" + ''; + installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; postInstall = '' make unbound-event-install wrapProgram $out/bin/unbound-control-setup \ --prefix PATH : ${lib.makeBinPath [ openssl ]} + '' + lib.optionalString withPythonModule '' + wrapProgram $out/bin/unbound \ + --prefix PYTHONPATH : "$out/${python.sitePackages}" \ + --argv0 $out/bin/unbound ''; preFixup = lib.optionalString withSlimLib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76ab81507a8..b720e6a4cfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11134,7 +11134,9 @@ with pkgs; }; unbound-full = unbound.override { + python = python3; withSystemd = true; + withPythonModule = true; withDoH = true; withECS = true; withDNSCrypt = true; From 899bab1df0eaca5b5601df738560438f4f8dcdfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 11:12:45 +0000 Subject: [PATCH 630/685] libwacom: 2.0.0 -> 2.1.0 --- pkgs/development/libraries/libwacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 1517cf97078..7ccc0d2a199 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.0.0"; + version = "2.1.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-k8pEgEu+oWNa0rI47osVPKaZGxgwX/ENaz9jPrQXy0E="; + sha256 = "sha256-yqOhlbOgDIAsxgQWoLKj7WpwJXvxeuW8yCvuKTtE7h0="; }; nativeBuildInputs = [ From 88deb06a962235a890c2e7bc01bca24ae5f64ed8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Mar 2022 18:31:51 +0100 Subject: [PATCH 631/685] python39: 3.9.10 -> 3.9.11 https://www.python.org/downloads/release/python-3911/ --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a7d5e0854fb..b28812cc344 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -133,10 +133,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "10"; + patch = "11"; suffix = ""; }; - sha256 = "sha256-Co+/tSh+vDoT6brz1U4I+gZ3j/7M9jEa74Ibs6ZYbMg="; + sha256 = "sha256-ZnZ6NTCdck83DfnlA8FytO5ET0nWK5i8TspyUSPibEk="; }; python310 = { sourceVersion = { From 5117b2ee8cf6cbc5a4aae23151afe7710e4ab61d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Mar 2022 20:05:15 +0100 Subject: [PATCH 632/685] python310: 3.10.2 -> 3.10.3 https://www.python.org/downloads/release/python-3103/ --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b28812cc344..a969cbfe31c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -142,10 +142,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "10"; - patch = "2"; + patch = "3"; suffix = ""; }; - sha256 = "sha256-F946x9qfJRmqnWQ3jGA6c6DprVjf+ogS5FFgwIbeZMc="; + sha256 = "sha256-WWxy3pmNw5IFvE9w7w2/ft7HQKMG0JtJqb0Kd4BnMNw="; }; }; From 1dad933e185863504075ae2a73a75af26a0a198f Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 17 Mar 2022 10:52:51 +0100 Subject: [PATCH 633/685] tzdata: 2021e -> 2022a --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 78c93b05033..b149f448da7 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2021e"; + version = "2022a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "1cdjdcxl0s9xf0dg1z64kh7llm80byxqlzrkkjzcdlyh6yvl5v07"; + sha256 = "0r0nhwpk9nyxj5kkvjy58nr5d85568m04dcb69c4y3zmykczyzzg"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "0x8pcfmjvxk29yfh8bklchv2f0vpl4yih0gc4wyx292l78wncijq"; + sha256 = "1iysv8fdkm79k8wh8jizmjmq075q4qjhk090vxjy57my6dz5wmzq"; }) ]; From b6aa99a8d2a1eadecb13c4e1887489c4850cfb09 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Mar 2022 21:40:15 +1000 Subject: [PATCH 634/685] buildGoModule: fix vendor conditional, set GOPROXY unconditionally with sandboxing disabled this could still access the network --- pkgs/development/go-modules/generic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index ace8b820ee2..f986d164ee8 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -153,13 +153,13 @@ let export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" + export GOPROXY=off export GOSUMDB=off cd "$modRoot" - '' + lib.optionalString (go-modules != "") '' + '' + lib.optionalString (vendorSha256 != null) '' ${if proxyVendor then '' export GOPROXY=file://${go-modules} '' else '' - export GOPROXY=off rm -rf vendor cp -r --reflink=auto ${go-modules} vendor ''} From 0e3394758c5c12695e7be82aabb0ce907e4f0833 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 16 Mar 2022 17:47:19 +1000 Subject: [PATCH 635/685] libcap: 2.49 -> 2.63 https://sites.google.com/site/fullycapable/release-notes-for-libcap --- pkgs/os-specific/linux/libcap/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 2f12d2fea38..750e26313cf 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, attr, perl, runtimeShell +{ stdenv, lib, buildPackages, fetchurl, attr, runtimeShell , usePam ? !isStatic, pam ? null , isStatic ? stdenv.hostPlatform.isStatic }: @@ -7,18 +7,17 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.49"; + version = "2.63"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "sha256-6YvE2TZFCC7Hh3MLD9GnErOIgkZcUFd33hfDOIMe4YE="; + sha256 = "sha256-DGN7j0T8fYYneH6c9X8VrAbB3cy1PkH+7FSWvjRm938="; }; outputs = [ "out" "dev" "lib" "man" "doc" ] ++ lib.optional usePam "pam"; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ]; buildInputs = lib.optional usePam pam; @@ -31,7 +30,9 @@ stdenv.mkDerivation rec { "CC:=$(CC)" ] ++ lib.optional isStatic "SHARED=no"; - prePatch = '' + postPatch = '' + patchShebangs ./progs/mkcapshdoc.sh + # use full path to bash substituteInPlace progs/capsh.c --replace "/bin/bash" "${runtimeShell}" From 8d7d5fdbdc756d208799b2b2bb5da7e0301e6fcb Mon Sep 17 00:00:00 2001 From: linj Date: Thu, 17 Mar 2022 17:45:40 +0800 Subject: [PATCH 636/685] linux: enable TASKSTATS, TASK_XACCT, TASK_DELAY_ACCT and TASK_IO_ACCOUNTING iotop needs TASKSTATS, TASK_DELAY_ACCT, TASK_XACCT and TASK_IO_ACCOUNTING to work. For x86_64, all these options are enabled by upstream[1]. For aarch64, however, only TASK_XACCT and TASK_IO_ACCOUNTING are enabled by upstream[2]. This patch enables all these four options for aarch64, which have been enabled by many other distributions, e.g. debian[3], fedora[4], rhel[5] and gentoo[6]. I tried to only enable TASKSTATS and TASK_DELAY_ACCT since the other two options are enabled by upstream, but it turns out that it's necessary to explicitly enable all four options. I do not figure out the reason though. Additionally, given that debian enables these four options for all arch[3], I think it's safe for us to do the same thing. [1]: https://github.com/torvalds/linux/blob/56e337f2cf1326323844927a04e9dbce9a244835/arch/x86/configs/x86_64_defconfig#L8-L11 [2]: https://github.com/torvalds/linux/blob/56e337f2cf1326323844927a04e9dbce9a244835/arch/arm64/configs/defconfig#L10-L11 [3]: https://salsa.debian.org/kernel-team/linux/-/blob/da6ddc7d8f1a95980d9a1c499fe58066cfe1986b/debian/config/config#L6356-6359 [4]: https://src.fedoraproject.org/rpms/kernel/blob/rawhide/f/kernel-aarch64-fedora.config#_7398 [5]: https://src.fedoraproject.org/rpms/kernel/blob/rawhide/f/kernel-aarch64-rhel.config#_5885 [6]: https://github.com/gentoo/gentoo/blob/b839fccce25d49df2fcfe5ed184b557796b0d6bd/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.29.ebuild#L27 --- pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 068aedf3121..8b2b212adfb 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -906,6 +906,11 @@ let ANDROID_BINDER_IPC = { optional = true; tristate = whenAtLeast "5.0" "y";}; ANDROID_BINDERFS = { optional = true; tristate = whenAtLeast "5.0" "y";}; ANDROID_BINDER_DEVICES = { optional = true; freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";}; + + TASKSTATS = yes; + TASK_DELAY_ACCT = yes; + TASK_XACCT = yes; + TASK_IO_ACCOUNTING = yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot From 75a612b110549757bcaad36054893b3d34bbb668 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 18 Mar 2022 16:30:26 +0100 Subject: [PATCH 637/685] ell: 0.46 -> 0.49 --- pkgs/os-specific/linux/ell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index aa8e3f15aab..d79201cc4cd 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.46"; + version = "0.49"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - sha256 = "sha256-Am1PNFFfSzII4Iaeq0wgfuVHSeMDjiDzYkNQWlnEHJY="; + sha256 = "sha256-/5ivelqRDvJuPVJqMs27VJUIq7/Dw6ROt/cmjSo309s="; }; nativeBuildInputs = [ From cbf0cefbd705fb4eb5c9b11bf80f9ebe249cf66c Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 18 Mar 2022 16:30:37 +0100 Subject: [PATCH 638/685] iwd: 1.20 -> 1.25 --- pkgs/os-specific/linux/iwd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 72ecaffe5f5..19f4301ff53 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.20"; + version = "1.25"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-GcqmMqrZSgvSrsY8FJbPynNWTzSi5A6kmyq+xJ+2i3Y="; + sha256 = "sha256-3IiRuILU2FKzXAQ0Q79DX2+nlNMcHNanS8m9GqjBBnU="; }; outputs = [ "out" "man" "doc" ] @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { postUnpack = '' mkdir -p iwd/ell ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h + ln -s ${ell.src}/ell/asn1-private.h iwd/ell/asn1-private.h patchShebangs . ''; From c55c1e50becdb75bd17c3add5fc1e3362110bf4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Mar 2022 13:27:37 +0000 Subject: [PATCH 639/685] dav1d: 0.9.2 -> 1.0.0 --- pkgs/development/libraries/dav1d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index b39e0923609..08f73b6b569 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -10,14 +10,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.9.2"; + version = "1.0.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0bkps488h9s15ylvkm4fmfywgrpbw570glawpnv6khpq9n223dzl"; + sha256 = "sha256-RVr7NFVxY+6MBD8NV7eMW8TEWuCgcfqpula1o1VZe0o="; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; From d88f6aa9d8e3d8f615bb25616656ac0e1fb485fb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 20 Mar 2022 07:41:14 +1000 Subject: [PATCH 640/685] rust: add mips64el-unknown-linux-gnuabi64 bootstrap hash follow up from c6108020ffa61b55d823f11da85c24566c582217 --- pkgs/development/compilers/rust/1_59.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/rust/1_59.nix b/pkgs/development/compilers/rust/1_59.nix index f3ded56c1be..98125851655 100644 --- a/pkgs/development/compilers/rust/1_59.nix +++ b/pkgs/development/compilers/rust/1_59.nix @@ -52,6 +52,7 @@ import ./default.nix { aarch64-apple-darwin = "00b44985bc87e53c53d92622fb10226f09e9f25c79db48a77c0a769a36f83b1e"; powerpc64le-unknown-linux-gnu = "b15baef702cbd6f0ea2bef7bf98ca7ce5644f2beb219028e8a12e7053da4c849"; riscv64gc-unknown-linux-gnu = "d8ea2b11a4b24d1169fa3190127488b951b8bdef28293a4129ddd46c0ba9469b"; + mips64el-unknown-linux-gnuabi64 = "4f03bc972ae784d4f66cfa77215b369723531e67f647de9f49ce9fc21e5691af"; }; selectRustPackage = pkgs: pkgs.rust_1_59; From ad3e1217955c26b394463b54ef59f1bcc98a37ef Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 12 Mar 2022 15:12:25 +0100 Subject: [PATCH 641/685] SDL2: Reinstate find-headers.patch --- pkgs/development/libraries/SDL2/default.nix | 8 +++++ .../libraries/SDL2/find-headers.patch | 34 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/SDL2/find-headers.patch diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d1086de3718..d8d81492f91 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -65,6 +65,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config + patches = [ + # `sdl2-config --cflags` from Nixpkgs returns include path to just SDL2. + # On a normal distro this is enough for includes from all SDL2* packages to work, + # but on NixOS they're spread across different paths. + # This patch + the setup-hook will ensure that `sdl2-config --cflags` works correctly. + ./find-headers.patch + ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ]; diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch new file mode 100644 index 00000000000..4792679deb1 --- /dev/null +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -0,0 +1,34 @@ +diff --git a/sdl2-config.cmake.in b/sdl2-config.cmake.in +index c570511fa..ca694f595 100644 +--- a/sdl2-config.cmake.in ++++ b/sdl2-config.cmake.in +@@ -7,7 +7,8 @@ set(includedir "@includedir@") + set(SDL2_PREFIX "${prefix}") + set(SDL2_EXEC_PREFIX "${exec_prefix}") + set(SDL2_LIBDIR "${libdir}") +-set(SDL2_INCLUDE_DIRS "${includedir}/SDL2") ++set(SDL2_INCLUDE_DIRS "${includedir}/SDL2" $ENV{SDL2_PATH}) ++separate_arguments(SDL2_INCLUDE_DIRS) + set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") + string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) + +diff --git a/sdl2-config.in b/sdl2-config.in +index 5a2aed292..7c55f0a28 100644 +--- a/sdl2-config.in ++++ b/sdl2-config.in +@@ -42,7 +42,11 @@ while test $# -gt 0; do + echo @SDL_VERSION@ + ;; + --cflags) +- echo -I@includedir@/SDL2 @SDL_CFLAGS@ ++ SDL_CFLAGS="" ++ for i in @includedir@/SDL2 $SDL2_PATH; do ++ SDL_CFLAGS="$SDL_CFLAGS -I$i" ++ done ++ echo $SDL_CFLAGS @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) + @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ +-- +2.33.1 + From 3c0e4f95de2b2032831faf96e79d06c9d3073eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 20 Jan 2022 13:21:13 -0600 Subject: [PATCH 642/685] =?UTF-8?q?mypy:=200.931=20=E2=86=92=200.941?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit patch was rebased (solved 1 conflict) --- pkgs/development/python-modules/mypy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 5c5e985641f..937c9587172 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -14,22 +14,22 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.931"; + version = "0.941"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python"; repo = "mypy"; rev = "v${version}"; - sha256 = "1v83flrdxh8grcp40qw04q4hzjflih9xwib64078vsxv2w36f817"; + hash = "sha256-H2SWJA0WWyKV7/5miFawv4JRXu/J7H6Wer1eBL+Tru0="; }; patches = [ # FIXME: Remove patch after upstream has decided the proper solution. # https://github.com/python/mypy/pull/11143 (fetchpatch { - url = "https://github.com/python/mypy/commit/f1755259d54330cd087cae763cd5bbbff26e3e8a.patch"; - sha256 = "sha256-5gPahX2X6+/qUaqDQIGJGvh9lQ2EDtks2cpQutgbOHk="; + url = "https://github.com/python/mypy/commit/e7869f05751561958b946b562093397027f6d5fa.patch"; + hash = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM="; }) ]; From 0d198e7a52c71db7b607bbcab91b3b28f7786587 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 18 Mar 2022 16:22:38 +0100 Subject: [PATCH 643/685] nixos/nix-daemon: workaround NixOS/nix#6285 The Nix-provided `nix-daemon.socket` file has a > ConditionPathIsReadWrite=/nix/var/nix/daemon-socket/socket line, to skip that unit if /nix/var/nix/daemon-socket/socket is read-only (which is the case in some nixos-containers with that folder bind-ro-mounted from the host). In these cases, the unit was skipped. Systemd 250 (rightfully) started to also skip in these cases: > [ 237.187747] systemd[1]: Nix Daemon Socket was skipped because of a failed condition check (ConditionPathIsReadWrite=/nix/var/nix/daemon-socket). However, systemd < 250 didn't skip if /nix/var/nix/daemon-socket/socket didn't /exist at all/, and we were relying on this bug in the case for fresh NixOS systems, to have /nix/var/nix/daemon-socket/socket created initially. Move the creation of that folder to systemd-tmpfiles, by shipping an appropriate file in `${nixPackage}/lib/tmpfiles.d/nix-daemon.conf` (NixOS/nix#6285). In the meantime, set a systemd tmpfiles rule manually in NixOS. This has been tested to still work with read-only bind-mounted /nix/var/nix/daemon-socket/socket in containers, it'll keep them read-only ;-) --- nixos/modules/services/misc/nix-daemon.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 2b21df91b82..0c3435ce70b 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -708,6 +708,14 @@ in systemd.packages = [ nixPackage ]; + # Will only work once https://github.com/NixOS/nix/pull/6285 is merged + # systemd.tmpfiles.packages = [ nixPackage ]; + + # Can be dropped for Nix > https://github.com/NixOS/nix/pull/6285 + systemd.tmpfiles.rules = [ + "d /nix/var/nix/daemon-socket 0755 root root - -" + ]; + systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; systemd.services.nix-daemon = From 462ce69a743584f81a4d2b2763f82abf9b82a9fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Mon, 21 Mar 2022 14:29:58 -0300 Subject: [PATCH 644/685] kde/frameworks: 5.91 -> 5.92 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index cb4e4cc2629..1e2e36d6784 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.91/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.92/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 2b3983a892c..1cddd857dda 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/attica-5.91.0.tar.xz"; - sha256 = "0svvy7qflidwxns12y2lra54gg6lhglcddzmrw7ccvbdyqcy2pn0"; - name = "attica-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/attica-5.92.0.tar.xz"; + sha256 = "0cy9dd8kazfkhas87bxjj5smmzay3gvkjwsmy6gvkfxc6rvpqr5z"; + name = "attica-5.92.0.tar.xz"; }; }; baloo = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/baloo-5.91.0.tar.xz"; - sha256 = "1cqjbaiwqba707xaz9zsrdz9cms2mdrhv6jpwsq8q7f4g4rxcx3m"; - name = "baloo-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/baloo-5.92.0.tar.xz"; + sha256 = "0xd4a0p22gjm523ymlyd5nfgp8z3ayb0nq6a04h5py507mc70d98"; + name = "baloo-5.92.0.tar.xz"; }; }; bluez-qt = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/bluez-qt-5.91.0.tar.xz"; - sha256 = "0p37jrmppwahh4vaq3wkw6xn0ms8dxcxpfd4glzjlnw426zrwnjr"; - name = "bluez-qt-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/bluez-qt-5.92.0.tar.xz"; + sha256 = "1dlasb39kqrcql6hq0sl74ax3n5bdcy3pkhvc9vwpf9dxn1j93gm"; + name = "bluez-qt-5.92.0.tar.xz"; }; }; breeze-icons = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/breeze-icons-5.91.0.tar.xz"; - sha256 = "0aj24gn48c17n9jzrj0az04ph4hpx7zf2rj4vgwl19iip69vfzf1"; - name = "breeze-icons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/breeze-icons-5.92.0.tar.xz"; + sha256 = "0rj30r52ca6njx00gmmni4k70yn8873ihxfbc66lklwzk1irdq29"; + name = "breeze-icons-5.92.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/extra-cmake-modules-5.91.0.tar.xz"; - sha256 = "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp"; - name = "extra-cmake-modules-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/extra-cmake-modules-5.92.0.tar.xz"; + sha256 = "1vq3sd4qfr4hjcgqyfpykcz5wyagbfvrd4p24pdki1zjqn5j76pq"; + name = "extra-cmake-modules-5.92.0.tar.xz"; }; }; frameworkintegration = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/frameworkintegration-5.91.0.tar.xz"; - sha256 = "1176ql8f96ap4gzjaj8vm4cr6f2rsx9z93gpc4hx4jcqjhxqrg3z"; - name = "frameworkintegration-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/frameworkintegration-5.92.0.tar.xz"; + sha256 = "0pgcwfxxzvfvqyjfgqzsllzfy9il4y8xr8dzdyjmd5vccpvgd3mx"; + name = "frameworkintegration-5.92.0.tar.xz"; }; }; kactivities = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kactivities-5.91.0.tar.xz"; - sha256 = "03y4hx7jgrhac12ys8pm22h0f49kms8b71gck4xv577p3ywi3j60"; - name = "kactivities-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kactivities-5.92.0.tar.xz"; + sha256 = "1kfvg23gdl4k6azs6700j8i8ncl8c7rrc70w1i2xhphz27ybc1pw"; + name = "kactivities-5.92.0.tar.xz"; }; }; kactivities-stats = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kactivities-stats-5.91.0.tar.xz"; - sha256 = "0864qfljh20723djfzdv8h6nipw01825lhiknyqz17aj2x2ymzcq"; - name = "kactivities-stats-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kactivities-stats-5.92.0.tar.xz"; + sha256 = "0lgp7zxgjmjm02x4mydlv6ivmlxqjkklav5vfwgjgf6v1qp161i2"; + name = "kactivities-stats-5.92.0.tar.xz"; }; }; kapidox = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kapidox-5.91.0.tar.xz"; - sha256 = "1xxpl8rn49d2cr7ld94j3wsg21019l2kq14p5bvilisnj3salka3"; - name = "kapidox-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kapidox-5.92.0.tar.xz"; + sha256 = "0vd5k4wmmawbhyy3cxj0gjidf4haghwbsbly9yr3zg3qb3g02ljg"; + name = "kapidox-5.92.0.tar.xz"; }; }; karchive = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/karchive-5.91.0.tar.xz"; - sha256 = "1kjc47zzdd9jhcmynq6zw6y6zaj2c1i8pxvszx3d9x5asaz2qq53"; - name = "karchive-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/karchive-5.92.0.tar.xz"; + sha256 = "1blzm6vf8kpflam4671r1y4svrsb79bglln7aia7baqh7a6a4xjh"; + name = "karchive-5.92.0.tar.xz"; }; }; kauth = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kauth-5.91.0.tar.xz"; - sha256 = "001svdyvs8qc6h8zkb9x072npkz6xabz6j0djjb380gl9h9wnrgq"; - name = "kauth-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kauth-5.92.0.tar.xz"; + sha256 = "0a27z9xr5ccxfcxmx93vs4hgxc388nsd9ac906mdh475ivv4p0j4"; + name = "kauth-5.92.0.tar.xz"; }; }; kbookmarks = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kbookmarks-5.91.0.tar.xz"; - sha256 = "0iqfngsvpbgxk6h8l68idcp97df28sa2zwj707zs0mf2bl9k68m4"; - name = "kbookmarks-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kbookmarks-5.92.0.tar.xz"; + sha256 = "0hym3558xnp3h7q8kf1ljcy65r3g37mcmqb1ll3nxd912rv4wl4r"; + name = "kbookmarks-5.92.0.tar.xz"; }; }; kcalendarcore = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcalendarcore-5.91.0.tar.xz"; - sha256 = "0gkn0mzk3za86pjrpi8gd9d71bfv0ihzkgn8yy1ik3dw1rf9gxip"; - name = "kcalendarcore-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kcalendarcore-5.92.0.tar.xz"; + sha256 = "0fhbas8i7i08z4x32yq49admiz8vk4h9vwgkh7qy14lbzf6ydwkg"; + name = "kcalendarcore-5.92.0.tar.xz"; }; }; kcmutils = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcmutils-5.91.0.tar.xz"; - sha256 = "009r9r7fz1588g2cnqw585d2fz170x8j8bip1zqr7i4jl21ms68s"; - name = "kcmutils-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kcmutils-5.92.0.tar.xz"; + sha256 = "0fldpkhq4ysma4m6qylr7kqvxw0rb11x5abz5921bhl5zicfcjfx"; + name = "kcmutils-5.92.0.tar.xz"; }; }; kcodecs = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcodecs-5.91.0.tar.xz"; - sha256 = "0qkwvbp4vp3w57f3fyjknxd66qac77hl77mf042c7jxjl5vq7h1y"; - name = "kcodecs-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kcodecs-5.92.0.tar.xz"; + sha256 = "0xfjc0diljx081as3b500awybay9l3sfl59792h5z3clafjbgrfn"; + name = "kcodecs-5.92.0.tar.xz"; }; }; kcompletion = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcompletion-5.91.0.tar.xz"; - sha256 = "1l6z85a4rh3vrf4x5g3pqvp0q36gwmw0fbp9ny1iaqyy21dlh8i4"; - name = "kcompletion-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kcompletion-5.92.0.tar.xz"; + sha256 = "1svwvj9jxkgcddfdila10ggdmsabs22vnhf9k7isp2zfdif55w88"; + name = "kcompletion-5.92.0.tar.xz"; }; }; kconfig = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kconfig-5.91.0.tar.xz"; - sha256 = "0axdnqipa8xgx864zylxllnzchlp50q59bbfw3c98svvvkm3yg56"; - name = "kconfig-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kconfig-5.92.0.tar.xz"; + sha256 = "08q57f3wxj22d485s0ph53p44yrkjb376817470a0s43p10vc0bq"; + name = "kconfig-5.92.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kconfigwidgets-5.91.0.tar.xz"; - sha256 = "01mvv01hv64wadjh8xk3hhp1vbs04cvbrjpfl1g9cv2sa6hr7102"; - name = "kconfigwidgets-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kconfigwidgets-5.92.0.tar.xz"; + sha256 = "0ji799xd45lpnd70a9bizicfz2bsmlxq6r0fqgn0ghwsbp9ywna2"; + name = "kconfigwidgets-5.92.0.tar.xz"; }; }; kcontacts = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcontacts-5.91.0.tar.xz"; - sha256 = "1c839c9rvys3jwmi3fzw06r1nhgvrb4z8sdh8gda0w03vqh7h1hv"; - name = "kcontacts-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kcontacts-5.92.0.tar.xz"; + sha256 = "1kik4pvy8snvj6rsc9pfbcpc8rrcn0k4pjj1h9m221zma1p00xhj"; + name = "kcontacts-5.92.0.tar.xz"; }; }; kcoreaddons = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcoreaddons-5.91.0.tar.xz"; - sha256 = "16vimllvcs6rnb1ccbv9zg8hxbzacisgrlffyvwm608f4q1xmqyz"; - name = "kcoreaddons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kcoreaddons-5.92.0.tar.xz"; + sha256 = "0rv63byrxwf9zdpx347rxybpk2j9yyjqm323j60vb8ja6a7p2pyz"; + name = "kcoreaddons-5.92.0.tar.xz"; }; }; kcrash = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kcrash-5.91.0.tar.xz"; - sha256 = "0gdknmp5a36ipvzms4jhxywyxpjh0vy26861c54jfsk13yircjal"; - name = "kcrash-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kcrash-5.92.0.tar.xz"; + sha256 = "1ir64mlv49vh3vz81r22q3sx0fichiwjr8qw5jf5vx96a1dn1icv"; + name = "kcrash-5.92.0.tar.xz"; }; }; kdav = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdav-5.91.0.tar.xz"; - sha256 = "026w3bk2lmc7lqzra8w9jq8i2l1hvqsxz36r1jzj9p01skhdm32v"; - name = "kdav-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kdav-5.92.0.tar.xz"; + sha256 = "1i5i6bkjairz1slk3fhrxd3s8wkcdaqg55jg2bv86kqh7d3nrcgk"; + name = "kdav-5.92.0.tar.xz"; }; }; kdbusaddons = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdbusaddons-5.91.0.tar.xz"; - sha256 = "18qhpj0s4abypkb8ix2d84wv1kqv6qxyblninn2f9hjkl2dnlwis"; - name = "kdbusaddons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kdbusaddons-5.92.0.tar.xz"; + sha256 = "0m5fd396xi3dhc45zwxjrrxr2bhlrc8g8m7n17jq1ylzqhyg60vw"; + name = "kdbusaddons-5.92.0.tar.xz"; }; }; kdeclarative = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdeclarative-5.91.0.tar.xz"; - sha256 = "183df5c0xyjqsip0izqvvk4wy2bjb973900s1wqsldhhvc7gpf7z"; - name = "kdeclarative-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kdeclarative-5.92.0.tar.xz"; + sha256 = "1cymh8clcajk9cl6r443cpqk6vmp4x12ngc6wgp08z53zrvlv5py"; + name = "kdeclarative-5.92.0.tar.xz"; }; }; kded = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kded-5.91.0.tar.xz"; - sha256 = "1zi0sixlzaxvw4lfil2r36i3xrav3vfwxp2r1lp4n65dpl7nv7p5"; - name = "kded-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kded-5.92.0.tar.xz"; + sha256 = "0v0fak84nw4lb4qc1irb9sn5nh5k7qrhnfav5smn3cvchldm6dc3"; + name = "kded-5.92.0.tar.xz"; }; }; kdelibs4support = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kdelibs4support-5.91.0.tar.xz"; - sha256 = "1373fi9vi7ki8frr0lsw6yp335i95v8yq2j41s7ip003dpy4hr2g"; - name = "kdelibs4support-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/kdelibs4support-5.92.0.tar.xz"; + sha256 = "1q7d0i09klkhsiwq7i91ypxakdr5b841zdb60q7yjzcdmn25wbi9"; + name = "kdelibs4support-5.92.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kdesignerplugin-5.91.0.tar.xz"; - sha256 = "07lvvryc3k418hd0j7ddlqhid26c51isa8mvk7g6gd0v2x3gp76q"; - name = "kdesignerplugin-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/kdesignerplugin-5.92.0.tar.xz"; + sha256 = "0kial8k6qr39871v103952d0qcs0hm25y6k0vdg4y8ns8nrmjs06"; + name = "kdesignerplugin-5.92.0.tar.xz"; }; }; kdesu = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdesu-5.91.0.tar.xz"; - sha256 = "1wj099w810dabqn43pqis4sism3zwq3d1qa9mvcdyjafqbl7xnjm"; - name = "kdesu-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kdesu-5.92.0.tar.xz"; + sha256 = "1yjyz4v0gn7ys7zy4ymn47zggxxmgd37big005c6g85dm63xr1s6"; + name = "kdesu-5.92.0.tar.xz"; }; }; kdewebkit = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kdewebkit-5.91.0.tar.xz"; - sha256 = "1mln0w1dzrbpm373vfpcyss4xxnrfgwh9nhzr8wmzs8965bn3wqq"; - name = "kdewebkit-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/kdewebkit-5.92.0.tar.xz"; + sha256 = "1dni134qbs5yff7zgk4n3sfjwblzarblg16rj35l59l6mly7f2jd"; + name = "kdewebkit-5.92.0.tar.xz"; }; }; kdnssd = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdnssd-5.91.0.tar.xz"; - sha256 = "1smzwh7lvz8g7vydxnd2kkh0ymg7yp6akc7k2vg8q65pa6pxqn3g"; - name = "kdnssd-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kdnssd-5.92.0.tar.xz"; + sha256 = "1m24v36pphy591z1xp90i0yxv70c62iinvy4gspdi15bz94sydjz"; + name = "kdnssd-5.92.0.tar.xz"; }; }; kdoctools = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kdoctools-5.91.0.tar.xz"; - sha256 = "02lr4l4n5gnv7ffzml8lbrdwgfpq6m7ayhz3bdqqijdfvw6h283n"; - name = "kdoctools-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kdoctools-5.92.0.tar.xz"; + sha256 = "0w08fa8rl0dhp59lv6xcvypahl6pxda6cr0vv0f0xv0xp6wax8w6"; + name = "kdoctools-5.92.0.tar.xz"; }; }; kemoticons = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kemoticons-5.91.0.tar.xz"; - sha256 = "1jznkiq87rkndv10xs6974b5k0v82ly32agy5acxc2xy9wq7la0h"; - name = "kemoticons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kemoticons-5.92.0.tar.xz"; + sha256 = "01wzy3mwfz4sqpq8i1hfbbymajp55axryiaqkfr9r2n1844y7kzx"; + name = "kemoticons-5.92.0.tar.xz"; }; }; kfilemetadata = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kfilemetadata-5.91.0.tar.xz"; - sha256 = "1z030irzcvmjq329nwfk3h8cd51dwy9mppnwbgcd0lw6y3bka0rq"; - name = "kfilemetadata-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kfilemetadata-5.92.0.tar.xz"; + sha256 = "1khmx9kd1jhd6j7rmfww3vmyjz2pg36mpsdn0bc77kwl21ax696n"; + name = "kfilemetadata-5.92.0.tar.xz"; }; }; kglobalaccel = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kglobalaccel-5.91.0.tar.xz"; - sha256 = "09wscg6f19sh314ywpxp47pdr1xf1wzpjchg9rcjg207zrfhqqf0"; - name = "kglobalaccel-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kglobalaccel-5.92.0.tar.xz"; + sha256 = "0lhlb274pvv7rpkcsccqbv81bh8iklanp29g0k28wrv3kckiwyxy"; + name = "kglobalaccel-5.92.0.tar.xz"; }; }; kguiaddons = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kguiaddons-5.91.0.tar.xz"; - sha256 = "0gn8lvpm4i11s5vavlpm162bizjkmh5cb4dhj3p34dlp4vcc4mky"; - name = "kguiaddons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kguiaddons-5.92.0.tar.xz"; + sha256 = "0pyzgyrglvz2m11b82rycs9fbmzpfgzabnjkvsq00agjcnjparqg"; + name = "kguiaddons-5.92.0.tar.xz"; }; }; kholidays = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kholidays-5.91.0.tar.xz"; - sha256 = "165vfmi5y8l00ng494469w5s1gjnf9zkggqrzmq65dfkdis3amdm"; - name = "kholidays-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kholidays-5.92.0.tar.xz"; + sha256 = "042bdg46hkpg66vdp9gk13wck5yhks8s6i9qz9xzh2mikz285lqf"; + name = "kholidays-5.92.0.tar.xz"; }; }; khtml = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/khtml-5.91.0.tar.xz"; - sha256 = "1ldkk1f954mmgz30vqa895z1nw2jaknnb53lsd5vqxzxi3cmc054"; - name = "khtml-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/khtml-5.92.0.tar.xz"; + sha256 = "06hpjcm5yrfj1056vvv9dklccd0a1y09zm8ch4a5d8l2lfgdg8ci"; + name = "khtml-5.92.0.tar.xz"; }; }; ki18n = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/ki18n-5.91.0.tar.xz"; - sha256 = "11gdd2gvzsz3r8zvqbxxwbpwjvjwnzzhzyrd4spbpdy0w7j8n6ly"; - name = "ki18n-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/ki18n-5.92.0.tar.xz"; + sha256 = "0xsp77iaxf72i0ri3pb6x5rrdz3cv8rxcaqcrynisvsmx7l35005"; + name = "ki18n-5.92.0.tar.xz"; }; }; kiconthemes = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kiconthemes-5.91.0.tar.xz"; - sha256 = "1khh4ngivwdj9rxxcpx08ka8anskc9i1z9n2zijp4m5ix8mmj3c2"; - name = "kiconthemes-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kiconthemes-5.92.0.tar.xz"; + sha256 = "08yb6f980p620dfklfiyp83lcsqw4dds9qwzd6xpn2mzz07p2a11"; + name = "kiconthemes-5.92.0.tar.xz"; }; }; kidletime = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kidletime-5.91.0.tar.xz"; - sha256 = "12qmiwc8p3izj1y5h0rndj2s496ckm1p85dv4g51zbpg7m8a48qv"; - name = "kidletime-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kidletime-5.92.0.tar.xz"; + sha256 = "1mw0jarqv2ypxwgf4qaxqlw0sijw0is36sasrfz8grbykwi18bz1"; + name = "kidletime-5.92.0.tar.xz"; }; }; kimageformats = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kimageformats-5.91.0.tar.xz"; - sha256 = "0df8in33xwajqay487w0hjfsplz8y51w9sjb75na7yqsn75p38xb"; - name = "kimageformats-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kimageformats-5.92.0.tar.xz"; + sha256 = "0sd3xhqh3zgy4jq8fc1llqjrxizylbsz58njz2dxqjas2a4rj16f"; + name = "kimageformats-5.92.0.tar.xz"; }; }; kinit = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kinit-5.91.0.tar.xz"; - sha256 = "1y62k24mwzbg4gchvjb8wn6ygq57wc72clb3jgyipw034czdihvi"; - name = "kinit-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kinit-5.92.0.tar.xz"; + sha256 = "1kpkqnq9krxlzhripwjhw3n55p5sxqsvj6nb2pqb9m0ppw97jlfb"; + name = "kinit-5.92.0.tar.xz"; }; }; kio = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kio-5.91.0.tar.xz"; - sha256 = "14v28qilb5ayv9shw86hb88k60nr4bbd2pa4vwsqij9xkwlympgj"; - name = "kio-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kio-5.92.0.tar.xz"; + sha256 = "1cscsjb2v0zygzazfhcflc3gb5ny1a79g3i6glyzw6ppj2c3yhyl"; + name = "kio-5.92.0.tar.xz"; }; }; kirigami2 = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kirigami2-5.91.0.tar.xz"; - sha256 = "0ifljwa6hli2rndfadpzs30dpwc99nnvcm3yi9j5dim2bdf6glwc"; - name = "kirigami2-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kirigami2-5.92.0.tar.xz"; + sha256 = "0p1x40p38pr9rvzwil57asgsaa95qpjqi9npwv4pgibhxacgznha"; + name = "kirigami2-5.92.0.tar.xz"; }; }; kitemmodels = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kitemmodels-5.91.0.tar.xz"; - sha256 = "189kgrw2vjr9067mqr4f2sv06xmnjaapry0bf8s41v6r9v7py708"; - name = "kitemmodels-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kitemmodels-5.92.0.tar.xz"; + sha256 = "16z8m11cyrapf6m56gmpjmvcgan7s50si8rl1cbbid02src7yp76"; + name = "kitemmodels-5.92.0.tar.xz"; }; }; kitemviews = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kitemviews-5.91.0.tar.xz"; - sha256 = "16cm4zmv1ngrsmy6k0ybv5wxd0g8cc8zwq6ab7jvs7a04sykv238"; - name = "kitemviews-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kitemviews-5.92.0.tar.xz"; + sha256 = "1ml6i1km22xsprldkzmngfh9xs5vdhlfvc6f7aq5hx9q5114v2q5"; + name = "kitemviews-5.92.0.tar.xz"; }; }; kjobwidgets = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kjobwidgets-5.91.0.tar.xz"; - sha256 = "14pkyd6j78kignr62xfkvpyi2fwvzcvcsdnn23h8jxkhwm2ri42v"; - name = "kjobwidgets-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kjobwidgets-5.92.0.tar.xz"; + sha256 = "09l5zgr5mn29v410ng5rccdg2bki9r6cb8y2lrijzgfxfxpvj96z"; + name = "kjobwidgets-5.92.0.tar.xz"; }; }; kjs = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kjs-5.91.0.tar.xz"; - sha256 = "0jbwlnmf8whzgjkrbnsvdsnn3kv0h44ghf63m2qcgg2l9wb0j8rj"; - name = "kjs-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/kjs-5.92.0.tar.xz"; + sha256 = "067ilsm78x03kf5fs2xmlasvy2712k0xrsa404g2zj81fm92s1q4"; + name = "kjs-5.92.0.tar.xz"; }; }; kjsembed = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kjsembed-5.91.0.tar.xz"; - sha256 = "124y7518jhjg3y2x7bcyl6b3c0bfxfbgd2sz6dwk45y4byx7rl60"; - name = "kjsembed-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/kjsembed-5.92.0.tar.xz"; + sha256 = "0db0r8v0bhp3razwyvmvk9r4psl14vgn23c4cm2q1b5pl0w6bhnp"; + name = "kjsembed-5.92.0.tar.xz"; }; }; kmediaplayer = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kmediaplayer-5.91.0.tar.xz"; - sha256 = "0rn9azrj8k1m67y9ni0f3nwl9ldf1ksiqv6dgnzrx6xh0rxfm2h1"; - name = "kmediaplayer-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/kmediaplayer-5.92.0.tar.xz"; + sha256 = "19lpib2wj91w8shsf9056nwi46qja8nh96hj164ydqlkslpfnf7y"; + name = "kmediaplayer-5.92.0.tar.xz"; }; }; knewstuff = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/knewstuff-5.91.0.tar.xz"; - sha256 = "0akaxi9klmpwn4pyr6ys5sxcapdspldq1f64im7vd6byzqrgpnax"; - name = "knewstuff-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/knewstuff-5.92.0.tar.xz"; + sha256 = "0gvclv1a6xyrqa24svb56kp9zf2wi98as3q30lnwf0bpbpjsw52b"; + name = "knewstuff-5.92.0.tar.xz"; }; }; knotifications = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/knotifications-5.91.0.tar.xz"; - sha256 = "1207rimq8si1zxnn827631a1hskrd3m3ilgaj3wj859qrbkqmxzm"; - name = "knotifications-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/knotifications-5.92.0.tar.xz"; + sha256 = "1dwlx8w810l0cvy72mj52saf4x7i9p3xpqpjx4chy54n7mg0jklc"; + name = "knotifications-5.92.0.tar.xz"; }; }; knotifyconfig = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/knotifyconfig-5.91.0.tar.xz"; - sha256 = "07m5mphd8mrak5sdqlldbcd51946v49xpcwi9fhn7w0kx29hknyf"; - name = "knotifyconfig-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/knotifyconfig-5.92.0.tar.xz"; + sha256 = "0fii74r0ap3n08lp9kj7pki0msqjsia2jnmavyps51kq37im5x7p"; + name = "knotifyconfig-5.92.0.tar.xz"; }; }; kpackage = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kpackage-5.91.0.tar.xz"; - sha256 = "12w8lfwifa107wlrld3zz774hczn9mkib6wqxw24yxxmzfw9lc2i"; - name = "kpackage-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kpackage-5.92.0.tar.xz"; + sha256 = "1av6v0629a8yi0wpl7xgyd0gsn5gi228abdlvbk4dzrx9vxpa7rn"; + name = "kpackage-5.92.0.tar.xz"; }; }; kparts = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kparts-5.91.0.tar.xz"; - sha256 = "10ni6b114acjnmrahvvqw75iqkc10ii97y3z7lirj2727a3qmzzj"; - name = "kparts-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kparts-5.92.0.tar.xz"; + sha256 = "061kzss4b0bw67j3mc8h36mbaji077k3alk2ghcir7qix6r1hkh9"; + name = "kparts-5.92.0.tar.xz"; }; }; kpeople = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kpeople-5.91.0.tar.xz"; - sha256 = "09l2q8cg9p8g7zkd1mjx6x08bqkr4ykxjibskc184asff7v47gvp"; - name = "kpeople-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kpeople-5.92.0.tar.xz"; + sha256 = "0wf555pqiannxb115mlbl43ds1365im95vadsbzv1gdz668p44xk"; + name = "kpeople-5.92.0.tar.xz"; }; }; kplotting = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kplotting-5.91.0.tar.xz"; - sha256 = "0rgmmliw9cfi0j2miszqz2kphqm04r5nfs8dqq6pnvclk1k9kss6"; - name = "kplotting-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kplotting-5.92.0.tar.xz"; + sha256 = "1l8y0xlwjyv1l4g0mag4bgf906jc654ygky1bribzay4wki66pf9"; + name = "kplotting-5.92.0.tar.xz"; }; }; kpty = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kpty-5.91.0.tar.xz"; - sha256 = "1yy1k96kikvvnlyd00krc08ifiqbrz0x5vwv3pgdbpnwgl8p580d"; - name = "kpty-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kpty-5.92.0.tar.xz"; + sha256 = "0lp0bqlg1i0a5vl6gvvkngbsha8ab38z6b3sjvpmk83vixgsq7fb"; + name = "kpty-5.92.0.tar.xz"; }; }; kquickcharts = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kquickcharts-5.91.0.tar.xz"; - sha256 = "1ghiymm257b8xgmkibb7s7bwb28x3zhnrgrrsya47q5njb87h0ck"; - name = "kquickcharts-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kquickcharts-5.92.0.tar.xz"; + sha256 = "0y467vqx2r6dcyqwn6p7hbg4q7n0xdh4lcqwyin4cdxi14lhwhqs"; + name = "kquickcharts-5.92.0.tar.xz"; }; }; kross = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kross-5.91.0.tar.xz"; - sha256 = "06f8220jmvjsfbzjkr2ybwicwjffbi3yw9sr3bcyrilchrrpgqal"; - name = "kross-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/kross-5.92.0.tar.xz"; + sha256 = "1gqy1h5mqsfgbpqkdrhs7xf77kw4yy19mryda1fwjcqzxd02i7hj"; + name = "kross-5.92.0.tar.xz"; }; }; krunner = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/krunner-5.91.0.tar.xz"; - sha256 = "17iaw55rkzyfpgkbw2an6pa4wid79b0dnb3310vfaq0xkm0gjxq6"; - name = "krunner-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/krunner-5.92.0.tar.xz"; + sha256 = "1vcgqjyx9i8k9q4j6q9p4f7sp76aap8gqn2v269lb7imcrfhrj1z"; + name = "krunner-5.92.0.tar.xz"; }; }; kservice = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kservice-5.91.0.tar.xz"; - sha256 = "0m4j7djiyapi1hm23lz9nd238rrlldxlggzkqq056z486v2137bp"; - name = "kservice-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kservice-5.92.0.tar.xz"; + sha256 = "1y1fr1galhhi6yf9w9qcvkp1zb63ifvr4wb43jwpvpms9djxkqjj"; + name = "kservice-5.92.0.tar.xz"; }; }; ktexteditor = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/ktexteditor-5.91.0.tar.xz"; - sha256 = "1bkz6v1y5vyxav398a6224ldqa9pqhbad3vmhxrjb2hxcbha2cpm"; - name = "ktexteditor-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/ktexteditor-5.92.0.tar.xz"; + sha256 = "137v8g7j8kkv9yh30ysmm5n6imyyd3jmd0f6w5ni00kxl0y1rl5w"; + name = "ktexteditor-5.92.0.tar.xz"; }; }; ktextwidgets = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/ktextwidgets-5.91.0.tar.xz"; - sha256 = "0xmzrak5mwg1l4v38g14i7j1yr3j6sj13q2iqa433hs5agl6l6n4"; - name = "ktextwidgets-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/ktextwidgets-5.92.0.tar.xz"; + sha256 = "030bz67n6m3fkbldnr48mzicm9cgnr9gdpwipaghl5x5k3s7p1py"; + name = "ktextwidgets-5.92.0.tar.xz"; }; }; kunitconversion = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kunitconversion-5.91.0.tar.xz"; - sha256 = "0n2v0f08s71z2imhn41jkm2knjvk7bkwmcz70gs8h97ykrj6niap"; - name = "kunitconversion-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kunitconversion-5.92.0.tar.xz"; + sha256 = "17ph75rg3y652ii0yxm9s8xrbpjs9pdfsrsajm220mi9ng2b9qj7"; + name = "kunitconversion-5.92.0.tar.xz"; }; }; kwallet = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kwallet-5.91.0.tar.xz"; - sha256 = "1z1qb6a2b5rqj7js88ms8n67fbs885pw6djbf1l86na2zhf0adip"; - name = "kwallet-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kwallet-5.92.0.tar.xz"; + sha256 = "1ra0cxw70vb6pks8sqw5k895rnrfzwxhg6vh4yc5dgzdn1nagb3i"; + name = "kwallet-5.92.0.tar.xz"; }; }; kwayland = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kwayland-5.91.0.tar.xz"; - sha256 = "1a03ckacp39lpsqyykkm6lxajxm71s6ifpzgj8q0a37v75jzmz9y"; - name = "kwayland-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kwayland-5.92.0.tar.xz"; + sha256 = "15fizsbdl6psmi24fvpfk9dvh61q07irzavpkl961qp4zg79gq4m"; + name = "kwayland-5.92.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kwidgetsaddons-5.91.0.tar.xz"; - sha256 = "03pj98sgybkcz487vr774x05w46imnipq2794nkv426nnhyxrd73"; - name = "kwidgetsaddons-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kwidgetsaddons-5.92.0.tar.xz"; + sha256 = "0b0z24j162j39zfycl5al69xcqgdsr96p7ii3prm1mbyda6mbqyh"; + name = "kwidgetsaddons-5.92.0.tar.xz"; }; }; kwindowsystem = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kwindowsystem-5.91.0.tar.xz"; - sha256 = "1yy02fvfabrsvdpmrkdnjdsdd3d2crxavsl47si6ry8fdxb90y95"; - name = "kwindowsystem-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kwindowsystem-5.92.0.tar.xz"; + sha256 = "103xvhzlggi05k16s9kssy7g5a74k9yildj1a4igqwi39wmvvnyw"; + name = "kwindowsystem-5.92.0.tar.xz"; }; }; kxmlgui = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/kxmlgui-5.91.0.tar.xz"; - sha256 = "1qww2isx99lx0mn1dv0vzrvmr2xdp8zgikyvgw1wf8hfay3v2s1g"; - name = "kxmlgui-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/kxmlgui-5.92.0.tar.xz"; + sha256 = "0hxpjyjr77q2gyi3hg13119aza3634rvmllbj66pi7y37h6lr2z0"; + name = "kxmlgui-5.92.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/portingAids/kxmlrpcclient-5.91.0.tar.xz"; - sha256 = "1bnymf5wq4apjsgshvbhcggdw7jc0yxv4jag3k19ff9820lskhph"; - name = "kxmlrpcclient-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/portingAids/kxmlrpcclient-5.92.0.tar.xz"; + sha256 = "1axy34g5ahd1c3qg7ab7h786jibpaj4dvj45x50x5czq06idqchf"; + name = "kxmlrpcclient-5.92.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/modemmanager-qt-5.91.0.tar.xz"; - sha256 = "15l46lkh8nkal1nai494dabaysy581jzi8nwrv4kjvc6qwc3yrx2"; - name = "modemmanager-qt-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/modemmanager-qt-5.92.0.tar.xz"; + sha256 = "162qzq1aqv2l3bi0r01xrfan20r1zhaaqih4dqbaj7vqibsb9l3y"; + name = "modemmanager-qt-5.92.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/networkmanager-qt-5.91.0.tar.xz"; - sha256 = "0f27qin2ks3q7rin53sk9vjjnadjnax99d9k245sjr6fjpczy81f"; - name = "networkmanager-qt-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/networkmanager-qt-5.92.0.tar.xz"; + sha256 = "0r7s3fw9fk3pkrzrl1bxsmkf1qbgv3p0jrsskp28f3561vncipai"; + name = "networkmanager-qt-5.92.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/oxygen-icons5-5.91.0.tar.xz"; - sha256 = "0j3j2lyxr2iz68vasvpjqkix4bnnj6wc4sr97i6x6z06zq0kawai"; - name = "oxygen-icons5-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/oxygen-icons5-5.92.0.tar.xz"; + sha256 = "1wcy8bv4d6jns7vaisbvjc8nxriw9vkiz7j4za5ry7wnvlzv126a"; + name = "oxygen-icons5-5.92.0.tar.xz"; }; }; plasma-framework = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/plasma-framework-5.91.0.tar.xz"; - sha256 = "0ydhhpnwf7lfl3kdjsw92mgsza5gy292f7v6kyby4ygjnir1hizl"; - name = "plasma-framework-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/plasma-framework-5.92.0.tar.xz"; + sha256 = "1xq66lyagjsgfashhqgqgqhda0rqfqf0l5yf1gc4ziv48mibrhn6"; + name = "plasma-framework-5.92.0.tar.xz"; }; }; prison = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/prison-5.91.0.tar.xz"; - sha256 = "0k1zp3jzh8gjsji6wh5g8k41zdl8s1vd58ipm0lxy670a71wcqcg"; - name = "prison-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/prison-5.92.0.tar.xz"; + sha256 = "07p47q8sva82hglfzp145a1sajlal8b3qshhkicc9rkbsngywvvy"; + name = "prison-5.92.0.tar.xz"; }; }; purpose = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/purpose-5.91.0.tar.xz"; - sha256 = "1z6wpz7d9byx4n5zx6chmyy9k1jkmghdgahsvkqsc33z6hnh2b4m"; - name = "purpose-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/purpose-5.92.0.tar.xz"; + sha256 = "02j09zf18dwjk17mn841m7cm0qsn7gcz5lff8dad3yah0lc3wqcl"; + name = "purpose-5.92.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/qqc2-desktop-style-5.91.0.tar.xz"; - sha256 = "0rd9rvffhif8yckwr7axjcv5iqn5b0jdviij7f9y8vjpkzyjvm8i"; - name = "qqc2-desktop-style-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/qqc2-desktop-style-5.92.0.tar.xz"; + sha256 = "1b5xr71lan7ixvd1nfxy9wj21h4wwidsaxa192sha1d8p49hhlwp"; + name = "qqc2-desktop-style-5.92.0.tar.xz"; }; }; solid = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/solid-5.91.0.tar.xz"; - sha256 = "1a4k0amyg8mvfr2ld7v8zyphhxv33yybh55vqcshwv4a0jm1wmjg"; - name = "solid-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/solid-5.92.0.tar.xz"; + sha256 = "172sid8l1znzxxz0hi5m19yy4vg7l1nbghvzjvh18ssbmxcwh9l9"; + name = "solid-5.92.0.tar.xz"; }; }; sonnet = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/sonnet-5.91.0.tar.xz"; - sha256 = "067xj5mllpzl0gnxxljhfi9y4xdgrpqbckm7pykczzqrklrrx8dx"; - name = "sonnet-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/sonnet-5.92.0.tar.xz"; + sha256 = "08jps1hy0qvk62wnzn50qi8iaay7xav3hbcj55sk70mm7pd1vz1i"; + name = "sonnet-5.92.0.tar.xz"; }; }; syndication = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/syndication-5.91.0.tar.xz"; - sha256 = "1f2kb6mh1xc1k1bn536lq9gq0j2lb65qw4vpp4ixynlfij4zq1gy"; - name = "syndication-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/syndication-5.92.0.tar.xz"; + sha256 = "0ijxpnsygwzzybic5lp8gfq57y84vrp3bq7vdbjh3h0345vvk6hw"; + name = "syndication-5.92.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/syntax-highlighting-5.91.0.tar.xz"; - sha256 = "0fprqi2z8issh3jkql6labszkwd3cpvd6qadsg9fi46vfjr4a2ip"; - name = "syntax-highlighting-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/syntax-highlighting-5.92.0.tar.xz"; + sha256 = "03p5qzf13nbf54gzad3q1q6i33iggz3ik0ydr9szhj92kfppwd4r"; + name = "syntax-highlighting-5.92.0.tar.xz"; }; }; threadweaver = { - version = "5.91.0"; + version = "5.92.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.91/threadweaver-5.91.0.tar.xz"; - sha256 = "1900kqglkwzkjc24mvl0j7jf7xcx6cr6b1g78s5b5m18rw050j12"; - name = "threadweaver-5.91.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.92/threadweaver-5.92.0.tar.xz"; + sha256 = "008in2wbl6zr404m9hbqdvy3d4r06mmb3jrr13myldwljqywzc28"; + name = "threadweaver-5.92.0.tar.xz"; }; }; } From 6788a7d6f548c90a620611071d8467c6a41faf5a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 22 Mar 2022 00:43:01 +0000 Subject: [PATCH 645/685] dav1d: enable tests --- pkgs/development/libraries/dav1d/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 08f73b6b569..180480985ac 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { "-Denable_examples=${lib.boolToString withExamples}" ]; + doCheck = true; + meta = with lib; { description = "A cross-platform AV1 decoder focused on speed and correctness"; longDescription = '' From 1f7cc8a6e17f2434a2d750b9774a1658175a435b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Mar 2022 13:58:51 +0100 Subject: [PATCH 646/685] iana-etc: replace name with pname&version --- pkgs/data/misc/iana-etc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 5e7e70a1b05..cab93d737c3 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,9 +1,8 @@ { lib, fetchzip, stdenvNoCC, writeText }: -let +stdenvNoCC.mkDerivation rec { + pname = "iana-etc"; version = "20211124"; -in stdenvNoCC.mkDerivation { - name = "iana-etc-${version}"; src = fetchzip { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; sha256 = "sha256-4mM/ZeGd91e1AklGHFK5UB4llg9IgCo9DKcM0iXcBls="; From 28683b652e09763e4b87bb8f6fd27d16d0dcd9fc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Mar 2022 14:38:37 +0100 Subject: [PATCH 647/685] hicolor-icon-theme: replace name with pname&version --- pkgs/data/icons/hicolor-icon-theme/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 3a8839844f1..4a58b8fb89a 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hicolor-icon-theme-0.17"; + pname = "hicolor-icon-theme"; + version = "0.17"; src = fetchurl { - url = "https://icon-theme.freedesktop.org/releases/${name}.tar.xz"; + url = "https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-${version}.tar.xz"; sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"; }; From c6dd11ca39ac87899c92b13a743f104c31cadb26 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 9 Mar 2022 18:47:51 +0000 Subject: [PATCH 648/685] Revert "gcc: Always pass `--enable-shared` by default" This reverts commit 8e482321805542e08eaf8819a6ad94ea4ba20370. Since pkgsStatic.stdenv.cc can only produce static binaries, there's no reason to include that compilers e.g. libstdc++.so. --- pkgs/development/compilers/gcc/10/default.nix | 7 +------ pkgs/development/compilers/gcc/11/default.nix | 7 +------ pkgs/development/compilers/gcc/4.8/default.nix | 7 +------ pkgs/development/compilers/gcc/4.9/default.nix | 7 +------ pkgs/development/compilers/gcc/6/default.nix | 7 +------ pkgs/development/compilers/gcc/7/default.nix | 7 +------ pkgs/development/compilers/gcc/8/default.nix | 7 +------ pkgs/development/compilers/gcc/9/default.nix | 7 +------ 8 files changed, 8 insertions(+), 48 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index a26aaf771af..da2726d9090 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -8,12 +8,7 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, # N.B. the defult is intentionally not from an `isStatic`. See - # https://gcc.gnu.org/install/configure.html - this is about target - # platform libraries not host platform ones unlike normal. But since - # we can't rebuild those without also rebuilding the compiler itself, - # we opt to always build everything unlike our usual policy. - enableShared ? true +, enableShared ? !stdenv.targetPlatform.isStatic , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index b78ca339fb8..c9c8e4078d0 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -8,12 +8,7 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, # N.B. the defult is intentionally not from an `isStatic`. See - # https://gcc.gnu.org/install/configure.html - this is about target - # platform libraries not host platform ones unlike normal. But since - # we can't rebuild those without also rebuilding the compiler itself, - # we opt to always build everything unlike our usual policy. - enableShared ? true +, enableShared ? !stdenv.targetPlatform.isStatic , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index bc7868cc460..81e875f3caa 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -8,12 +8,7 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, # N.B. the defult is intentionally not from an `isStatic`. See - # https://gcc.gnu.org/install/configure.html - this is about target - # platform libraries not host platform ones unlike normal. But since - # we can't rebuild those without also rebuilding the compiler itself, - # we opt to always build everything unlike our usual policy. - enableShared ? true +, enableShared ? !stdenv.targetPlatform.isStatic , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index bb1a3dd7d63..1a05ca7a595 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -8,12 +8,7 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, # N.B. the defult is intentionally not from an `isStatic`. See - # https://gcc.gnu.org/install/configure.html - this is about target - # platform libraries not host platform ones unlike normal. But since - # we can't rebuild those without also rebuilding the compiler itself, - # we opt to always build everything unlike our usual policy. - enableShared ? true +, enableShared ? !stdenv.targetPlatform.isStatic , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 7548ec56c75..0cab8e0dfaa 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -9,12 +9,7 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, # N.B. the defult is intentionally not from an `isStatic`. See - # https://gcc.gnu.org/install/configure.html - this is about target - # platform libraries not host platform ones unlike normal. But since - # we can't rebuild those without also rebuilding the compiler itself, - # we opt to always build everything unlike our usual policy. - enableShared ? true +, enableShared ? !stdenv.targetPlatform.isStatic , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , flex diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index dfac97104eb..3f9a7856d07 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -7,12 +7,7 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, # N.B. the defult is intentionally not from an `isStatic`. See - # https://gcc.gnu.org/install/configure.html - this is about target - # platform libraries not host platform ones unlike normal. But since - # we can't rebuild those without also rebuilding the compiler itself, - # we opt to always build everything unlike our usual policy. - enableShared ? true +, enableShared ? !stdenv.targetPlatform.isStatic , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 609dfa722a6..493421d20fe 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -7,12 +7,7 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, # N.B. the defult is intentionally not from an `isStatic`. See - # https://gcc.gnu.org/install/configure.html - this is about target - # platform libraries not host platform ones unlike normal. But since - # we can't rebuild those without also rebuilding the compiler itself, - # we opt to always build everything unlike our usual policy. - enableShared ? true +, enableShared ? !stdenv.targetPlatform.isStatic , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index ea429682666..b9b440cfb6f 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -9,12 +9,7 @@ , profiledCompiler ? false , langJit ? false , staticCompiler ? false -, # N.B. the defult is intentionally not from an `isStatic`. See - # https://gcc.gnu.org/install/configure.html - this is about target - # platform libraries not host platform ones unlike normal. But since - # we can't rebuild those without also rebuilding the compiler itself, - # we opt to always build everything unlike our usual policy. - enableShared ? true +, enableShared ? !stdenv.targetPlatform.isStatic , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) From 12c37aec377d672b0f7e72553283cc796fee2419 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Mar 2022 19:44:32 +0000 Subject: [PATCH 649/685] pkgsStatic.stdenv.cc.cc: put static libs in $lib libtool requires the library files its .la files describe to be in the same directory as those files. We only do this for compilers without shared libraries, so that the libraries in $lib are always the libraries the package set is supposed to use. Fixes: https://github.com/NixOS/nixpkgs/issues/76873 Fixes: https://github.com/NixOS/nixpkgs/issues/108534 --- pkgs/development/compilers/gcc/10/default.nix | 2 +- pkgs/development/compilers/gcc/11/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- pkgs/development/compilers/gcc/8/default.nix | 2 +- pkgs/development/compilers/gcc/9/default.nix | 2 +- pkgs/development/compilers/gcc/builder.sh | 4 ++++ 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index da2726d9090..3a659052b0d 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -261,7 +261,7 @@ stdenv.mkDerivation ({ }; enableParallelBuilding = true; - inherit enableMultilib; + inherit enableMultilib enableShared; inherit (stdenv) is64bit; diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index c9c8e4078d0..79e682e88c4 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -264,7 +264,7 @@ stdenv.mkDerivation ({ }; enableParallelBuilding = true; - inherit enableMultilib; + inherit enableShared enableMultilib; inherit (stdenv) is64bit; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 81e875f3caa..ef1a04635f9 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -290,7 +290,7 @@ stdenv.mkDerivation ({ }; enableParallelBuilding = true; - inherit enableMultilib; + inherit enableShared enableMultilib; inherit (stdenv) is64bit; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 1a05ca7a595..289df07d031 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -306,7 +306,7 @@ stdenv.mkDerivation ({ }; enableParallelBuilding = true; - inherit enableMultilib; + inherit enableShared enableMultilib; inherit (stdenv) is64bit; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 0cab8e0dfaa..5191c3b461b 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -320,7 +320,7 @@ stdenv.mkDerivation ({ }; enableParallelBuilding = true; - inherit enableMultilib; + inherit enableShared enableMultilib; inherit (stdenv) is64bit; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 3f9a7856d07..aa1a8277171 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -272,7 +272,7 @@ stdenv.mkDerivation ({ }; enableParallelBuilding = true; - inherit enableMultilib; + inherit enableShared enableMultilib; inherit (stdenv) is64bit; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 493421d20fe..e9819783695 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -254,7 +254,7 @@ stdenv.mkDerivation ({ }; enableParallelBuilding = true; - inherit enableMultilib; + inherit enableShared enableMultilib; inherit (stdenv) is64bit; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index b9b440cfb6f..8118d2ea613 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -280,7 +280,7 @@ stdenv.mkDerivation ({ }; enableParallelBuilding = true; - inherit enableMultilib; + inherit enableShared enableMultilib; inherit (stdenv) is64bit; diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index e6d41d7b29a..9d0514f1759 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -222,6 +222,10 @@ postInstall() { moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dll.a" "${!outputLib}" moveToOutput "share/gcc-*/python" "${!outputLib}" + if [ -z "$enableShared" ]; then + moveToOutput "${targetConfig+$targetConfig/}lib/lib*.a" "${!outputLib}" + fi + for i in "${!outputLib}/${targetConfig}"/lib/*.{la,py}; do substituteInPlace "$i" --replace "$out" "${!outputLib}" done From 3c7b77e638b55dae5a90d690e320a0876d6e1d7c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 22 Mar 2022 10:29:27 +0000 Subject: [PATCH 650/685] python3.pkgs.importlib-metadata: fix cross I'm a bit confused why this dependency is required only when cross compiling. --- pkgs/development/python-modules/importlib-metadata/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 5a8ef5957a0..31181d9b1af 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools , setuptools-scm , typing-extensions , toml @@ -22,6 +23,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools # otherwise cross build fails setuptools-scm ]; From 56f739973423c00f655192aa1b2559e885c5496a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 06:54:09 +0000 Subject: [PATCH 651/685] btrfs-progs: 5.16.1 -> 5.16.2 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index c51cc12da36..fad1944c4a0 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-PaTaU2HPhr3dqA7bTE8w6gdstOvsKZBPoIr8kw754ag="; + sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I="; }; nativeBuildInputs = [ From cd64f8e8b30e6b1001034d438a16a99828d41cc7 Mon Sep 17 00:00:00 2001 From: milahu Date: Wed, 23 Mar 2022 08:54:09 +0100 Subject: [PATCH 652/685] bzip2: add symlink libbz2.so.1.0 (#163217) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- pkgs/tools/compression/bzip2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index da37cf9fbd8..cd262875a76 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + ln -s $out/lib/libbz2.so.1.0.* $out/lib/libbz2.so.1.0 + ''; + meta = with lib; { description = "High-quality data compression program"; homepage = "https://www.sourceware.org/bzip2"; From 35e2c61dfd57be97b3df2c8de76d959a7908e1ad Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 23 Mar 2022 08:04:28 +0000 Subject: [PATCH 653/685] systemd: 250.3 -> 250.4 Among other things fixes build failure on linux-headers-5.17: ../src/basic/meson.build:389:8: ERROR: Problem encountered: found unknown filesystem(s) defined in kernel headers: Filesystem found in kernel header but not in filesystems-gperf.gperf: CIFS_SUPER_MAGIC Filesystem found in kernel header but not in filesystems-gperf.gperf: SMB2_SUPER_MAGIC --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fda8092ec98..691b4587fa1 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -127,7 +127,7 @@ assert withCryptsetup -> (cryptsetup != null); let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "250.3"; + version = "250.4"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -144,7 +144,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-O1XE0BhIuDAlFVX7WIy02M9YTIxLX0Q8atJAYsUgQDQ="; + sha256 = "sha256-AdzPh7dGVrGbbjL9+PqytQOpRzNDUUEftmKZAbFH3L4="; }; # On major changes, or when otherwise required, you *must* reformat the patches, From bf65cd57cae8ecd513fe024389b03207532a7c12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Mar 2022 21:11:55 +0100 Subject: [PATCH 654/685] python3Packages.convertdate: disable on older Python releases --- .../python-modules/convertdate/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index cb47546055e..b20066c51d8 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -1,23 +1,24 @@ { lib , buildPythonPackage -, isPy27 , fetchFromGitHub , pymeeus , pytz , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "convertdate"; version = "2.4.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Tests are not available in the PyPI tarball so use GitHub instead. src = fetchFromGitHub { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; + hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; }; propagatedBuildInputs = [ @@ -29,11 +30,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "convertdate" ]; + pythonImportsCheck = [ + "convertdate" + ]; meta = with lib; { - homepage = "https://github.com/fitnr/convertdate"; description = "Utils for converting between date formats and calculating holidays"; + homepage = "https://github.com/fitnr/convertdate"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; From a7ccddeb54d9783cce95299132dd3d36ab2e3615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Mar 2022 21:43:15 +0100 Subject: [PATCH 655/685] Revert "Merge #160259: separateDebugInfo: Use --strip-unneeded" This reverts commit 848091a52b734f2fb30c0e185befc31a2f3733de, reversing changes made to ab0e692ac7d4284455410d542b560ae3600242f3. It caused issues with elfutils tests, probably through over-stripping of glibc parts. --- .../setup-hooks/separate-debug-info.sh | 2 +- pkgs/development/libraries/libpsl/default.nix | 2 -- .../valgrind/debug-info-from-env.patch | 31 ------------------- .../tools/analysis/valgrind/default.nix | 6 ---- 4 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/development/tools/analysis/valgrind/debug-info-from-env.patch diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index d910bce11af..1a23e6b198e 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -34,7 +34,7 @@ _separateDebugInfo() { # firmware blobs in QEMU.) ( $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" - $STRIP --strip-unneeded "$i" + $STRIP --strip-debug "$i" # Also a create a symlink .debug. ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")" diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index e505651ab40..0a710d648fb 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,7 +3,6 @@ , autoreconfHook , docbook_xsl , docbook_xml_dtd_43 -, glibc , gtk-doc , lzip , libidn2 @@ -39,7 +38,6 @@ in stdenv.mkDerivation rec { python3 libxslt ] ++ lib.optionals enableValgrindTests [ - glibc.debug valgrind ]; diff --git a/pkgs/development/tools/analysis/valgrind/debug-info-from-env.patch b/pkgs/development/tools/analysis/valgrind/debug-info-from-env.patch deleted file mode 100644 index a237bc87d07..00000000000 --- a/pkgs/development/tools/analysis/valgrind/debug-info-from-env.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c -index c586e3f33..e3bb1717f 100644 ---- a/coregrind/m_debuginfo/readelf.c -+++ b/coregrind/m_debuginfo/readelf.c -@@ -1508,13 +1508,25 @@ DiImage* find_debug_file( struct _DebugInfo* di, - HChar* debugpath = NULL; /* where we found it */ - - if (buildid != NULL) { -+ const HChar *dir = VG_(getenv)("NIX_DEBUG_INFO_DIRS"); - debugpath = ML_(dinfo_zalloc)("di.fdf.1", -- VG_(strlen)(buildid) + 33); -+ VG_(strlen)(buildid) + 33 + -+ (dir ? VG_(strlen)(dir) : 0)); - - VG_(sprintf)(debugpath, "/usr/lib/debug/.build-id/%c%c/%s.debug", - buildid[0], buildid[1], buildid + 2); - - dimg = open_debug_file(debugpath, buildid, 0, rel_ok, NULL); -+ -+ while (!dimg && dir) { -+ const HChar *sep = VG_(strchr)(dir, ':'); -+ Int size = sep ? sep - dir : VG_(strlen)(dir); -+ VG_(sprintf)(debugpath, "%.*s/.build-id/%c%c/%s.debug", -+ size, dir, buildid[0], buildid[1], buildid + 2); -+ dimg = open_debug_file(debugpath, buildid, 0, rel_ok, NULL); -+ dir = sep ? sep + 1 : NULL; -+ } -+ - if (!dimg) { - ML_(dinfo_free)(debugpath); - debugpath = NULL; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 7aef87a2f0e..6e736df235f 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch , autoreconfHook, perl , gdb, cctools, xnu, bootstrap_cmds -, setupDebugInfoDirs }: stdenv.mkDerivation rec { @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { url = "https://bugsfiles.kde.org/attachment.cgi?id=143535"; sha256 = "036zyk30rixjvpylw3c7n171n4gpn6zcp7h6ya2dz4h5r478l9i6"; }) - ./debug-info-from-env.patch ]; outputs = [ "out" "dev" "man" "doc" ]; @@ -34,10 +32,6 @@ stdenv.mkDerivation rec { # Perl is also a native build input. nativeBuildInputs = [ autoreconfHook perl ]; - # Not propagatedNativeBuildInputs because of - # https://github.com/NixOS/nixpkgs/issues/64992. - propagatedBuildInputs = [ setupDebugInfoDirs ]; - enableParallelBuilding = true; separateDebugInfo = stdenv.isLinux; From 46076745dfb727156464f183a9d3f2fc8a4d92fd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 23 Mar 2022 23:11:08 +0100 Subject: [PATCH 656/685] mesa: 21.3.7 -> 21.3.8 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 273f5bf3b21..a48f4b42e45 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -34,7 +34,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.3.7"; + version = "21.3.8"; branch = versions.major version; self = stdenv.mkDerivation { @@ -48,7 +48,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0ggw3s514z6szasbiy4dv5mdi689121yy2xly2g21gv1mavrvyml"; + sha256 = "19wx5plk6z0hhi0zdzxjx8ynl3lhlc5mbd8vhwqyk92kvhxjf3g7"; }; # TODO: From 195c7da07df7311e9be87e660bf66fe7f8746169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Mar 2022 10:36:10 +0100 Subject: [PATCH 657/685] Revert #156510: openssl: stop static binaries referencing libs This reverts commit 71f1f4884b5e40ae6647fa7f0f1890554ad6aa7d. It seems like too problematic at this point; see PR comments below https://github.com/NixOS/nixpkgs/pull/156510#issuecomment-1058532765 --- pkgs/development/libraries/openssl/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 1155e51d52b..33ddbf7018c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -45,7 +45,7 @@ let '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' ''; - outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optional withDocs "doc"; + outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional withDocs "doc"; setOutputFlags = false; separateDebugInfo = !stdenv.hostPlatform.isDarwin && @@ -94,7 +94,7 @@ let dontAddStaticConfigureFlags = true; configureFlags = [ "shared" # "shared" builds both shared and static libraries - "--libdir=${placeholder "lib"}/lib" + "--libdir=lib" "--openssldir=etc/ssl" ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" @@ -103,7 +103,6 @@ let ++ lib.optional enableSSL3 "enable-ssl3" ++ lib.optional (lib.versionAtLeast version "3.0.0") "enable-ktls" ++ lib.optional (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" - ++ lib.optional static "disable-dynamic-engine" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. @@ -118,21 +117,8 @@ let "MANSUFFIX=ssl" ]; - buildFlags = lib.optionals static [ - # Even though engines are disabled in static builds, we have to - # override ENGINESDIR so the bin output doesn't end up with an - # reference to the lib output. - "ENGINESDIR=/" - ]; - enableParallelBuilding = true; - preInstall = lib.optionalString static '' - # Build system wants to be able to create the engines directory - # even though nothing will get installed to it. - installFlagsArray+=(ENGINESDIR="$NIX_BUILD_TOP/engines") - ''; - postInstall = lib.optionalString (!static) '' # If we're building dynamic libraries, then don't install static From 173de4efbf4a475175beb0ae9b93a760efcf264a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 25 Mar 2022 10:01:51 +0100 Subject: [PATCH 658/685] libuv: drop a test that seems flaky on Hydra https://hydra.nixos.org/log/lg744sdh93maxbb68bk1p29a9rpnx2pw-libuv-1.44.1.drv --- pkgs/development/libraries/libuv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4f7d35f420c..12f7f982c1d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes + "fs_fstat" # https://github.com/libuv/libuv/issues/2235#issuecomment-1012086927 ] ++ lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should From 8685cea963be4c90c436bcb4a05212a26dd0e12c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 17 Mar 2022 14:05:13 +0000 Subject: [PATCH 659/685] nghttp2: only run tests on GNU Fixes pkgsMusl.nghttp2. Fixes: 32dbdc4388b ("nghttp2: 1.43.0 -> 1.47.0") --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 4f22047c5a9..01df15c0a83 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -13,8 +13,8 @@ , enableJemalloc ? false, jemalloc ? null , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null -# Unit tests ; on Darwin CUnit brings an additional dependency on ncurses which is inconvenient here -, enableTests ? (!stdenv.isDarwin), cunit ? null, tzdata ? null +# Unit tests ; we have to set TZDIR, which is a GNUism. +, enableTests ? stdenv.hostPlatform.isGnu, cunit ? null, tzdata ? null # downstream dependencies, for testing , curl From 843d098bbe81468c0dab212af75a2c8f0354d78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 25 Mar 2022 19:31:49 -0600 Subject: [PATCH 660/685] polyml: remove already applied patch Upstream: https://github.com/polyml/polyml/pull/159/commits/3e27444bea771e25102430bfa632edf8d106c91c Present since v5.9 release --- pkgs/development/compilers/polyml/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 63506b8f07f..2f22f8cd616 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gmp +, libffi +}: stdenv.mkDerivation rec { pname = "polyml"; @@ -12,14 +18,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; - patches = [ - # glibc 2.34 compat - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/polyml/raw/4d8868ca5a1ce3268f212599a321f8011c950496/f/polyml-pthread-stack-min.patch"; - sha256 = "1h5ihg2sxld9ymrl3f2mpnbn2242ka1fsa0h4gl9h90kndvg6kby"; - }) - ]; - configureFlags = [ "--enable-shared" "--with-system-libffi" From e00d1b9dd5f4cbdf0b22c9c322e04263b3b7d81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 25 Mar 2022 19:46:05 -0600 Subject: [PATCH 661/685] =?UTF-8?q?pythonPackages.behave:=201.2.7.dev1=20?= =?UTF-8?q?=E2=86=92=201.2.7.dev2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/behave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 1198f034d00..2384a51e502 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "behave"; - version = "1.2.7.dev1"; + version = "1.2.7.dev2"; src = fetchFromGitHub { owner = "behave"; repo = pname; rev = "v${version}"; - sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv"; + hash = "sha256-B8PUN1Q4UAsDWrHjPZDlpaPjCKjI/pAogCSI+BQnaWs="; }; checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; From a6fcd7b3010dce15f5650a42d2835a9f90f3ce2c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 26 Mar 2022 09:50:05 +0100 Subject: [PATCH 662/685] glib: Fix conflicts in Meson patch on Darwin Now based onto 0.61.2. --- ...when-using-multiple-apple-frameworks.patch | 100 ++++++++---------- 1 file changed, 43 insertions(+), 57 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch b/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch index eb6d9718bcb..6c237e92dd1 100644 --- a/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch +++ b/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch @@ -1,4 +1,4 @@ -From 0a008a6c7ecee19f35c8b7ab17b1470d0d1a8a15 Mon Sep 17 00:00:00 2001 +From b8ba462ae72e0818898357464263ec84722f6d4c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 26 Mar 2022 02:26:27 +0100 Subject: [PATCH] gnome: Fix gtkdoc when using multiple Apple frameworks @@ -11,13 +11,16 @@ Picked from https://github.com/mesonbuild/meson/pull/10186 Also pick https://github.com/mesonbuild/meson/commit/68e684d51f1e469e0d9f4b499ffda15146cad98a when resolving conflict. diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 7113f28d2..d3269b53f 100644 +index 214f97ac3..0521b2605 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -384,13 +384,14 @@ class GnomeModule(ExtensionModule): - def _get_link_args(self, state, lib, depends, include_rpath=False, - use_gir_args=False): - link_command = [] +@@ -593,15 +593,16 @@ class GnomeModule(ExtensionModule): + lib: T.Union[build.SharedLibrary, build.StaticLibrary], + depends: T.List[build.BuildTarget], + include_rpath: bool = False, +- use_gir_args: bool = False) -> T.List[str]: ++ use_gir_args: bool = False) -> T.Tuple[T.List[str], T.List[T.Union[build.BuildTarget, 'build.GeneratedTypes', 'FileOrString']]]: + link_command: T.List[str] = [] + new_depends = list(depends) # Construct link args if isinstance(lib, build.SharedLibrary): @@ -30,42 +33,36 @@ index 7113f28d2..d3269b53f 100644 # Needed for the following binutils bug: # https://github.com/mesonbuild/meson/issues/1911 # However, g-ir-scanner does not understand -Wl,-rpath -@@ -404,18 +405,24 @@ class GnomeModule(ExtensionModule): +@@ -615,19 +616,19 @@ class GnomeModule(ExtensionModule): link_command.append('--extra-library=' + lib.name) else: link_command.append('-l' + lib.name) - return link_command -- -- def _get_dependencies_flags(self, deps, state, depends, include_rpath=False, -- use_gir_args=False, separate_nodedup=False): -- cflags = OrderedSet() -- internal_ldflags = OrderedSet() -- external_ldflags = OrderedSet() + return link_command, new_depends -+ + +- def _get_dependencies_flags( + def _get_dependencies_flags_raw( -+ self, deps, -+ state, -+ depends, -+ include_rpath: bool = False, -+ use_gir_args: bool = False, -+ ) -> T.Tuple[OrderedSet[str], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[str], -+ T.List]: -+ cflags: OrderedSet[str] = OrderedSet() + self, deps: T.Sequence[T.Union['Dependency', build.SharedLibrary, build.StaticLibrary]], +- state: 'ModuleState', depends: T.List[build.BuildTarget], include_rpath: bool = False, +- use_gir_args: bool = False, separate_nodedup: bool = False +- ) -> T.Tuple[OrderedSet[str], OrderedSet[str], OrderedSet[str], T.Optional[T.List[str]], OrderedSet[str]]: ++ state: 'ModuleState', depends: T.List[build.BuildTarget], include_rpath: bool, ++ use_gir_args: bool ++ ) -> T.Tuple[OrderedSet[str], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[T.Union[str, T.Tuple[str, str]]], T.Optional[T.List[str]], OrderedSet[str], ++ T.List[T.Union[build.BuildTarget, 'build.GeneratedTypes', 'FileOrString']]]: + cflags: OrderedSet[str] = OrderedSet() +- internal_ldflags: OrderedSet[str] = OrderedSet() +- external_ldflags: OrderedSet[str] = OrderedSet() # External linker flags that can't be de-duped reliably because they - # require two args in order, such as -framework AVFoundation -- external_ldflags_nodedup = [] -- gi_includes = OrderedSet() +- external_ldflags_nodedup: T.List[str] = [] + # require two args in order, such as -framework AVFoundation will be stored as a tuple. + internal_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() + external_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() -+ gi_includes: OrderedSet[str] = OrderedSet() + gi_includes: OrderedSet[str] = OrderedSet() deps = mesonlib.listify(deps) -+ depends = list(depends) - for dep in deps: - if isinstance(dep, Dependency): -@@ -427,21 +434,20 @@ class GnomeModule(ExtensionModule): +@@ -642,21 +643,20 @@ class GnomeModule(ExtensionModule): cflags.update(state.get_include_args(dep.include_directories)) for lib in dep.libraries: if isinstance(lib, build.SharedLibrary): @@ -95,21 +92,21 @@ index 7113f28d2..d3269b53f 100644 for source in dep.sources: if isinstance(source, GirTarget): gi_includes.update([os.path.join(state.environment.get_build_dir(), -@@ -469,7 +475,7 @@ class GnomeModule(ExtensionModule): +@@ -684,7 +684,7 @@ class GnomeModule(ExtensionModule): # If it's a framework arg, slurp the framework name too # to preserve the order of arguments - if lib == '-framework': -- external_ldflags_nodedup += [lib, next(ldflags)] -+ external_ldflags.update([(lib, next(ldflags))]) + if flag == '-framework': +- external_ldflags_nodedup += [flag, next(ldflags)] ++ external_ldflags.update([(flag, next(ldflags))]) else: - external_ldflags.update([lib]) + external_ldflags.update([flag]) elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): -@@ -480,21 +486,43 @@ class GnomeModule(ExtensionModule): +@@ -695,21 +695,41 @@ class GnomeModule(ExtensionModule): continue if use_gir_args and self._gir_has_option('--extra-library'): -- def fix_ldflags(ldflags): -- fixed_ldflags = OrderedSet() +- def fix_ldflags(ldflags: T.Iterable[str]) -> OrderedSet[str]: +- fixed_ldflags: OrderedSet[str] = OrderedSet() + def fix_ldflags(ldflags: T.Iterable[T.Union[str, T.Tuple[str, str]]]) -> OrderedSet[T.Union[str, T.Tuple[str, str]]]: + fixed_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() for ldflag in ldflags: @@ -122,19 +119,17 @@ index 7113f28d2..d3269b53f 100644 external_ldflags = fix_ldflags(external_ldflags) - if not separate_nodedup: - external_ldflags.update(external_ldflags_nodedup) -- return cflags, internal_ldflags, external_ldflags, gi_includes +- return cflags, internal_ldflags, external_ldflags, None, gi_includes - else: - return cflags, internal_ldflags, external_ldflags, external_ldflags_nodedup, gi_includes + return cflags, internal_ldflags, external_ldflags, gi_includes, depends + + def _get_dependencies_flags( -+ self, deps, -+ state, -+ depends, -+ include_rpath: bool = False, -+ use_gir_args: bool = False, ++ self, deps: T.Sequence[T.Union['Dependency', build.SharedLibrary, build.StaticLibrary]], ++ state: 'ModuleState', depends: T.List[build.BuildTarget], include_rpath: bool = False, ++ use_gir_args: bool = False + ) -> T.Tuple[OrderedSet[str], T.List[str], T.List[str], OrderedSet[str], -+ T.List]: ++ T.List[T.Union[build.BuildTarget, 'build.GeneratedTypes', 'FileOrString']]]: + + cflags, internal_ldflags_raw, external_ldflags_raw, gi_includes, depends = self._get_dependencies_flags_raw(deps, state, depends, include_rpath, use_gir_args) + internal_ldflags: T.List[str] = [] @@ -153,24 +148,15 @@ index 7113f28d2..d3269b53f 100644 + external_ldflags.extend(ldflag) + return cflags, internal_ldflags, external_ldflags, gi_includes, depends - def _unwrap_gir_target(self, girtarget, state): + def _unwrap_gir_target(self, girtarget: T.Union[build.Executable, build.StaticLibrary, build.SharedLibrary], state: 'ModuleState' + ) -> T.Union[build.Executable, build.StaticLibrary, build.SharedLibrary]: if not isinstance(girtarget, (build.Executable, build.SharedLibrary, - build.StaticLibrary)): -@@ -875,7 +903,7 @@ class GnomeModule(ExtensionModule): +@@ -1056,7 +1076,7 @@ class GnomeModule(ExtensionModule): # ldflags will be misinterpreted by gir scanner (showing # spurious dependencies) but building GStreamer fails if they # are not used here. -- dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes = \ +- dep_cflags, dep_internal_ldflags, dep_external_ldflags, _, gi_includes = \ + dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes, depends = \ self._get_dependencies_flags(deps, state, depends, use_gir_args=True) scan_cflags = [] scan_cflags += list(self._get_scanner_cflags(cflags)) -@@ -1170,7 +1198,7 @@ class GnomeModule(ExtensionModule): - deps = extract_as_list(kwargs, 'dependencies') - cflags = [] - cflags.extend(mesonlib.stringlistify(kwargs.pop('c_args', []))) -- deps_cflags, internal_ldflags, external_ldflags, gi_includes = \ -+ deps_cflags, internal_ldflags, external_ldflags, gi_includes, depends = \ - self._get_dependencies_flags(deps, state, depends, include_rpath=True) - inc_dirs = mesonlib.extract_as_list(kwargs, 'include_directories') - for incd in inc_dirs: From 39eee39fd9212d81387e4429223fbb8a7ef168b7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 25 Mar 2022 12:08:07 +0000 Subject: [PATCH 663/685] pkgsMusl.systemd: fix build for 250.4 --- pkgs/os-specific/linux/systemd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 691b4587fa1..fbdc7d6ff4d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -209,6 +209,8 @@ stdenv.mkDerivation { (musl-patches + "/0025-Handle-__cpu_mask-usage.patch") (musl-patches + "/0026-Handle-missing-gshadow.patch") (musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch") + (musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch") + (musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch") (musl-patches + "/0001-Adjust-for-musl-headers.patch") ] ); From 086c62dd5eab696e889d6fb87c3cc0d10ca00762 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 27 Mar 2022 16:28:48 +0200 Subject: [PATCH 664/685] glib: Revert patch likely causing Inkscape build to fail on Darwin --- pkgs/development/libraries/glib/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ecae47b3d2d..f057618e788 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -54,6 +54,14 @@ stdenv.mkDerivation rec { patches = optionals stdenv.isDarwin [ ./darwin-compilation.patch + + # Fix Inkscape compilation with clang++ + # https://gitlab.gnome.org/GNOME/glib/-/issues/2625 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/97d39b745ff1f621424f68a41ce0a7c5bb554c87.patch"; + sha256 = "wftuyf3ExFfrISngCQpEUpIGfHCCLXeYv/PEb/TE6a8="; + revert = true; + }) ] ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch From 58f636511e753e04ff07d43dc54bfbeec086e305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 17:23:41 +0200 Subject: [PATCH 665/685] python27Packages.pathlib2: fix build --- pkgs/development/python-modules/pathlib2/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index bbaff273102..86d3ed87166 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,7 +5,8 @@ , pythonOlder , scandir ? null , glibcLocales -, mock ? null +, mock +, typing }: buildPythonPackage rec { @@ -17,8 +18,10 @@ buildPythonPackage rec { sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; }; - propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; - checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; + propagatedBuildInputs = [ six ] + ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; + checkInputs = [ glibcLocales ] + ++ lib.optional (pythonOlder "3.3") mock; preCheck = '' export LC_ALL="en_US.UTF-8" From b0c31dc06f79a77897310000a0a09ff0076398dd Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 16:03:33 -0700 Subject: [PATCH 666/685] python3Packages.wandb: disable failing test on darwin --- pkgs/development/python-modules/wandb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index ef8e6cfd247..7f21877f1fb 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -114,6 +114,10 @@ buildPythonPackage rec { "tests/test_tables.py" ]; + # Disable test that fails on darwin due to issue with python3Packages.psutil: + # https://github.com/giampaolo/psutil/issues/1219 + disabledTests = lib.optional stdenv.isDarwin "test_tpu_system_stats"; + checkInputs = [ azure-core bokeh From 6de6d6009a3ad380824ba154bae8a3ac87f159d0 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 24 Feb 2022 13:20:41 -0800 Subject: [PATCH 667/685] openai: add python3Packages.wandb dependency --- pkgs/development/python-modules/openai/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 4fb744826b7..a8b65ea5894 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -9,6 +9,7 @@ , pandas-stubs , requests , tqdm +, wandb # Check dependencies , pytest-mock @@ -35,6 +36,7 @@ buildPythonPackage rec { pandas-stubs requests tqdm + wandb ]; pythonImportsCheck = [ "openai" ]; From 6319376cb644a9741fa9e9383b2f30cd0e5e1df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 17:23:51 +0200 Subject: [PATCH 668/685] python39Packages.pathlib2: update homepage, add SuperSandro2000 as maintainer --- pkgs/development/python-modules/pathlib2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 86d3ed87166..f0f0163652c 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -27,9 +27,10 @@ buildPythonPackage rec { export LC_ALL="en_US.UTF-8" ''; - meta = { + meta = with lib; { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; - homepage = "https://pypi.python.org/pypi/pathlib2/"; - license = with lib.licenses; [ mit ]; + homepage = "https://pypi.org/project/pathlib2/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 2bcc43f367dfed1ce655c381e07521c7f975b553 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 29 Mar 2022 11:39:42 -0700 Subject: [PATCH 669/685] python3Packages.dnspython: disable flaky tests on darwin --- pkgs/development/python-modules/dnspython/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index ad58f310636..5676d270935 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -30,6 +30,14 @@ buildPythonPackage rec { "test_misc_good_WKS_text" # fails if IPv6 isn't available "test_resolver_override" + + # Tests that run inconsistently on darwin systems + ] ++ lib.optionals stdenv.isDarwin [ + # 9 tests fail with: BlockingIOError: [Errno 35] Resource temporarily unavailable + "testQueryUDP" + # 6 tests fail with: dns.resolver.LifetimeTimeout: The resolution lifetime expired after ... + "testResolveCacheHit" + "testResolveTCP" ]; nativeBuildInputs = [ From 1832678aeeb7f6aafc156cd653a3615737624776 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Sat, 26 Mar 2022 10:13:03 +0100 Subject: [PATCH 670/685] zlib: add patches to fix CVE-2018-25032 https://nvd.nist.gov/vuln/detail/CVE-2018-25032 https://www.openwall.com/lists/oss-security/2022/03/24/1 A similar change landed in Alpine: https://git.alpinelinux.org/aports/commit/?id=361df5902aa1e81594b17f06a13e10527dfb8aed --- .../libraries/zlib/CVE-2018-25032-1.patch | 346 ++++++++++++++++++ .../libraries/zlib/CVE-2018-25032-2.patch | 27 ++ pkgs/development/libraries/zlib/default.nix | 10 +- 3 files changed, 382 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/zlib/CVE-2018-25032-1.patch create mode 100644 pkgs/development/libraries/zlib/CVE-2018-25032-2.patch diff --git a/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch b/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch new file mode 100644 index 00000000000..1ade02654e5 --- /dev/null +++ b/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch @@ -0,0 +1,346 @@ +From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Tue, 17 Apr 2018 22:09:22 -0700 +Subject: [PATCH 1/2] Fix a bug that can crash deflate on some input when using + Z_FIXED. + +This bug was reported by Danilo Ramos of Eideticom, Inc. It has +lain in wait 13 years before being found! The bug was introduced +in zlib 1.2.2.2, with the addition of the Z_FIXED option. That +option forces the use of fixed Huffman codes. For rare inputs with +a large number of distant matches, the pending buffer into which +the compressed data is written can overwrite the distance symbol +table which it overlays. That results in corrupted output due to +invalid distances, and can result in out-of-bound accesses, +crashing the application. + +The fix here combines the distance buffer and literal/length +buffers into a single symbol buffer. Now three bytes of pending +buffer space are opened up for each literal or length/distance +pair consumed, instead of the previous two bytes. This assures +that the pending buffer cannot overwrite the symbol table, since +the maximum fixed code compressed length/distance is 31 bits, and +since there are four bytes of pending space for every three bytes +of symbol space. +--- + deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- + deflate.h | 25 +++++++++---------- + trees.c | 50 +++++++++++-------------------------- + 3 files changed, 79 insertions(+), 70 deletions(-) + +diff --git a/deflate.c b/deflate.c +index 425babc..19cba87 100644 +--- a/deflate.c ++++ b/deflate.c +@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + int wrap = 1; + static const char my_version[] = ZLIB_VERSION; + +- ushf *overlay; +- /* We overlay pending_buf and d_buf+l_buf. This works since the average +- * output size for (length,distance) codes is <= 24 bits. +- */ +- + if (version == Z_NULL || version[0] != my_version[0] || + stream_size != sizeof(z_stream)) { + return Z_VERSION_ERROR; +@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + + s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ + +- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); +- s->pending_buf = (uchf *) overlay; +- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); ++ /* We overlay pending_buf and sym_buf. This works since the average size ++ * for length/distance pairs over any compressed block is assured to be 31 ++ * bits or less. ++ * ++ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 ++ * extra bits, for lengths 131 to 257. The longest fixed distance codes are ++ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest ++ * possible fixed-codes length/distance pair is then 31 bits total. ++ * ++ * sym_buf starts one-fourth of the way into pending_buf. So there are ++ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol ++ * in sym_buf is three bytes -- two for the distance and one for the ++ * literal/length. As each symbol is consumed, the pointer to the next ++ * sym_buf value to read moves forward three bytes. From that symbol, up to ++ * 31 bits are written to pending_buf. The closest the written pending_buf ++ * bits gets to the next sym_buf symbol to read is just before the last ++ * code is written. At that time, 31*(n-2) bits have been written, just ++ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at ++ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 ++ * symbols are written.) The closest the writing gets to what is unread is ++ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and ++ * can range from 128 to 32768. ++ * ++ * Therefore, at a minimum, there are 142 bits of space between what is ++ * written and what is read in the overlain buffers, so the symbols cannot ++ * be overwritten by the compressed data. That space is actually 139 bits, ++ * due to the three-bit fixed-code block header. ++ * ++ * That covers the case where either Z_FIXED is specified, forcing fixed ++ * codes, or when the use of fixed codes is chosen, because that choice ++ * results in a smaller compressed block than dynamic codes. That latter ++ * condition then assures that the above analysis also covers all dynamic ++ * blocks. A dynamic-code block will only be chosen to be emitted if it has ++ * fewer bits than a fixed-code block would for the same set of symbols. ++ * Therefore its average symbol length is assured to be less than 31. So ++ * the compressed data for a dynamic block also cannot overwrite the ++ * symbols from which it is being constructed. ++ */ ++ ++ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); ++ s->pending_buf_size = (ulg)s->lit_bufsize * 4; + + if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || + s->pending_buf == Z_NULL) { +@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, + deflateEnd (strm); + return Z_MEM_ERROR; + } +- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); +- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; ++ s->sym_buf = s->pending_buf + s->lit_bufsize; ++ s->sym_end = (s->lit_bufsize - 1) * 3; ++ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K ++ * on 16 bit machines and because stored blocks are restricted to ++ * 64K-1 bytes. ++ */ + + s->level = level; + s->strategy = strategy; +@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value) + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) ++ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; +@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source) + #else + deflate_state *ds; + deflate_state *ss; +- ushf *overlay; + + + if (deflateStateCheck(source) || dest == Z_NULL) { +@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source) + ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); + ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); + ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); +- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); +- ds->pending_buf = (uchf *) overlay; ++ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); + + if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || + ds->pending_buf == Z_NULL) { +@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source) + zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); + + ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); +- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); +- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; ++ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; + + ds->l_desc.dyn_tree = ds->dyn_ltree; + ds->d_desc.dyn_tree = ds->dyn_dtree; +@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush) + FLUSH_BLOCK(s, 1); + return finish_done; + } +- if (s->last_lit) ++ if (s->sym_next) + FLUSH_BLOCK(s, 0); + return block_done; + } +diff --git a/deflate.h b/deflate.h +index 23ecdd3..d4cf1a9 100644 +--- a/deflate.h ++++ b/deflate.h +@@ -217,7 +217,7 @@ typedef struct internal_state { + /* Depth of each subtree used as tie breaker for trees of equal frequency + */ + +- uchf *l_buf; /* buffer for literals or lengths */ ++ uchf *sym_buf; /* buffer for distances and literals/lengths */ + + uInt lit_bufsize; + /* Size of match buffer for literals/lengths. There are 4 reasons for +@@ -239,13 +239,8 @@ typedef struct internal_state { + * - I can't count above 4 + */ + +- uInt last_lit; /* running index in l_buf */ +- +- ushf *d_buf; +- /* Buffer for distances. To simplify the code, d_buf and l_buf have +- * the same number of elements. To use different lengths, an extra flag +- * array would be necessary. +- */ ++ uInt sym_next; /* running index in sym_buf */ ++ uInt sym_end; /* symbol table full when sym_next reaches this */ + + ulg opt_len; /* bit length of current block with optimal trees */ + ulg static_len; /* bit length of current block with static trees */ +@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, + + # define _tr_tally_lit(s, c, flush) \ + { uch cc = (c); \ +- s->d_buf[s->last_lit] = 0; \ +- s->l_buf[s->last_lit++] = cc; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = 0; \ ++ s->sym_buf[s->sym_next++] = cc; \ + s->dyn_ltree[cc].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + # define _tr_tally_dist(s, distance, length, flush) \ + { uch len = (uch)(length); \ + ush dist = (ush)(distance); \ +- s->d_buf[s->last_lit] = dist; \ +- s->l_buf[s->last_lit++] = len; \ ++ s->sym_buf[s->sym_next++] = dist; \ ++ s->sym_buf[s->sym_next++] = dist >> 8; \ ++ s->sym_buf[s->sym_next++] = len; \ + dist--; \ + s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ + s->dyn_dtree[d_code(dist)].Freq++; \ +- flush = (s->last_lit == s->lit_bufsize-1); \ ++ flush = (s->sym_next == s->sym_end); \ + } + #else + # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) +diff --git a/trees.c b/trees.c +index 4f4a650..decaeb7 100644 +--- a/trees.c ++++ b/trees.c +@@ -416,7 +416,7 @@ local void init_block(s) + + s->dyn_ltree[END_BLOCK].Freq = 1; + s->opt_len = s->static_len = 0L; +- s->last_lit = s->matches = 0; ++ s->sym_next = s->matches = 0; + } + + #define SMALLEST 1 +@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) + + Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", + opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, +- s->last_lit)); ++ s->sym_next / 3)); + + if (static_lenb <= opt_lenb) opt_lenb = static_lenb; + +@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + unsigned dist; /* distance of matched string */ + unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ + { +- s->d_buf[s->last_lit] = (ush)dist; +- s->l_buf[s->last_lit++] = (uch)lc; ++ s->sym_buf[s->sym_next++] = dist; ++ s->sym_buf[s->sym_next++] = dist >> 8; ++ s->sym_buf[s->sym_next++] = lc; + if (dist == 0) { + /* lc is the unmatched char */ + s->dyn_ltree[lc].Freq++; +@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) + s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; + s->dyn_dtree[d_code(dist)].Freq++; + } +- +-#ifdef TRUNCATE_BLOCK +- /* Try to guess if it is profitable to stop the current block here */ +- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { +- /* Compute an upper bound for the compressed length */ +- ulg out_length = (ulg)s->last_lit*8L; +- ulg in_length = (ulg)((long)s->strstart - s->block_start); +- int dcode; +- for (dcode = 0; dcode < D_CODES; dcode++) { +- out_length += (ulg)s->dyn_dtree[dcode].Freq * +- (5L+extra_dbits[dcode]); +- } +- out_length >>= 3; +- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", +- s->last_lit, in_length, out_length, +- 100L - out_length*100L/in_length)); +- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; +- } +-#endif +- return (s->last_lit == s->lit_bufsize-1); +- /* We avoid equality with lit_bufsize because of wraparound at 64K +- * on 16 bit machines and because stored blocks are restricted to +- * 64K-1 bytes. +- */ ++ return (s->sym_next == s->sym_end); + } + + /* =========================================================================== +@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree) + { + unsigned dist; /* distance of matched string */ + int lc; /* match length or unmatched char (if dist == 0) */ +- unsigned lx = 0; /* running index in l_buf */ ++ unsigned sx = 0; /* running index in sym_buf */ + unsigned code; /* the code to send */ + int extra; /* number of extra bits to send */ + +- if (s->last_lit != 0) do { +- dist = s->d_buf[lx]; +- lc = s->l_buf[lx++]; ++ if (s->sym_next != 0) do { ++ dist = s->sym_buf[sx++] & 0xff; ++ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; ++ lc = s->sym_buf[sx++]; + if (dist == 0) { + send_code(s, lc, ltree); /* send a literal byte */ + Tracecv(isgraph(lc), (stderr," '%c' ", lc)); +@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree) + } + } /* literal or match pair ? */ + +- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ +- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, +- "pendingBuf overflow"); ++ /* Check that the overlay between pending_buf and sym_buf is ok: */ ++ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); + +- } while (lx < s->last_lit); ++ } while (sx < s->sym_next); + + send_code(s, END_BLOCK, ltree); + } +-- +2.33.1 + diff --git a/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch b/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch new file mode 100644 index 00000000000..dadc904a07f --- /dev/null +++ b/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch @@ -0,0 +1,27 @@ +From 4346a16853e19b45787ce933666026903fb8f3f8 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Tue, 17 Apr 2018 22:44:41 -0700 +Subject: [PATCH 2/2] Assure that the number of bits for deflatePrime() is + valid. + +--- + deflate.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/deflate.c b/deflate.c +index 19cba87..23aef18 100644 +--- a/deflate.c ++++ b/deflate.c +@@ -589,7 +589,8 @@ int ZEXPORT deflatePrime (strm, bits, value) + + if (deflateStateCheck(strm)) return Z_STREAM_ERROR; + s = strm->state; +- if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) ++ if (bits < 0 || bits > 16 || ++ s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) + return Z_BUF_ERROR; + do { + put = Buf_size - s->bi_valid; +-- +2.33.1 + diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 48603000c90..144a4a64d1d 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -33,7 +33,15 @@ stdenv.mkDerivation (rec { sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; }; - patches = lib.optional stdenv.hostPlatform.isCygwin ./disable-cygwin-widechar.patch; + patches = [ + # https://nvd.nist.gov/vuln/detail/CVE-2018-25032 + # https://github.com/madler/zlib/commit/5c44459c3b28a9bd3283aaceab7c615f8020c531 + ./CVE-2018-25032-1.patch + # https://github.com/madler/zlib/commit/4346a16853e19b45787ce933666026903fb8f3f8 + ./CVE-2018-25032-2.patch + ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ + ./disable-cygwin-widechar.patch + ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ From 8cd9c041b405f9ad89092ca9a90a430e168b271c Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 30 Mar 2022 20:41:17 +0200 Subject: [PATCH 671/685] zlib: 1.2.11 -> 1.2.12 (security, CVE-2018-25032) This version bump is the official fix for CVE-2018-25032. Release Notes: https://zlib.net/ --- pkgs/development/libraries/zlib/default.nix | 14 ++------------ .../libraries/zlib/disable-cygwin-widechar.patch | 13 ------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/zlib/disable-cygwin-widechar.patch diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 144a4a64d1d..91cd037e0e3 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -23,26 +23,16 @@ assert splitStaticOutput -> static; stdenv.mkDerivation (rec { pname = "zlib"; - version = "1.2.11"; + version = "1.2.12"; src = fetchurl { urls = [ "https://www.zlib.net/fossils/zlib-${version}.tar.gz" # stable archive path "mirror://sourceforge/libpng/zlib/${version}/zlib-${version}.tar.gz" ]; - sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; + sha256 = "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9"; }; - patches = [ - # https://nvd.nist.gov/vuln/detail/CVE-2018-25032 - # https://github.com/madler/zlib/commit/5c44459c3b28a9bd3283aaceab7c615f8020c531 - ./CVE-2018-25032-1.patch - # https://github.com/madler/zlib/commit/4346a16853e19b45787ce933666026903fb8f3f8 - ./CVE-2018-25032-2.patch - ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ - ./disable-cygwin-widechar.patch - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' '${stdenv.cc.targetPrefix}ar' \ diff --git a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch b/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch deleted file mode 100644 index 3de4978c306..00000000000 --- a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gzguts.h b/gzguts.h -index 990a4d2..6378d46 100644 ---- a/gzguts.h -+++ b/gzguts.h -@@ -39,7 +39,7 @@ - # include - #endif - --#if defined(_WIN32) || defined(__CYGWIN__) -+#if defined(_WIN32) - # define WIDECHAR - #endif - From ebaefe3b6b92d3c75b2214ff7f6760e599448295 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 31 Mar 2022 20:54:17 +0200 Subject: [PATCH 672/685] zlib: remove leftover patches Sorry, mishap from my rebase I assume, since they were original part of the version bump to 1.2.12. --- .../libraries/zlib/CVE-2018-25032-1.patch | 346 ------------------ .../libraries/zlib/CVE-2018-25032-2.patch | 27 -- 2 files changed, 373 deletions(-) delete mode 100644 pkgs/development/libraries/zlib/CVE-2018-25032-1.patch delete mode 100644 pkgs/development/libraries/zlib/CVE-2018-25032-2.patch diff --git a/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch b/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch deleted file mode 100644 index 1ade02654e5..00000000000 --- a/pkgs/development/libraries/zlib/CVE-2018-25032-1.patch +++ /dev/null @@ -1,346 +0,0 @@ -From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001 -From: Mark Adler -Date: Tue, 17 Apr 2018 22:09:22 -0700 -Subject: [PATCH 1/2] Fix a bug that can crash deflate on some input when using - Z_FIXED. - -This bug was reported by Danilo Ramos of Eideticom, Inc. It has -lain in wait 13 years before being found! The bug was introduced -in zlib 1.2.2.2, with the addition of the Z_FIXED option. That -option forces the use of fixed Huffman codes. For rare inputs with -a large number of distant matches, the pending buffer into which -the compressed data is written can overwrite the distance symbol -table which it overlays. That results in corrupted output due to -invalid distances, and can result in out-of-bound accesses, -crashing the application. - -The fix here combines the distance buffer and literal/length -buffers into a single symbol buffer. Now three bytes of pending -buffer space are opened up for each literal or length/distance -pair consumed, instead of the previous two bytes. This assures -that the pending buffer cannot overwrite the symbol table, since -the maximum fixed code compressed length/distance is 31 bits, and -since there are four bytes of pending space for every three bytes -of symbol space. ---- - deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------- - deflate.h | 25 +++++++++---------- - trees.c | 50 +++++++++++-------------------------- - 3 files changed, 79 insertions(+), 70 deletions(-) - -diff --git a/deflate.c b/deflate.c -index 425babc..19cba87 100644 ---- a/deflate.c -+++ b/deflate.c -@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - int wrap = 1; - static const char my_version[] = ZLIB_VERSION; - -- ushf *overlay; -- /* We overlay pending_buf and d_buf+l_buf. This works since the average -- * output size for (length,distance) codes is <= 24 bits. -- */ -- - if (version == Z_NULL || version[0] != my_version[0] || - stream_size != sizeof(z_stream)) { - return Z_VERSION_ERROR; -@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - - s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ - -- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); -- s->pending_buf = (uchf *) overlay; -- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); -+ /* We overlay pending_buf and sym_buf. This works since the average size -+ * for length/distance pairs over any compressed block is assured to be 31 -+ * bits or less. -+ * -+ * Analysis: The longest fixed codes are a length code of 8 bits plus 5 -+ * extra bits, for lengths 131 to 257. The longest fixed distance codes are -+ * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest -+ * possible fixed-codes length/distance pair is then 31 bits total. -+ * -+ * sym_buf starts one-fourth of the way into pending_buf. So there are -+ * three bytes in sym_buf for every four bytes in pending_buf. Each symbol -+ * in sym_buf is three bytes -- two for the distance and one for the -+ * literal/length. As each symbol is consumed, the pointer to the next -+ * sym_buf value to read moves forward three bytes. From that symbol, up to -+ * 31 bits are written to pending_buf. The closest the written pending_buf -+ * bits gets to the next sym_buf symbol to read is just before the last -+ * code is written. At that time, 31*(n-2) bits have been written, just -+ * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at -+ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1 -+ * symbols are written.) The closest the writing gets to what is unread is -+ * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and -+ * can range from 128 to 32768. -+ * -+ * Therefore, at a minimum, there are 142 bits of space between what is -+ * written and what is read in the overlain buffers, so the symbols cannot -+ * be overwritten by the compressed data. That space is actually 139 bits, -+ * due to the three-bit fixed-code block header. -+ * -+ * That covers the case where either Z_FIXED is specified, forcing fixed -+ * codes, or when the use of fixed codes is chosen, because that choice -+ * results in a smaller compressed block than dynamic codes. That latter -+ * condition then assures that the above analysis also covers all dynamic -+ * blocks. A dynamic-code block will only be chosen to be emitted if it has -+ * fewer bits than a fixed-code block would for the same set of symbols. -+ * Therefore its average symbol length is assured to be less than 31. So -+ * the compressed data for a dynamic block also cannot overwrite the -+ * symbols from which it is being constructed. -+ */ -+ -+ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4); -+ s->pending_buf_size = (ulg)s->lit_bufsize * 4; - - if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || - s->pending_buf == Z_NULL) { -@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - deflateEnd (strm); - return Z_MEM_ERROR; - } -- s->d_buf = overlay + s->lit_bufsize/sizeof(ush); -- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; -+ s->sym_buf = s->pending_buf + s->lit_bufsize; -+ s->sym_end = (s->lit_bufsize - 1) * 3; -+ /* We avoid equality with lit_bufsize*3 because of wraparound at 64K -+ * on 16 bit machines and because stored blocks are restricted to -+ * 64K-1 bytes. -+ */ - - s->level = level; - s->strategy = strategy; -@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value) - - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; - s = strm->state; -- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3)) -+ if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) - return Z_BUF_ERROR; - do { - put = Buf_size - s->bi_valid; -@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source) - #else - deflate_state *ds; - deflate_state *ss; -- ushf *overlay; - - - if (deflateStateCheck(source) || dest == Z_NULL) { -@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source) - ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); - ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); - ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); -- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); -- ds->pending_buf = (uchf *) overlay; -+ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4); - - if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || - ds->pending_buf == Z_NULL) { -@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source) - zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); - - ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); -- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); -- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; -+ ds->sym_buf = ds->pending_buf + ds->lit_bufsize; - - ds->l_desc.dyn_tree = ds->dyn_ltree; - ds->d_desc.dyn_tree = ds->dyn_dtree; -@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush) - FLUSH_BLOCK(s, 1); - return finish_done; - } -- if (s->last_lit) -+ if (s->sym_next) - FLUSH_BLOCK(s, 0); - return block_done; - } -diff --git a/deflate.h b/deflate.h -index 23ecdd3..d4cf1a9 100644 ---- a/deflate.h -+++ b/deflate.h -@@ -217,7 +217,7 @@ typedef struct internal_state { - /* Depth of each subtree used as tie breaker for trees of equal frequency - */ - -- uchf *l_buf; /* buffer for literals or lengths */ -+ uchf *sym_buf; /* buffer for distances and literals/lengths */ - - uInt lit_bufsize; - /* Size of match buffer for literals/lengths. There are 4 reasons for -@@ -239,13 +239,8 @@ typedef struct internal_state { - * - I can't count above 4 - */ - -- uInt last_lit; /* running index in l_buf */ -- -- ushf *d_buf; -- /* Buffer for distances. To simplify the code, d_buf and l_buf have -- * the same number of elements. To use different lengths, an extra flag -- * array would be necessary. -- */ -+ uInt sym_next; /* running index in sym_buf */ -+ uInt sym_end; /* symbol table full when sym_next reaches this */ - - ulg opt_len; /* bit length of current block with optimal trees */ - ulg static_len; /* bit length of current block with static trees */ -@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, - - # define _tr_tally_lit(s, c, flush) \ - { uch cc = (c); \ -- s->d_buf[s->last_lit] = 0; \ -- s->l_buf[s->last_lit++] = cc; \ -+ s->sym_buf[s->sym_next++] = 0; \ -+ s->sym_buf[s->sym_next++] = 0; \ -+ s->sym_buf[s->sym_next++] = cc; \ - s->dyn_ltree[cc].Freq++; \ -- flush = (s->last_lit == s->lit_bufsize-1); \ -+ flush = (s->sym_next == s->sym_end); \ - } - # define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (uch)(length); \ - ush dist = (ush)(distance); \ -- s->d_buf[s->last_lit] = dist; \ -- s->l_buf[s->last_lit++] = len; \ -+ s->sym_buf[s->sym_next++] = dist; \ -+ s->sym_buf[s->sym_next++] = dist >> 8; \ -+ s->sym_buf[s->sym_next++] = len; \ - dist--; \ - s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ - s->dyn_dtree[d_code(dist)].Freq++; \ -- flush = (s->last_lit == s->lit_bufsize-1); \ -+ flush = (s->sym_next == s->sym_end); \ - } - #else - # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) -diff --git a/trees.c b/trees.c -index 4f4a650..decaeb7 100644 ---- a/trees.c -+++ b/trees.c -@@ -416,7 +416,7 @@ local void init_block(s) - - s->dyn_ltree[END_BLOCK].Freq = 1; - s->opt_len = s->static_len = 0L; -- s->last_lit = s->matches = 0; -+ s->sym_next = s->matches = 0; - } - - #define SMALLEST 1 -@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) - - Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", - opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, -- s->last_lit)); -+ s->sym_next / 3)); - - if (static_lenb <= opt_lenb) opt_lenb = static_lenb; - -@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) - unsigned dist; /* distance of matched string */ - unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ - { -- s->d_buf[s->last_lit] = (ush)dist; -- s->l_buf[s->last_lit++] = (uch)lc; -+ s->sym_buf[s->sym_next++] = dist; -+ s->sym_buf[s->sym_next++] = dist >> 8; -+ s->sym_buf[s->sym_next++] = lc; - if (dist == 0) { - /* lc is the unmatched char */ - s->dyn_ltree[lc].Freq++; -@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) - s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; - s->dyn_dtree[d_code(dist)].Freq++; - } -- --#ifdef TRUNCATE_BLOCK -- /* Try to guess if it is profitable to stop the current block here */ -- if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { -- /* Compute an upper bound for the compressed length */ -- ulg out_length = (ulg)s->last_lit*8L; -- ulg in_length = (ulg)((long)s->strstart - s->block_start); -- int dcode; -- for (dcode = 0; dcode < D_CODES; dcode++) { -- out_length += (ulg)s->dyn_dtree[dcode].Freq * -- (5L+extra_dbits[dcode]); -- } -- out_length >>= 3; -- Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", -- s->last_lit, in_length, out_length, -- 100L - out_length*100L/in_length)); -- if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; -- } --#endif -- return (s->last_lit == s->lit_bufsize-1); -- /* We avoid equality with lit_bufsize because of wraparound at 64K -- * on 16 bit machines and because stored blocks are restricted to -- * 64K-1 bytes. -- */ -+ return (s->sym_next == s->sym_end); - } - - /* =========================================================================== -@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree) - { - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ -- unsigned lx = 0; /* running index in l_buf */ -+ unsigned sx = 0; /* running index in sym_buf */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ - -- if (s->last_lit != 0) do { -- dist = s->d_buf[lx]; -- lc = s->l_buf[lx++]; -+ if (s->sym_next != 0) do { -+ dist = s->sym_buf[sx++] & 0xff; -+ dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8; -+ lc = s->sym_buf[sx++]; - if (dist == 0) { - send_code(s, lc, ltree); /* send a literal byte */ - Tracecv(isgraph(lc), (stderr," '%c' ", lc)); -@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree) - } - } /* literal or match pair ? */ - -- /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ -- Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, -- "pendingBuf overflow"); -+ /* Check that the overlay between pending_buf and sym_buf is ok: */ -+ Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow"); - -- } while (lx < s->last_lit); -+ } while (sx < s->sym_next); - - send_code(s, END_BLOCK, ltree); - } --- -2.33.1 - diff --git a/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch b/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch deleted file mode 100644 index dadc904a07f..00000000000 --- a/pkgs/development/libraries/zlib/CVE-2018-25032-2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4346a16853e19b45787ce933666026903fb8f3f8 Mon Sep 17 00:00:00 2001 -From: Mark Adler -Date: Tue, 17 Apr 2018 22:44:41 -0700 -Subject: [PATCH 2/2] Assure that the number of bits for deflatePrime() is - valid. - ---- - deflate.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/deflate.c b/deflate.c -index 19cba87..23aef18 100644 ---- a/deflate.c -+++ b/deflate.c -@@ -589,7 +589,8 @@ int ZEXPORT deflatePrime (strm, bits, value) - - if (deflateStateCheck(strm)) return Z_STREAM_ERROR; - s = strm->state; -- if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) -+ if (bits < 0 || bits > 16 || -+ s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3)) - return Z_BUF_ERROR; - do { - put = Buf_size - s->bi_valid; --- -2.33.1 - From 40a18fbf7c677d7f34755a6b567e6d756a7c84b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 27 Mar 2022 10:06:53 -0600 Subject: [PATCH 673/685] steam-fhs: remove unecessary symlink --- pkgs/games/steam/fhsenv.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index c5fba68b22a..d18accd0d54 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -206,12 +206,6 @@ in buildFHSUserEnv rec { ++ steamPackages.steam-runtime-wrapped.overridePkgs ++ extraLibraries pkgs; - extraBuildCommands = '' - ln -s /usr/lib/libbz2.so usr/lib/libbz2.so.1.0 - '' + lib.optionalString (steam-runtime-wrapped-i686 != null) '' - ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0 - ''; - extraInstallCommands = '' mkdir -p $out/share/applications ln -s ${steam}/share/icons $out/share @@ -269,7 +263,7 @@ in buildFHSUserEnv rec { name = "steam-run"; targetPkgs = commonTargetPkgs; - inherit multiPkgs extraBuildCommands profile extraInstallCommands; + inherit multiPkgs profile extraInstallCommands; inherit unshareIpc unsharePid; From 60543c4f9ee05091a0b7aab3620adbc3eeef4b2c Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Sun, 3 Apr 2022 22:29:02 -0400 Subject: [PATCH 674/685] go: Drop unnecessary backslash-escape MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's no backslash interpretation going on within single-quote strings which means there's no need to escape the backslash. Since this was going on within single-quote strings the $exclude variable ended up having 2 backslashes (`\\`) instead of the intended single backslash. This meant that the regex that was built up was incorrect. For example prometheus' exclude contents before and after this change are: ✕: \(/_\|examples\|Godeps\|testdata\\|documentation/prometheus-mixin\) ✓: \(/_\|examples\|Godeps\|testdata\|documentation/prometheus-mixin\) --- pkgs/development/go-modules/generic/default.nix | 2 +- pkgs/development/go-packages/generic/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index f986d164ee8..e2428edbb26 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -176,7 +176,7 @@ let IFS=' ' read -r -a excludedArr <<<$excludedPackages printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}" excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf - exclude+='\\|'"$excludedAlternates" + exclude+='\|'"$excludedAlternates" fi exclude+='\)' diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 6e96f443ff9..3d633324eef 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -155,7 +155,7 @@ let IFS=' ' read -r -a excludedArr <<<$excludedPackages printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}" excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf - exclude+='\\|'"$excludedAlternates" + exclude+='\|'"$excludedAlternates" fi exclude+='\)' From f91a565fe3c392b909c6293198718c49ce35fb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 4 Apr 2022 18:57:06 +0200 Subject: [PATCH 675/685] gnat*: fixup build with glibc-2.34 --- pkgs/development/compilers/gcc/6/default.nix | 1 + .../compilers/gcc/6/gnat-glibc234.patch | 30 +++++++++++++++++++ pkgs/development/compilers/gcc/9/default.nix | 5 ++++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/compilers/gcc/6/gnat-glibc234.patch diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 5191c3b461b..a577c61bdf5 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -74,6 +74,7 @@ let majorVersion = "6"; ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch + ++ optional langAda ./gnat-glibc234.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch diff --git a/pkgs/development/compilers/gcc/6/gnat-glibc234.patch b/pkgs/development/compilers/gcc/6/gnat-glibc234.patch new file mode 100644 index 00000000000..2d29cd7fa77 --- /dev/null +++ b/pkgs/development/compilers/gcc/6/gnat-glibc234.patch @@ -0,0 +1,30 @@ +Fix build with glibc 2.34. Adapted from: +https://github.com/gcc-mirror/gcc/commit/331763de7d4850702a0f67298f36017c73cdb103 +--- a/gcc/ada/init.c ++++ b/gcc/ada/init.c +@@ -579,12 +579,8 @@ + + #ifndef __ia64__ + #define HAVE_GNAT_ALTERNATE_STACK 1 +-/* This must be in keeping with System.OS_Interface.Alternate_Stack_Size. +- It must be larger than MINSIGSTKSZ and hopefully near 2 * SIGSTKSZ. */ +-# if 16 * 1024 < MINSIGSTKSZ +-# error "__gnat_alternate_stack too small" +-# endif +-char __gnat_alternate_stack[16 * 1024]; ++/* This must be in keeping with System.OS_Interface.Alternate_Stack_Size. */ ++char __gnat_alternate_stack[32 * 1024]; + #endif + + #ifdef __XENO__ +--- a/gcc/ada/s-osinte-linux.ads ++++ b/gcc/ada/s-osinte-linux.ads +@@ -328,7 +328,7 @@ + oss : access stack_t) return int; + pragma Import (C, sigaltstack, "sigaltstack"); + +- Alternate_Stack_Size : constant := 16 * 1024; ++ Alternate_Stack_Size : constant := 32 * 1024; + -- This must be in keeping with init.c:__gnat_alternate_stack + + Alternate_Stack : aliased char_array (1 .. Alternate_Stack_Size); diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index a96a23da2ce..dd1a53e172a 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -83,6 +83,11 @@ let majorVersion = "9"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ ++ optional langAda ../gnat-cflags.patch + ++ optional langAda (fetchpatch { + name = "gnat-glibc-234.diff"; + url = "https://github.com/gcc-mirror/gcc/commit/331763de7d4850702a0f67298f36017c73cdb103.diff"; + sha256 = "eS4B7vJasnv2N+5v5yB8/iDpKPX8CJDAy2xabWWj+aU="; + }) ++ optional langD ../libphobos.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch From 5e862dc72965ceb2f68d9c48f5780cd75fd8982a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 4 Apr 2022 19:10:28 +0200 Subject: [PATCH 676/685] fltk: don't build PDF docs - it was broken, probably after doxygen update: https://hydra.nixos.org/build/171898654 - HTML is more than enough nowadays, I believe - the texlive-medium build-dep was relatively expensive --- pkgs/development/libraries/fltk/common.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix index 06e1c05c7d0..54c8b4094f1 100644 --- a/pkgs/development/libraries/fltk/common.nix +++ b/pkgs/development/libraries/fltk/common.nix @@ -36,7 +36,6 @@ , withDocs ? true , doxygen , graphviz -, texlive , withExamples ? true , withShared ? true @@ -44,11 +43,6 @@ let onOff = value: if value then "ON" else "OFF"; - tex = texlive.combine { - inherit (texlive) - scheme-medium varwidth multirow hanging adjustbox collectbox stackengine - sectsty tocloft newunicodechar etoc; - }; in stdenv.mkDerivation rec { pname = "fltk"; @@ -81,7 +75,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withDocs [ doxygen graphviz - tex ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -149,9 +142,9 @@ stdenv.mkDerivation rec { # Docs "-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}" - "-DOPTION_BUILD_PDF_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_BUILD_PDF_DOCUMENTATION=OFF" "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}" - "-DOPTION_INSTALL_PDF_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF" "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}" ]; From c1ef87e8d02273c9814444cedb3bac6669e07834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 4 Apr 2022 19:54:28 +0200 Subject: [PATCH 677/685] stdenv bootstrap tools: adjust with glibc-2.34 https://hydra.nixos.org/build/171494041 --- .../linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index f394869ea91..8259ee2cafc 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -29,8 +29,9 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" done +# With glibc-2.34 the librt so-file is named a bit differently and doesn't need patchelfing. for i in $out/lib/librt-*.so $out/lib/libpcre*; do - if [ -L "$i" ]; then continue; fi + if [ -L "$i" ] || [ ! -e "$i" ]; then continue; fi echo patching "$i" $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" done From 4f30fc6b4d94d1099934dd3629e31c8f658ae86d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 4 Apr 2022 20:38:46 +0200 Subject: [PATCH 678/685] python2.pkgs.pycairo: workaround to fix build --- pkgs/development/python2-modules/pycairo/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python2-modules/pycairo/default.nix b/pkgs/development/python2-modules/pycairo/default.nix index 9da4da1479c..eefc69a3323 100644 --- a/pkgs/development/python2-modules/pycairo/default.nix +++ b/pkgs/development/python2-modules/pycairo/default.nix @@ -3,7 +3,7 @@ , meson , ninja , buildPythonPackage -, pytestCheckHook +, pytest , pkg-config , cairo , python @@ -32,9 +32,11 @@ buildPythonPackage rec { cairo ]; - checkInputs = [ - pytestCheckHook - ]; + # HACK: Don't use the pytestCheckHook because PYTHONPATH + # will be added by the Python setuptook breaking meson. + checkPhase = '' + ${pytest}/bin/pytest + ''; mesonFlags = [ # This is only used for figuring out what version of Python is in From e66ed266f84ef795a4a47b938253e25dc5f65b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 4 Apr 2022 20:32:42 +0200 Subject: [PATCH 679/685] Revert "stdenv bootstrap tools: adjust with glibc-2.34" This reverts commit c1ef87e8d02273c9814444cedb3bac6669e07834. I didn't realize that it would rebuild all linux stdenvs; I certainly don't want to incur such a rebuild at this point. --- .../linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index 8259ee2cafc..f394869ea91 100644 --- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -29,9 +29,8 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" done -# With glibc-2.34 the librt so-file is named a bit differently and doesn't need patchelfing. for i in $out/lib/librt-*.so $out/lib/libpcre*; do - if [ -L "$i" ] || [ ! -e "$i" ]; then continue; fi + if [ -L "$i" ]; then continue; fi echo patching "$i" $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" done From 6fd0d1bb4b89366eb34476f4f89f54e21a9752eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 4 Apr 2022 20:39:09 +0200 Subject: [PATCH 680/685] stdenv bootstrap tools: adjust with glibc-2.34 (2nd try) This time without rebuilding stdenvs. --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 84b63e7b8fd..1d6ebe6284f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -74,6 +74,9 @@ in with pkgs; rec { cp -d ${libc.out}/lib/libresolv*.so* $out/lib cp -d ${libc.out}/lib/crt?.o $out/lib + # Hacky compat with our current unpack-bootstrap-tools.sh + ln -s librt.so "$out"/lib/librt-dummy.so + cp -rL ${libc.dev}/include $out chmod -R u+w "$out" From 937c8665307f1a67eb01a60b5f587edde53b2acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 Apr 2022 07:52:46 +0200 Subject: [PATCH 681/685] systemdStage1: drop passing the removed parameter Dropped in 0c852e1fa6 (syntax error). If I looked at history right, it has never been used (but indirectly through cryptsetup). I expect it's a remnant of different attempts at breaking depenency cycle which we now solve through systemdMinimal. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 383fe215f6a..ebed2b787a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23377,7 +23377,7 @@ with pkgs; withCryptsetup = true; withFido2 = true; withTpm2Tss = true; - inherit lvm2 libfido2 p11-kit; + inherit libfido2 p11-kit; }; systemdStage1Network = systemdStage1.override { pname = "systemd-stage-1-network"; From 8318d8b0328ec7d5802c460ce251de1650296e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 5 Apr 2022 07:52:46 +0100 Subject: [PATCH 682/685] systemdStage1: Fix building with 250 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index debefb2bc85..83015e1c633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23381,7 +23381,6 @@ with pkgs; withCryptsetup = true; withFido2 = true; withTpm2Tss = true; - inherit libfido2 p11-kit; }; systemdStage1Network = systemdStage1.override { pname = "systemd-stage-1-network"; From 249aa8d8dc0fc893b023442af0951576d185ac3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 Apr 2022 14:46:47 +0200 Subject: [PATCH 683/685] Revert "plasma5Packages.kitinerary: fix build with Poppler 22.03" This reverts commit 9adc2089f943115bc7634ba7e381e9c4ed072188. Clash with update; the patch is already contained and won't apply. --- pkgs/applications/kde/kitinerary.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index 83763ba965a..f69e705bb2f 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchpatch, lib, extra-cmake-modules +{ mkDerivation, lib, extra-cmake-modules , qtdeclarative, ki18n, kmime, kpkpass , poppler, kcontacts, kcalendarcore , shared-mime-info @@ -10,15 +10,6 @@ mkDerivation { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; }; - - patches = [ - # Fix build with poppler 22.03 - (fetchpatch { - url = "https://github.com/KDE/kitinerary/commit/e21d1ffc5fa81a636245f49c97fe7cda63abbb1d.patch"; - sha256 = "1/zgq9QIOCPplqplDqgpoqzuYFf/m1Ixxawe50t2F04="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules shared-mime-info # for update-mime-database From db57a90dccb2b0fc0b6d5302f08365db1e4db81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 Apr 2022 15:11:56 +0200 Subject: [PATCH 684/685] qt5*.qtwayland: deconflict patching This fixes build in qt514 case. The usual way here is to provide patches for each qt5 version separately. No other module adds them in this generic way. The problem is when you combine the approaches; qtModule will only take the list from the module and ignore the version-specific list. --- pkgs/development/libraries/qt-5/5.12/default.nix | 6 ++++++ pkgs/development/libraries/qt-5/5.14/default.nix | 8 +++++++- pkgs/development/libraries/qt-5/5.15/default.nix | 6 ++++++ pkgs/development/libraries/qt-5/modules/qtwayland.nix | 6 ------ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 01b65eb3e43..a3664ae9e05 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -84,6 +84,12 @@ let qtlocation = [ ./qtlocation-gcc-9.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; + qtwayland = [ + # NixOS-specific, ensure that app_id is correctly determined for + # wrapped executables from `wrapQtAppsHook` (see comment in patch for further + # context). Beware: shared among different Qt5 versions. + ../modules/qtwayland-app_id.patch + ]; qtwebengine = [ # glibc 2.34 compat (fetchpatch { diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 5a3bf205fbc..15c85961adc 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -126,7 +126,13 @@ let ./qtwebkit-darwin-no-qos-classes.patch ]; qttools = [ ./qttools.patch ]; - qtwayland = [ ./qtwayland-libdrm-build.patch ]; + qtwayland = [ + ./qtwayland-libdrm-build.patch + # NixOS-specific, ensure that app_id is correctly determined for + # wrapped executables from `wrapQtAppsHook` (see comment in patch for further + # context). Beware: shared among different Qt5 versions. + ../modules/qtwayland-app_id.patch + ]; }; addPackages = self: with self; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5943a80a701..946c196f4a2 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -60,6 +60,12 @@ let ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ]; + qtwayland = [ + # NixOS-specific, ensure that app_id is correctly determined for + # wrapped executables from `wrapQtAppsHook` (see comment in patch for further + # context). Beware: shared among different Qt5 versions. + ../modules/qtwayland-app_id.patch + ]; qtwebkit = [ (fetchpatch { name = "qtwebkit-bison-3.7-build.patch"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index edb15b0b48b..1bd1adedaf0 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -6,10 +6,4 @@ qtModule { buildInputs = [ wayland ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" "bin" ]; - patches = [ - # NixOS-specific, ensure that app_id is correctly determined for - # wrapped executables from `wrapQtAppsHook` (see comment in patch for further - # context). - ./qtwayland-app_id.patch - ]; } From 6427998d85dffc8d3cd724f358ed4af8e4961398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 Apr 2022 18:54:45 +0200 Subject: [PATCH 685/685] nixosTests.installer.*: provide a missing dependency See errors in these three jobs: https://hydra.nixos.org/eval/1753111#tabs-still-fail It's a bit unpleasant that a single run of each test takes almost an hour for me (half an hour on Hydra in some cases). --- nixos/tests/installer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 2cfadf85c93..30a5b5c45b3 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -312,6 +312,7 @@ let desktop-file-utils docbook5 docbook_xsl_ns + kmod.dev libxml2.bin libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom