diff options
Diffstat (limited to 'pkgs/development/libraries')
88 files changed, 1454 insertions, 1238 deletions
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d8d81492f91..1ce2b1525f0 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -22,6 +22,9 @@ , waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , wayland , wayland-protocols +, drmSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, libdrm +, mesa , libxkbcommon , dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , dbus @@ -92,7 +95,8 @@ stdenv.mkDerivation rec { ++ optional pulseaudioSupport libpulseaudio ++ optional udevSupport udev ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] - ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]; + ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] + ++ optionals drmSupport [ libdrm mesa ]; buildInputs = [ libiconv ] ++ dlopenBuildInputs diff --git a/pkgs/development/libraries/argagg/0001-catch.diff b/pkgs/development/libraries/argagg/0001-catch.diff new file mode 100644 index 00000000000..f99649d5681 --- /dev/null +++ b/pkgs/development/libraries/argagg/0001-catch.diff @@ -0,0 +1,20 @@ +--- old/test/doctest.h 2019-03-05 18:04:06.143740733 +0300 ++++ new/test/doctest.h 2019-03-05 18:04:43.577284916 +0300 +@@ -1307,7 +1307,7 @@ + __FILE__, __LINE__, #expr, #as); \ + try { \ + expr; \ +- } catch(as) { \ ++ } catch(as e) { \ + _DOCTEST_RB.m_threw = true; \ + _DOCTEST_RB.m_threw_as = true; \ + } catch(...) { _DOCTEST_RB.m_threw = true; } \ +@@ -1332,7 +1332,7 @@ + #define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS) + + #define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS) +-#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS) ++#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, const ex &, DT_CHECK_THROWS_AS) + #define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS) + + #define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW) diff --git a/pkgs/development/libraries/argagg/default.nix b/pkgs/development/libraries/argagg/default.nix new file mode 100644 index 00000000000..7ff9eaac1e3 --- /dev/null +++ b/pkgs/development/libraries/argagg/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "argagg"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "vietjtnguyen"; + repo = pname; + rev = version; + hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o="; + }; + + patches = [ + # Fix compilation of macro catch statement + ./0001-catch.diff + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + homepage = "https://github.com/vietjtnguyen/argagg"; + description = "Argument Aggregator"; + longDescription = '' + argagg is yet another C++ command line argument/option parser. It was + written as a simple and idiomatic alternative to other frameworks like + getopt, Boost program options, TCLAP, and others. The goal is to achieve + the majority of argument parsing needs in a simple manner with an easy to + use API. It operates as a single pass over all arguments, recognizing + flags prefixed by - (short) or -- (long) and aggregating them into easy to + access structures with lots of convenience functions. It defers processing + types until you access them, so the result structures end up just being + pointers into the original command line argument C-strings. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; all; + badPlatforms = [ "aarch64-darwin" ]; + }; +} diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix new file mode 100644 index 00000000000..35a79e3b358 --- /dev/null +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -0,0 +1,66 @@ +{ config +, lib +, stdenv +, fetchurl +, zlib +, pkg-config +, mpg123 +, libogg +, libvorbis +, portaudio +, libsndfile +, flac +, usePulseAudio ? config.pulseaudio or stdenv.isLinux +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "libopenmpt"; + version = "0.6.2"; + + outputs = [ "out" "dev" "bin" ]; + + src = fetchurl { + url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; + sha256 = "1dp645gg6d3pzjh82srq1d7qvyxi5h22k7yfdjiyzbyry8pxdh2h"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + zlib + mpg123 + libogg + libvorbis + portaudio + libsndfile + flac + ] ++ lib.optional usePulseAudio libpulseaudio; + + configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; + + doCheck = true; + + postFixup = '' + moveToOutput share/doc $dev + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Cross-platform C++ and C library to decode tracked music files into a raw PCM audio stream"; + longDescription = '' + libopenmpt is a cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream. + openmpt123 is a cross-platform command-line or terminal based module file player. + libopenmpt is based on the player code of the OpenMPT project. + ''; + homepage = "https://lib.openmpt.org/libopenmpt/"; + license = licenses.bsd3; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/audio/libopenmpt/update.sh b/pkgs/development/libraries/audio/libopenmpt/update.sh new file mode 100755 index 00000000000..2d4e5afac0b --- /dev/null +++ b/pkgs/development/libraries/audio/libopenmpt/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl xmlstarlet + +attr=libopenmpt + +set -eu -o pipefail + +# Get update notifications, remove updates for libopenmpt-modplug, find latest eligible & extract versions +versions="$( + curl -s 'https://lib.openmpt.org/libopenmpt/feed.xml' | + xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | + grep -v 'libopenmpt-modplug' | head -n1 | + grep -Eo '([0-9][^,\s]+)' | tr '\n' ' ' +)" +echo "Latest $attr versions: $versions" + +# Find a version that is > current version and not a rc +# rc's have different download path and a full release will usually follow shortly +currentVersion="$(nix-instantiate --eval -E "with import ./. {}; $attr.version" | tr -d '"')" +echo "Current $attr version: $currentVersion" +for version in $versions; do + (echo "$version" | grep -q 'rc') && continue + [ "$version" = "$(printf '%s\n%s' "$version" "$currentVersion" | sort -V | head -n1)" ] && continue + + echo "Updating to $version. Please check if other versions qualify for backport to stable!" + update-source-version "$attr" "$version" + exit 0 +done + +echo "No version eligible for bump." +exit 0 diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index a29fda0ec2b..14b0d4c5e46 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; + dontAddWafCrossFlags = true; passthru.tests = { inherit pipewire; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index d0ef2e65c59..6371a52b4df 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook + python3 ]; buildInputs = [ @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; + dontAddWafCrossFlags = true; passthru.tests = { inherit pipewire; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 1a40d249fd5..67a66dbfe5a 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ lv2 serd sord ]; + dontAddWafCrossFlags = true; meta = with lib; { homepage = "http://drobilla.net/software/sratom"; diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index f5b5dfaeebc..6fb04fbb3a2 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-jYeyNEoJsF67XQAkmC7oegnIRBRD3FXKf5wF/NCVb4o="; + sha256 = "sha256-G+ykP39EmI8BCeulTsZ/OSFKRzXVbEK0+mtJ3tugl5M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 769cc2d3bd2..3cd846c87a1 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,7 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, s2n-tls, zlib +{ lib +, stdenv +, fetchFromGitHub +, cmake +, curl +, openssl +, s2n-tls +, zlib , aws-crt-cpp -, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums -, CoreAudio, AudioToolbox +, aws-c-cal +, aws-c-common +, aws-c-event-stream +, aws-c-io +, aws-checksums +, CoreAudio +, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -18,16 +30,31 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.9.150"; + version = "1.9.238"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY="; + sha256 = "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY="; }; postPatch = '' + # Missing includes for GCC11 + sed '5i#include <thread>' -i \ + aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \ + aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \ + aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \ + aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \ + aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \ + aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \ + aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \ + aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \ + aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \ + aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \ + aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \ + aws-cpp-sdk-transfer-tests/TransferTests.cpp # Flaky on Hydra rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp # Includes aws-c-auth private headers, so only works with submodule build @@ -82,12 +109,6 @@ stdenv.mkDerivation rec { patches = [ ./cmake-dirs.patch - - # fix cmake config - (fetchpatch { - url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff"; - sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0="; - }) ]; # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 4032734416e..e1b517f66bf 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -30,9 +30,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" ]; NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=cast-function-type" "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" - "-Wno-error=cast-function-type" + "-Wno-error=stringop-overflow" ]; propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox ]; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 6f0eb8dfff0..c767e9f1d2f 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + meta = with lib; { description = "Core library for full-featured text search engine"; longDescription = '' diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 839ddb9b76f..315a477e72a 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { buildInputs = [ curl ]; propagatedBuildInputs = [ nlohmann_json ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=range-loop-construct" + ]; + meta = with lib; { description = "IPFS C++ API client library"; homepage = "https://github.com/vasild/cpp-ipfs-api"; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 9f7d020feaf..d7fe4e92802 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -14,20 +14,28 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ]; + buildInputs = [ + qtbase + grantlee + ] ++ lib.optionals stdenv.isLinux [ + libuuid + libcap + uwsgi + pcre + ]; cmakeFlags = [ - "-DPLUGIN_UWSGI=ON" + "-DPLUGIN_UWSGI=${if stdenv.isLinux then "ON" else "OFF"}" # Missing uwsgi symbols on Darwin "-DPLUGIN_STATICCOMPRESSED=ON" "-DPLUGIN_CSRFPROTECTION=ON" "-DPLUGIN_VIEW_GRANTLEE=ON" ]; - preBuild = '' + preBuild = lib.optionalString stdenv.isLinux '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/Cutelyst:`pwd`/EventLoopEPoll" ''; - postBuild = '' + postBuild = lib.optionalString stdenv.isLinux '' unset LD_LIBRARY_PATH ''; @@ -35,6 +43,7 @@ stdenv.mkDerivation rec { description = "C++ Web Framework built on top of Qt"; homepage = "https://cutelyst.org/"; license = licenses.lgpl21Plus; + platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index baf2b102437..58601c39a57 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "21.10"; + version = "22.02"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-gh/QYH25j9A+XalW6ajRjs+yOYEfkZmw11CHjR6LK1E="; + sha256 = "sha256-qjXFpxoFF70aOaEq9/JfI2DtFxxHjyK2OnDaXMiqQMM="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index 6b40814119c..488cb6846d0 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=misleading-indentation" + "-Wno-error=stringop-overflow" + ]; + meta = { description = "FlatBuffers Compiler and Library in C for C "; homepage = "https://github.com/dvidelabs/flatcc"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 5dfd5637002..7f906e19224 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "freetype"; - version = "2.11.1"; + version = "2.12.0"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MzOufP2ohCnJenrmO30BqzmAdsO2cYLpYOVoQFDyxcg="; + sha256 = "sha256-71wzaqzBoHn/kmLWMI1sKgZt1NKpBTAcSt2ps1Q5kDM="; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 90fe4658267..84d54b3bc35 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPTwN5DuUFPqLDwq73KvmBR8tEN5bIX6/JOZMfOAoow="; + sha256 = "sha256-g1o/udsIFLJ+gunvI2QtsnksPaa946jWKkcdmdGmQ/k="; }; passthru = { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 386130cc622..97da2a7c3be 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -69,6 +69,12 @@ stdenv.mkDerivation rec { ./glib-appinfo-watch.patch ./schema-override-variable.patch + # Add support for the GNOME’s default terminal emulator. + # https://gitlab.gnome.org/GNOME/glib/-/issues/2618 + ./gnome-console-support.patch + # Do the same for Pantheon’s terminal emulator. + ./elementary-terminal-support.patch + # GLib contains many binaries used for different purposes; # we will install them to different outputs: # 1. Tools for desktop environment ($bin) diff --git a/pkgs/development/libraries/glib/elementary-terminal-support.patch b/pkgs/development/libraries/glib/elementary-terminal-support.patch new file mode 100644 index 00000000000..0b8c8a70871 --- /dev/null +++ b/pkgs/development/libraries/glib/elementary-terminal-support.patch @@ -0,0 +1,16 @@ +diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c +index a441bfec9..6bcd3e690 100644 +--- a/gio/gdesktopappinfo.c ++++ b/gio/gdesktopappinfo.c +@@ -2678,6 +2678,11 @@ prepend_terminal_to_vector (int *argc, + if (check != NULL) + pass_cmd_as_single_arg = TRUE; + } ++ if (check == NULL) { ++ check = g_find_program_in_path ("io.elementary.terminal"); ++ if (check != NULL) ++ pass_cmd_as_single_arg = TRUE; ++ } + if (check == NULL) + check = g_find_program_in_path ("tilix"); + if (check == NULL) diff --git a/pkgs/development/libraries/glib/gnome-console-support.patch b/pkgs/development/libraries/glib/gnome-console-support.patch new file mode 100644 index 00000000000..7f6894a5cec --- /dev/null +++ b/pkgs/development/libraries/glib/gnome-console-support.patch @@ -0,0 +1,55 @@ +diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c +index 60d6debb2..a441bfec9 100644 +--- a/gio/gdesktopappinfo.c ++++ b/gio/gdesktopappinfo.c +@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc, + int i, j; + char **term_argv = NULL; + int term_argc = 0; ++ gboolean pass_cmd_as_single_arg = FALSE; + char *check; + char **the_argv; + +@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc, + } + else + { ++ if (check == NULL) { ++ check = g_find_program_in_path ("kgx"); ++ if (check != NULL) ++ pass_cmd_as_single_arg = TRUE; ++ } + if (check == NULL) + check = g_find_program_in_path ("tilix"); + if (check == NULL) +@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc, + } + } + +- real_argc = term_argc + *argc; ++ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc); + real_argv = g_new (char *, real_argc + 1); + + for (i = 0; i < term_argc; i++) + real_argv[i] = term_argv[i]; + +- for (j = 0; j < *argc; j++, i++) +- real_argv[i] = (char *)the_argv[j]; ++ if (pass_cmd_as_single_arg) { ++ char **quoted_argv = g_new (char *, *argc + 1); ++ ++ for (j = 0; j < *argc; j++) { ++ quoted_argv[j] = g_shell_quote (the_argv[j]); ++ g_free (the_argv[j]); ++ } ++ quoted_argv[j] = NULL; ++ ++ real_argv[i++] = g_strjoinv (" ", quoted_argv); ++ g_strfreev (quoted_argv); ++ } else { ++ for (j = 0; j < *argc; j++, i++) ++ real_argv[i] = (char *)the_argv[j]; ++ } + + real_argv[i] = NULL; + diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 81b0b47d5ba..d4c836b6912 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + NIX_CFLAGS_COMPILE = + lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-fno-ipa-modref" # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823 + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=OFF" "-DBUILD_STATIC_LIBS=OFF" diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 72758a1b3e7..98ae294c480 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,27 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, gflags, perl }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags, perl }: stdenv.mkDerivation rec { pname = "glog"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "glog"; rev = "v${version}"; - sha256 = "17014q25c99qyis6l3fwxidw6222bb269fdlr74gn7pzmzg4lvg3"; + sha256 = "sha256-xqRp9vaauBkKz2CXbh/Z4TWqhaUtqfbsSlbYZR/kW9s="; }; - patches = [ - # Fix duplicate-concatenated nix store path in cmake file, see: - # https://github.com/NixOS/nixpkgs/pull/144561#issuecomment-960296043 - # TODO: Remove when https://github.com/google/glog/pull/733 is merged and available. - (fetchpatch { - name = "glog-cmake-Fix-incorrect-relative-path-concatenation.patch"; - url = "https://github.com/google/glog/pull/733/commits/57c636c02784f909e4b5d3c2f0ecbdbb47097266.patch"; - sha256 = "1py93gkzmcyi2ypcwyj3nri210z8fmlaif51yflzmrrv507zd7bi"; - }) - ]; - nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ gflags ]; @@ -35,6 +24,8 @@ stdenv.mkDerivation rec { # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed doCheck = !stdenv.isDarwin; + # There are some non-thread safe tests that can fail + enableParallelChecking = false; checkInputs = [ perl ]; meta = with lib; { diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch index 9111217ea08..36d81ca9f13 100644 --- a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch +++ b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch @@ -1,12 +1,12 @@ -From 57bed86429db9d871f1442c94f14e94e38972ca3 Mon Sep 17 00:00:00 2001 +From d68fcb793d70032e978ecf8e0577eea955a741cf Mon Sep 17 00:00:00 2001 From: worldofpeace <worldofpeace@protonmail.ch> -Date: Thu, 16 May 2019 21:15:15 -0400 +Date: Sun, 10 Apr 2022 12:02:10 +0800 Subject: [PATCH] meson: add options for tests installation dirs --- meson_options.txt | 6 ++++++ - tests/meson.build | 23 ++++++++++++++++------- - 2 files changed, 22 insertions(+), 7 deletions(-) + tests/meson.build | 13 +++++++++++-- + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index b9a2fb5..4b8629f 100644 @@ -23,7 +23,7 @@ index b9a2fb5..4b8629f 100644 + value: '', + description: 'Installation directory for binary files in tests') diff --git a/tests/meson.build b/tests/meson.build -index 77281f5..7522456 100644 +index 2b925e7..3276849 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -21,8 +21,17 @@ unit_tests = [ @@ -32,66 +32,20 @@ index 77281f5..7522456 100644 -installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path) -installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path) -+test_suffix = join_paths('installed-tests', graphene_api_path) ++installed_test_suffix = join_paths('installed-tests', graphene_api_path) + -+test_datadir = join_paths(get_option('installed_test_datadir'), test_suffix) -+if test_datadir == '' -+ test_datadir = join_paths(get_option('prefix'), get_option('datadir'), test_suffix) ++installed_test_datadir = join_paths(get_option('installed_test_datadir'), installed_test_suffix) ++if installed_test_datadir == '' ++ installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), installed_test_suffix) +endif + -+test_bindir = join_paths(get_option('installed_test_bindir'), test_suffix) -+if test_bindir == '' -+ test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), test_suffix) ++installed_test_bindir = join_paths(get_option('installed_test_bindir'), installed_test_suffix) ++if installed_test_bindir == '' ++ installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), installed_test_suffix) +endif # Make tests conditional on having mutest-1 installed system-wide, or # available as a subproject -@@ -40,13 +49,13 @@ if mutest_dep.found() - output: wrapper, - command: [ - gen_installed_test, -- '--testdir=@0@'.format(installed_test_bindir), -+ '--testdir=@0@'.format(test_bindir), - '--testname=@0@'.format(unit), - '--outdir=@OUTDIR@', - '--outfile=@0@'.format(wrapper), - ], - install: get_option('installed_tests'), -- install_dir: installed_test_datadir, -+ install_dir: test_datadir, - ) - - test(unit, -@@ -55,7 +64,7 @@ if mutest_dep.found() - include_directories: graphene_inc, - c_args: common_cflags, - install: get_option('installed_tests'), -- install_dir: installed_test_bindir, -+ install_dir: test_bindir, - ), - env: ['MUTEST_OUTPUT=tap'], - protocol: 'tap', -@@ -66,17 +75,18 @@ endif - if build_gir and host_system == 'linux' and not meson.is_cross_build() - foreach unit: ['introspection.py'] - wrapper = '@0@.test'.format(unit) -+ install_data(unit, install_dir: test_bindir) - custom_target(wrapper, - output: wrapper, - command: [ - gen_installed_test, -- '--testdir=@0@'.format(installed_test_bindir), -+ '--testdir=@0@'.format(test_bindir), - '--testname=@0@'.format(unit), - '--outdir=@OUTDIR@', - '--outfile=@0@'.format(wrapper), - ], - install: get_option('installed_tests'), -- install_dir: installed_test_datadir, -+ install_dir: test_datadir, - ) - - test(unit, -- -2.31.1 +2.35.1 diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 22c0e044f1e..b883c549da5 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { pname = "graphene"; - version = "1.10.6"; + version = "1.10.8"; outputs = [ "out" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" "installedTests" ]; @@ -26,12 +28,21 @@ stdenv.mkDerivation rec { owner = "ebassi"; repo = pname; rev = version; - sha256 = "v6YH3fRMTzhp7wmU8in9ukcavzHmOAW54EK9ZwQyFxc="; + sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI="; }; patches = [ # Add option for changing installation path of installed tests. ./0001-meson-add-options-for-tests-installation-dirs.patch + + # Disable flaky simd_operators_reciprocal test + # https://github.com/ebassi/graphene/issues/246 + (fetchpatch { + url = "https://github.com/ebassi/graphene/commit/4fbdd07ea3bcd0964cca3966010bf71cb6fa8209.patch"; + sha256 = "uFkkH0u4HuQ/ua1mfO7sJZ7MPrQdV/JON7mTYB4DW80="; + includes = [ "tests/simd.c" ]; + revert = true; + }) ]; depsBuildBuild = [ diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 37c2a1a4413..f55e2c2f6e4 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.44.0"; # N.B: if you change this, please update: + version = "1.45.2"; # 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-pG8RtAJJCLnxm+3hW1YsikyeNr9pjIRANeYhDJfTPbo="; + sha256 = "sha256-l2r1NdbfwViXfLcwbfUgLueqfAVnLzI+gdEarlkIqkI="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 085544a3612..acc143cd556 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -39,14 +39,20 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post-install.py ''; - # meson installs the schemas to share/glib-2.0/schemas - # We add the override file there too so it will be compiled and later moved by - # glib's setup hook. preInstall = '' + # Meson installs the schemas to share/glib-2.0/schemas + # We add the override file there too so it will be compiled and later moved by + # glib's setup hook. mkdir -p $out/share/glib-2.0/schemas cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF + # These paths are supposed to refer to gnome-backgrounds + # but since we do not use FHS, they are broken. + # And we do not want to hardcode the correct paths + # since then every GTK app would pull in gnome-backgrounds. + # Let’s just override the broken paths so that people are not confused. [org.gnome.desktop.background] picture-uri=''' + picture-uri-dark=''' [org.gnome.desktop.screensaver] picture-uri=''' diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index be45a48090f..6c37529fb3d 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.9.1"; + version = "1.10.0"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pdb4gbjrs8mk6r0ipw5vxyvzav1wvkjq46kiq53r3nyznfpdfyw"; + sha256 = "gDu4hMAhXT/SKoXX8wQjr/iNl5LwWlGZ2KSJov+q4do="; }; patches = [ diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index ffa8c5d191b..4f520772b75 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -45,8 +45,7 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ bash coreutils which zip ]; + nativeBuildInputs = [ bash coreutils which zip unzip ]; patchPhase = '' substituteInPlace ortograf/herramientas/make_dict.sh \ --replace /bin/bash bash \ @@ -234,7 +233,7 @@ let sha256 = "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p"; }; - buildInputs = [ ispell perl hunspell ]; + nativeBuildInputs = [ ispell perl hunspell ]; dontBuild = true; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index a1119f4be2c..1544bb946ea 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -8,11 +8,11 @@ with lib; stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "1q440fwvhnxz6j8k5bn3bxj86b3lzbr8fgib78l4iq6gxd9yx302"; + sha256 = "sha256-DU4dNsOnLF1hkBv9R3M39aTH4Kl12lcWUjfQDjXvUo0="; }; configureFlags = [ diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 1e2e36d6784..50a0489529e 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.92/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.93/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1cddd857dda..457ae06bb65 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/attica-5.92.0.tar.xz"; - sha256 = "0cy9dd8kazfkhas87bxjj5smmzay3gvkjwsmy6gvkfxc6rvpqr5z"; - name = "attica-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/attica-5.93.0.tar.xz"; + sha256 = "1qcj0n00ma6lyhbdk5dx2a1iwjqwzkbqvrwdhv8hgsqvj44q1hc1"; + name = "attica-5.93.0.tar.xz"; }; }; baloo = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/baloo-5.92.0.tar.xz"; - sha256 = "0xd4a0p22gjm523ymlyd5nfgp8z3ayb0nq6a04h5py507mc70d98"; - name = "baloo-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/baloo-5.93.0.tar.xz"; + sha256 = "1kfmmsinpnsh169dw8ycl9cavw4n7pfwx4davgfx12nvzmlibl95"; + name = "baloo-5.93.0.tar.xz"; }; }; bluez-qt = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/bluez-qt-5.92.0.tar.xz"; - sha256 = "1dlasb39kqrcql6hq0sl74ax3n5bdcy3pkhvc9vwpf9dxn1j93gm"; - name = "bluez-qt-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/bluez-qt-5.93.0.tar.xz"; + sha256 = "091n2bcvzczn28zkry5yxfrg0zpx78y2la3rhdybb4bplgm88pdb"; + name = "bluez-qt-5.93.0.tar.xz"; }; }; breeze-icons = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/breeze-icons-5.92.0.tar.xz"; - sha256 = "0rj30r52ca6njx00gmmni4k70yn8873ihxfbc66lklwzk1irdq29"; - name = "breeze-icons-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/breeze-icons-5.93.0.tar.xz"; + sha256 = "1rh39pgyhz73lly7n9sp1z16z6isw2bbx284d2ilb9lanjkdyrs3"; + name = "breeze-icons-5.93.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - 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"; + url = "${mirror}/stable/frameworks/5.93/extra-cmake-modules-5.93.0.tar.xz"; + sha256 = "088b93ahiw00msn20iibp8642p2vy5zd8wb99vvwayv425xylg89"; + name = "extra-cmake-modules-5.93.0.tar.xz"; }; }; frameworkintegration = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/frameworkintegration-5.92.0.tar.xz"; - sha256 = "0pgcwfxxzvfvqyjfgqzsllzfy9il4y8xr8dzdyjmd5vccpvgd3mx"; - name = "frameworkintegration-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/frameworkintegration-5.93.0.tar.xz"; + sha256 = "19m2i09r7hzqj8dkmxdkj7lh5jilm332i7177aadm6v7xv4m8vhm"; + name = "frameworkintegration-5.93.0.tar.xz"; }; }; kactivities = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kactivities-5.92.0.tar.xz"; - sha256 = "1kfvg23gdl4k6azs6700j8i8ncl8c7rrc70w1i2xhphz27ybc1pw"; - name = "kactivities-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kactivities-5.93.0.tar.xz"; + sha256 = "0hv8y6i03ib89ivmpfg4ifypnnia73la6ljp5frs3fykh91j0szb"; + name = "kactivities-5.93.0.tar.xz"; }; }; kactivities-stats = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kactivities-stats-5.92.0.tar.xz"; - sha256 = "0lgp7zxgjmjm02x4mydlv6ivmlxqjkklav5vfwgjgf6v1qp161i2"; - name = "kactivities-stats-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kactivities-stats-5.93.0.tar.xz"; + sha256 = "1a03xznriszw12jd0a2c7snilzd23nbgglx096isw1cf49r9h1pi"; + name = "kactivities-stats-5.93.0.tar.xz"; }; }; kapidox = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kapidox-5.92.0.tar.xz"; - sha256 = "0vd5k4wmmawbhyy3cxj0gjidf4haghwbsbly9yr3zg3qb3g02ljg"; - name = "kapidox-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kapidox-5.93.0.tar.xz"; + sha256 = "0nqxz2jg51kyis07k2jqk4ni1wly6zx8mv81lgqfhb9l6mm34a22"; + name = "kapidox-5.93.0.tar.xz"; }; }; karchive = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/karchive-5.92.0.tar.xz"; - sha256 = "1blzm6vf8kpflam4671r1y4svrsb79bglln7aia7baqh7a6a4xjh"; - name = "karchive-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/karchive-5.93.0.tar.xz"; + sha256 = "1yy7jibbjpi67d6aihz5kcq4ynq8c9j9ds5rz2vp00l682l2dqv1"; + name = "karchive-5.93.0.tar.xz"; }; }; kauth = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kauth-5.92.0.tar.xz"; - sha256 = "0a27z9xr5ccxfcxmx93vs4hgxc388nsd9ac906mdh475ivv4p0j4"; - name = "kauth-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kauth-5.93.0.tar.xz"; + sha256 = "0v6s79n9bd75dzncz9rmp449j82945gralmcycsihqyzpxw00n1l"; + name = "kauth-5.93.0.tar.xz"; }; }; kbookmarks = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kbookmarks-5.92.0.tar.xz"; - sha256 = "0hym3558xnp3h7q8kf1ljcy65r3g37mcmqb1ll3nxd912rv4wl4r"; - name = "kbookmarks-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kbookmarks-5.93.0.tar.xz"; + sha256 = "0gw6zl87xhm3k2qdmd6993xyj8i0y2z5yvlwsnq91glrzyazgvry"; + name = "kbookmarks-5.93.0.tar.xz"; }; }; kcalendarcore = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kcalendarcore-5.92.0.tar.xz"; - sha256 = "0fhbas8i7i08z4x32yq49admiz8vk4h9vwgkh7qy14lbzf6ydwkg"; - name = "kcalendarcore-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kcalendarcore-5.93.0.tar.xz"; + sha256 = "0gqxbj3i0w3kfyyd6n9n3dxgmx2nwfh578srxnmy1z1r2wabq28n"; + name = "kcalendarcore-5.93.0.tar.xz"; }; }; kcmutils = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kcmutils-5.92.0.tar.xz"; - sha256 = "0fldpkhq4ysma4m6qylr7kqvxw0rb11x5abz5921bhl5zicfcjfx"; - name = "kcmutils-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kcmutils-5.93.0.tar.xz"; + sha256 = "0v8dsfrbba1pv8vrisr3pbyw8yanfl95i5jxqbbrzmpznxwgji8l"; + name = "kcmutils-5.93.0.tar.xz"; }; }; kcodecs = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kcodecs-5.92.0.tar.xz"; - sha256 = "0xfjc0diljx081as3b500awybay9l3sfl59792h5z3clafjbgrfn"; - name = "kcodecs-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kcodecs-5.93.0.tar.xz"; + sha256 = "12r8n8sq5yav62viddhgm1bjlxv1a0jrndmr1a52y55kma5mrz0f"; + name = "kcodecs-5.93.0.tar.xz"; }; }; kcompletion = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kcompletion-5.92.0.tar.xz"; - sha256 = "1svwvj9jxkgcddfdila10ggdmsabs22vnhf9k7isp2zfdif55w88"; - name = "kcompletion-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kcompletion-5.93.0.tar.xz"; + sha256 = "177vx3ck4yyc38b3kd4m5sm55hj15ybiwx2jm2f62nw7x1ar733z"; + name = "kcompletion-5.93.0.tar.xz"; }; }; kconfig = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kconfig-5.92.0.tar.xz"; - sha256 = "08q57f3wxj22d485s0ph53p44yrkjb376817470a0s43p10vc0bq"; - name = "kconfig-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kconfig-5.93.0.tar.xz"; + sha256 = "0vn009nvg3s540avq88fjr267j22lvjnmm6n5p11g442shh7r1bi"; + name = "kconfig-5.93.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kconfigwidgets-5.92.0.tar.xz"; - sha256 = "0ji799xd45lpnd70a9bizicfz2bsmlxq6r0fqgn0ghwsbp9ywna2"; - name = "kconfigwidgets-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kconfigwidgets-5.93.0.tar.xz"; + sha256 = "1fr4kwkvx5jz9xb3qvk84sh6ma2x5n852xc7ypb6vbby47rf066v"; + name = "kconfigwidgets-5.93.0.tar.xz"; }; }; kcontacts = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kcontacts-5.92.0.tar.xz"; - sha256 = "1kik4pvy8snvj6rsc9pfbcpc8rrcn0k4pjj1h9m221zma1p00xhj"; - name = "kcontacts-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kcontacts-5.93.0.tar.xz"; + sha256 = "0xacc3yi169hdgf1x82rxb72nnzccmhspmz4v6493afgdin8qz2x"; + name = "kcontacts-5.93.0.tar.xz"; }; }; kcoreaddons = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kcoreaddons-5.92.0.tar.xz"; - sha256 = "0rv63byrxwf9zdpx347rxybpk2j9yyjqm323j60vb8ja6a7p2pyz"; - name = "kcoreaddons-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kcoreaddons-5.93.0.tar.xz"; + sha256 = "0hzhvf2mf53pyhfbfg4pczb20k3l0hv6y2kp0vfkmskxz652f2lj"; + name = "kcoreaddons-5.93.0.tar.xz"; }; }; kcrash = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kcrash-5.92.0.tar.xz"; - sha256 = "1ir64mlv49vh3vz81r22q3sx0fichiwjr8qw5jf5vx96a1dn1icv"; - name = "kcrash-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kcrash-5.93.0.tar.xz"; + sha256 = "1midk5b5bmlv4qkjjn2wllmcwmdv0q33jad9yhp7aasbjb3ddy1g"; + name = "kcrash-5.93.0.tar.xz"; }; }; kdav = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kdav-5.92.0.tar.xz"; - sha256 = "1i5i6bkjairz1slk3fhrxd3s8wkcdaqg55jg2bv86kqh7d3nrcgk"; - name = "kdav-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kdav-5.93.0.tar.xz"; + sha256 = "0s5d6h4p496y6fhrcm1gb10y15bsa0sidsljhh7v58gh400x9lx7"; + name = "kdav-5.93.0.tar.xz"; }; }; kdbusaddons = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kdbusaddons-5.92.0.tar.xz"; - sha256 = "0m5fd396xi3dhc45zwxjrrxr2bhlrc8g8m7n17jq1ylzqhyg60vw"; - name = "kdbusaddons-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kdbusaddons-5.93.0.tar.xz"; + sha256 = "1n9ah83a0hg7vr5qamf1amvs1wwk2gjm9x4zhkqpmfb53r878b6c"; + name = "kdbusaddons-5.93.0.tar.xz"; }; }; kdeclarative = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kdeclarative-5.92.0.tar.xz"; - sha256 = "1cymh8clcajk9cl6r443cpqk6vmp4x12ngc6wgp08z53zrvlv5py"; - name = "kdeclarative-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kdeclarative-5.93.0.tar.xz"; + sha256 = "0rsh68nqjy5lk8v2irvaj53qrhp726f9rlj2gkc8k3dajg3lba88"; + name = "kdeclarative-5.93.0.tar.xz"; }; }; kded = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kded-5.92.0.tar.xz"; - sha256 = "0v0fak84nw4lb4qc1irb9sn5nh5k7qrhnfav5smn3cvchldm6dc3"; - name = "kded-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kded-5.93.0.tar.xz"; + sha256 = "1psrh4vqa25k4lpmd7rx1bkc4nzci8rciax15kxgijnc444k34hr"; + name = "kded-5.93.0.tar.xz"; }; }; kdelibs4support = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/kdelibs4support-5.92.0.tar.xz"; - sha256 = "1q7d0i09klkhsiwq7i91ypxakdr5b841zdb60q7yjzcdmn25wbi9"; - name = "kdelibs4support-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/kdelibs4support-5.93.0.tar.xz"; + sha256 = "0z1p0wmj2y318r5d8wgab2p4c2yi3vyrlkzj60lw3avbrj01sgka"; + name = "kdelibs4support-5.93.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/kdesignerplugin-5.92.0.tar.xz"; - sha256 = "0kial8k6qr39871v103952d0qcs0hm25y6k0vdg4y8ns8nrmjs06"; - name = "kdesignerplugin-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/kdesignerplugin-5.93.0.tar.xz"; + sha256 = "1bwaca721dzydwrky64p7h4z0bigvajpb7wg5mj8k2ym3vyb96pi"; + name = "kdesignerplugin-5.93.0.tar.xz"; }; }; kdesu = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kdesu-5.92.0.tar.xz"; - sha256 = "1yjyz4v0gn7ys7zy4ymn47zggxxmgd37big005c6g85dm63xr1s6"; - name = "kdesu-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kdesu-5.93.0.tar.xz"; + sha256 = "1gwd2gc98s0v8mlj7iqr1l7wljdx9rmzpcvaa75f5w2ri6d9s0kz"; + name = "kdesu-5.93.0.tar.xz"; }; }; kdewebkit = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/kdewebkit-5.92.0.tar.xz"; - sha256 = "1dni134qbs5yff7zgk4n3sfjwblzarblg16rj35l59l6mly7f2jd"; - name = "kdewebkit-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/kdewebkit-5.93.0.tar.xz"; + sha256 = "0m9gzm8a4gl1ycz2l7x8g61461x4n7vhph248bblsgbnc1b9pzm2"; + name = "kdewebkit-5.93.0.tar.xz"; }; }; kdnssd = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kdnssd-5.92.0.tar.xz"; - sha256 = "1m24v36pphy591z1xp90i0yxv70c62iinvy4gspdi15bz94sydjz"; - name = "kdnssd-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kdnssd-5.93.0.tar.xz"; + sha256 = "0fwh5wzx1bp9ndhd8l1gjp61maw47jnzd1i9pfjpx1mm2i7kd5yw"; + name = "kdnssd-5.93.0.tar.xz"; }; }; kdoctools = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kdoctools-5.92.0.tar.xz"; - sha256 = "0w08fa8rl0dhp59lv6xcvypahl6pxda6cr0vv0f0xv0xp6wax8w6"; - name = "kdoctools-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kdoctools-5.93.0.tar.xz"; + sha256 = "0p2xnq83c7v5llh3i4a379l68qbrjccw99959swnfdn5a7qkzs15"; + name = "kdoctools-5.93.0.tar.xz"; }; }; kemoticons = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kemoticons-5.92.0.tar.xz"; - sha256 = "01wzy3mwfz4sqpq8i1hfbbymajp55axryiaqkfr9r2n1844y7kzx"; - name = "kemoticons-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kemoticons-5.93.0.tar.xz"; + sha256 = "0474bb6h9s3ks3z8pankr7zxpjha1n88bapxm01z2p4kfkrkvjl3"; + name = "kemoticons-5.93.0.tar.xz"; }; }; kfilemetadata = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kfilemetadata-5.92.0.tar.xz"; - sha256 = "1khmx9kd1jhd6j7rmfww3vmyjz2pg36mpsdn0bc77kwl21ax696n"; - name = "kfilemetadata-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kfilemetadata-5.93.0.tar.xz"; + sha256 = "05m8fvk6j0zdg6x64hy8bslqhdrx4jh8l8rnbpjgcs7hlmqw059h"; + name = "kfilemetadata-5.93.0.tar.xz"; }; }; kglobalaccel = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kglobalaccel-5.92.0.tar.xz"; - sha256 = "0lhlb274pvv7rpkcsccqbv81bh8iklanp29g0k28wrv3kckiwyxy"; - name = "kglobalaccel-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kglobalaccel-5.93.0.tar.xz"; + sha256 = "04mpjzpfyrviyva3mrgxamsnkhglz48vfp65k4nn7ir9n3rbh1n8"; + name = "kglobalaccel-5.93.0.tar.xz"; }; }; kguiaddons = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kguiaddons-5.92.0.tar.xz"; - sha256 = "0pyzgyrglvz2m11b82rycs9fbmzpfgzabnjkvsq00agjcnjparqg"; - name = "kguiaddons-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kguiaddons-5.93.0.tar.xz"; + sha256 = "02pl99a7dbxc3hmpp0l76x4v4l3yv1pzsm61hv5spl8b2j967wi7"; + name = "kguiaddons-5.93.0.tar.xz"; }; }; kholidays = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kholidays-5.92.0.tar.xz"; - sha256 = "042bdg46hkpg66vdp9gk13wck5yhks8s6i9qz9xzh2mikz285lqf"; - name = "kholidays-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kholidays-5.93.0.tar.xz"; + sha256 = "0hdq0ikwr4dd1il3lszkh0ygkvddfy3ld02d5hxyf7jh4fw1yjhd"; + name = "kholidays-5.93.0.tar.xz"; }; }; khtml = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/khtml-5.92.0.tar.xz"; - sha256 = "06hpjcm5yrfj1056vvv9dklccd0a1y09zm8ch4a5d8l2lfgdg8ci"; - name = "khtml-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/khtml-5.93.0.tar.xz"; + sha256 = "0jv1hqpidlfsvvcfvxvvkzyba48cw7l27ixxwac8n96p5rsvdgri"; + name = "khtml-5.93.0.tar.xz"; }; }; ki18n = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/ki18n-5.92.0.tar.xz"; - sha256 = "0xsp77iaxf72i0ri3pb6x5rrdz3cv8rxcaqcrynisvsmx7l35005"; - name = "ki18n-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/ki18n-5.93.0.tar.xz"; + sha256 = "0fbk4gjwvzd7vw4m9mngywagdk2aq66v5bz1vw98dwbms4058w62"; + name = "ki18n-5.93.0.tar.xz"; }; }; kiconthemes = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kiconthemes-5.92.0.tar.xz"; - sha256 = "08yb6f980p620dfklfiyp83lcsqw4dds9qwzd6xpn2mzz07p2a11"; - name = "kiconthemes-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kiconthemes-5.93.0.tar.xz"; + sha256 = "1d72k0ssnqwkkzk3jfnx1n0w1h7xvf2a50dx9j5j46jg9yrwbxvm"; + name = "kiconthemes-5.93.0.tar.xz"; }; }; kidletime = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kidletime-5.92.0.tar.xz"; - sha256 = "1mw0jarqv2ypxwgf4qaxqlw0sijw0is36sasrfz8grbykwi18bz1"; - name = "kidletime-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kidletime-5.93.0.tar.xz"; + sha256 = "1ndpnyyfx3ym5gdbin96g0qmdpl36il0z9jvmqpbdbpsw7gib4sd"; + name = "kidletime-5.93.0.tar.xz"; }; }; kimageformats = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kimageformats-5.92.0.tar.xz"; - sha256 = "0sd3xhqh3zgy4jq8fc1llqjrxizylbsz58njz2dxqjas2a4rj16f"; - name = "kimageformats-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kimageformats-5.93.0.tar.xz"; + sha256 = "1l67vlfqwiqj9pvda054wa0wshzjh2wrc174w1wmkybswnfyvc0m"; + name = "kimageformats-5.93.0.tar.xz"; }; }; kinit = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kinit-5.92.0.tar.xz"; - sha256 = "1kpkqnq9krxlzhripwjhw3n55p5sxqsvj6nb2pqb9m0ppw97jlfb"; - name = "kinit-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kinit-5.93.0.tar.xz"; + sha256 = "16743hyyycld1mdpa1hkhjmsr1f5pq3skiyq9rx3n5ihbfys6dnv"; + name = "kinit-5.93.0.tar.xz"; }; }; kio = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kio-5.92.0.tar.xz"; - sha256 = "1cscsjb2v0zygzazfhcflc3gb5ny1a79g3i6glyzw6ppj2c3yhyl"; - name = "kio-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kio-5.93.0.tar.xz"; + sha256 = "0i2cbngyy3malcl9sv5bj8di6cgq1m17qjn88y8fpjayzfya946j"; + name = "kio-5.93.0.tar.xz"; }; }; kirigami2 = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kirigami2-5.92.0.tar.xz"; - sha256 = "0p1x40p38pr9rvzwil57asgsaa95qpjqi9npwv4pgibhxacgznha"; - name = "kirigami2-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kirigami2-5.93.0.tar.xz"; + sha256 = "13xb8zfnxcps64v74scn76n8hsccirc9hin9knp12q3pxcjaihm7"; + name = "kirigami2-5.93.0.tar.xz"; }; }; kitemmodels = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kitemmodels-5.92.0.tar.xz"; - sha256 = "16z8m11cyrapf6m56gmpjmvcgan7s50si8rl1cbbid02src7yp76"; - name = "kitemmodels-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kitemmodels-5.93.0.tar.xz"; + sha256 = "0ns8y2lw74lydnnys081z8qlz9dyim7f1ay5aayg2dxcja5r3fav"; + name = "kitemmodels-5.93.0.tar.xz"; }; }; kitemviews = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kitemviews-5.92.0.tar.xz"; - sha256 = "1ml6i1km22xsprldkzmngfh9xs5vdhlfvc6f7aq5hx9q5114v2q5"; - name = "kitemviews-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kitemviews-5.93.0.tar.xz"; + sha256 = "1gsswmqpv61byzwkzldgx829a6llpcz8fnb8dz62hnvr7gn1vw4k"; + name = "kitemviews-5.93.0.tar.xz"; }; }; kjobwidgets = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kjobwidgets-5.92.0.tar.xz"; - sha256 = "09l5zgr5mn29v410ng5rccdg2bki9r6cb8y2lrijzgfxfxpvj96z"; - name = "kjobwidgets-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kjobwidgets-5.93.0.tar.xz"; + sha256 = "1yrrghkdqym0sq19pww57fz44bhp2jvb45xk3hmb79bggms9ni32"; + name = "kjobwidgets-5.93.0.tar.xz"; }; }; kjs = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/kjs-5.92.0.tar.xz"; - sha256 = "067ilsm78x03kf5fs2xmlasvy2712k0xrsa404g2zj81fm92s1q4"; - name = "kjs-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/kjs-5.93.0.tar.xz"; + sha256 = "0hh9z6xjqx0nxxpif4gmhjddls6cp37zngjxi565cx97kkg03al5"; + name = "kjs-5.93.0.tar.xz"; }; }; kjsembed = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/kjsembed-5.92.0.tar.xz"; - sha256 = "0db0r8v0bhp3razwyvmvk9r4psl14vgn23c4cm2q1b5pl0w6bhnp"; - name = "kjsembed-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/kjsembed-5.93.0.tar.xz"; + sha256 = "096lh47xr4xjkdg4dnpkj1qflfz5zfqhkj9wazmjd41z1fzx6mgs"; + name = "kjsembed-5.93.0.tar.xz"; }; }; kmediaplayer = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/kmediaplayer-5.92.0.tar.xz"; - sha256 = "19lpib2wj91w8shsf9056nwi46qja8nh96hj164ydqlkslpfnf7y"; - name = "kmediaplayer-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/kmediaplayer-5.93.0.tar.xz"; + sha256 = "02l3fhg73hqzgr5pin74zl6q7lv2y3pr49w128hsz8zyn2ssza5d"; + name = "kmediaplayer-5.93.0.tar.xz"; }; }; knewstuff = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/knewstuff-5.92.0.tar.xz"; - sha256 = "0gvclv1a6xyrqa24svb56kp9zf2wi98as3q30lnwf0bpbpjsw52b"; - name = "knewstuff-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/knewstuff-5.93.0.tar.xz"; + sha256 = "0nappdgg7lw8grhkb5bndnvkcc54gvvhf47zyrhmzh04dki4ip1a"; + name = "knewstuff-5.93.0.tar.xz"; }; }; knotifications = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/knotifications-5.92.0.tar.xz"; - sha256 = "1dwlx8w810l0cvy72mj52saf4x7i9p3xpqpjx4chy54n7mg0jklc"; - name = "knotifications-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/knotifications-5.93.0.tar.xz"; + sha256 = "0jysjrkpjayqlkazaf1xg4r7rr2kiph0zdx32bidg0aqwlgin6gy"; + name = "knotifications-5.93.0.tar.xz"; }; }; knotifyconfig = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/knotifyconfig-5.92.0.tar.xz"; - sha256 = "0fii74r0ap3n08lp9kj7pki0msqjsia2jnmavyps51kq37im5x7p"; - name = "knotifyconfig-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/knotifyconfig-5.93.0.tar.xz"; + sha256 = "1k8rcrcfxzjrdvi5khlvj1mrslmby217n06dclclam8mcdkf37fc"; + name = "knotifyconfig-5.93.0.tar.xz"; }; }; kpackage = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kpackage-5.92.0.tar.xz"; - sha256 = "1av6v0629a8yi0wpl7xgyd0gsn5gi228abdlvbk4dzrx9vxpa7rn"; - name = "kpackage-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kpackage-5.93.0.tar.xz"; + sha256 = "1kf55v26fbqh4whd5chvnl8j54jhlqx2i4wxj6wldxqwxpbfrrld"; + name = "kpackage-5.93.0.tar.xz"; }; }; kparts = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kparts-5.92.0.tar.xz"; - sha256 = "061kzss4b0bw67j3mc8h36mbaji077k3alk2ghcir7qix6r1hkh9"; - name = "kparts-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kparts-5.93.0.tar.xz"; + sha256 = "0x8nrnxrh34bipp0pvr0qx86r9ysrrmjv92gj192y6n79ikfk268"; + name = "kparts-5.93.0.tar.xz"; }; }; kpeople = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kpeople-5.92.0.tar.xz"; - sha256 = "0wf555pqiannxb115mlbl43ds1365im95vadsbzv1gdz668p44xk"; - name = "kpeople-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kpeople-5.93.0.tar.xz"; + sha256 = "0wgk96xyhig8psh3byic5qqp2g58krb1il0nnbbvsapsh9ljdqfk"; + name = "kpeople-5.93.0.tar.xz"; }; }; kplotting = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kplotting-5.92.0.tar.xz"; - sha256 = "1l8y0xlwjyv1l4g0mag4bgf906jc654ygky1bribzay4wki66pf9"; - name = "kplotting-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kplotting-5.93.0.tar.xz"; + sha256 = "0vd2nsb60kbk8iy8via5rvizdbwbch86madnzxcm5x8k89linvaq"; + name = "kplotting-5.93.0.tar.xz"; }; }; kpty = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kpty-5.92.0.tar.xz"; - sha256 = "0lp0bqlg1i0a5vl6gvvkngbsha8ab38z6b3sjvpmk83vixgsq7fb"; - name = "kpty-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kpty-5.93.0.tar.xz"; + sha256 = "04pc94v4r8066dzic8a5q5clmcn36vf99d1k5zrq5c4ypx6ia19a"; + name = "kpty-5.93.0.tar.xz"; }; }; kquickcharts = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kquickcharts-5.92.0.tar.xz"; - sha256 = "0y467vqx2r6dcyqwn6p7hbg4q7n0xdh4lcqwyin4cdxi14lhwhqs"; - name = "kquickcharts-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kquickcharts-5.93.0.tar.xz"; + sha256 = "0j580h8gysdqmsyzhx40arrkszbzkb9fa3byyazqbmyihk26ld14"; + name = "kquickcharts-5.93.0.tar.xz"; }; }; kross = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/kross-5.92.0.tar.xz"; - sha256 = "1gqy1h5mqsfgbpqkdrhs7xf77kw4yy19mryda1fwjcqzxd02i7hj"; - name = "kross-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/kross-5.93.0.tar.xz"; + sha256 = "1hqsanjk8n786qbr47pxpwvfpwfd1l6152bqac21f6vk70jgv9ib"; + name = "kross-5.93.0.tar.xz"; }; }; krunner = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/krunner-5.92.0.tar.xz"; - sha256 = "1vcgqjyx9i8k9q4j6q9p4f7sp76aap8gqn2v269lb7imcrfhrj1z"; - name = "krunner-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/krunner-5.93.0.tar.xz"; + sha256 = "14f993x6s2y6s3bcjqp9q6f5hhiz31ij4bnqwbsqfpa1klbbkiid"; + name = "krunner-5.93.0.tar.xz"; }; }; kservice = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kservice-5.92.0.tar.xz"; - sha256 = "1y1fr1galhhi6yf9w9qcvkp1zb63ifvr4wb43jwpvpms9djxkqjj"; - name = "kservice-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kservice-5.93.0.tar.xz"; + sha256 = "0cblwvrjwis8w45a6wnjgns6c78xn2lamzss3hqhx2gv6zw95ks6"; + name = "kservice-5.93.0.tar.xz"; }; }; ktexteditor = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/ktexteditor-5.92.0.tar.xz"; - sha256 = "137v8g7j8kkv9yh30ysmm5n6imyyd3jmd0f6w5ni00kxl0y1rl5w"; - name = "ktexteditor-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/ktexteditor-5.93.0.tar.xz"; + sha256 = "1hyn5gkbc246rbv5rxaz190c5fa2j87ndjw0jz7sjbfdhaw3gx3s"; + name = "ktexteditor-5.93.0.tar.xz"; }; }; ktextwidgets = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/ktextwidgets-5.92.0.tar.xz"; - sha256 = "030bz67n6m3fkbldnr48mzicm9cgnr9gdpwipaghl5x5k3s7p1py"; - name = "ktextwidgets-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/ktextwidgets-5.93.0.tar.xz"; + sha256 = "05f2nzgqpprri8zh2da9hj36zif0bv2dwvdxxf2z8dfv564mhzz2"; + name = "ktextwidgets-5.93.0.tar.xz"; }; }; kunitconversion = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kunitconversion-5.92.0.tar.xz"; - sha256 = "17ph75rg3y652ii0yxm9s8xrbpjs9pdfsrsajm220mi9ng2b9qj7"; - name = "kunitconversion-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kunitconversion-5.93.0.tar.xz"; + sha256 = "1j1gl1ahpqafdwlq4bcwc1xv3q59489jyjgr4wkv7lljxmmgpblv"; + name = "kunitconversion-5.93.0.tar.xz"; }; }; kwallet = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kwallet-5.92.0.tar.xz"; - sha256 = "1ra0cxw70vb6pks8sqw5k895rnrfzwxhg6vh4yc5dgzdn1nagb3i"; - name = "kwallet-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kwallet-5.93.0.tar.xz"; + sha256 = "1syx1zi7q14lf1xn8wqkgi475aaydahn2y3v9x2hn9gvgr3zcmpd"; + name = "kwallet-5.93.0.tar.xz"; }; }; kwayland = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kwayland-5.92.0.tar.xz"; - sha256 = "15fizsbdl6psmi24fvpfk9dvh61q07irzavpkl961qp4zg79gq4m"; - name = "kwayland-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kwayland-5.93.0.tar.xz"; + sha256 = "1gks1an0c9yp047jwdik6lg1w5gbjwz9mzzdl2aih30wmmrs4j0n"; + name = "kwayland-5.93.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kwidgetsaddons-5.92.0.tar.xz"; - sha256 = "0b0z24j162j39zfycl5al69xcqgdsr96p7ii3prm1mbyda6mbqyh"; - name = "kwidgetsaddons-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kwidgetsaddons-5.93.0.tar.xz"; + sha256 = "045489l353jz52rl346lwazyc4xqd3whn628zn5ybakgiiyy2dcw"; + name = "kwidgetsaddons-5.93.0.tar.xz"; }; }; kwindowsystem = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kwindowsystem-5.92.0.tar.xz"; - sha256 = "103xvhzlggi05k16s9kssy7g5a74k9yildj1a4igqwi39wmvvnyw"; - name = "kwindowsystem-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kwindowsystem-5.93.0.tar.xz"; + sha256 = "18g4xccvq56i9sz4rcwf8nkhwclcbvzi0vj9xniqfx0s9lx25jwp"; + name = "kwindowsystem-5.93.0.tar.xz"; }; }; kxmlgui = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/kxmlgui-5.92.0.tar.xz"; - sha256 = "0hxpjyjr77q2gyi3hg13119aza3634rvmllbj66pi7y37h6lr2z0"; - name = "kxmlgui-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/kxmlgui-5.93.0.tar.xz"; + sha256 = "16dhykbn9z0wyh95ihmfr6lf2ff7xycx253fnsfd035cbzcnbfkl"; + name = "kxmlgui-5.93.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/portingAids/kxmlrpcclient-5.92.0.tar.xz"; - sha256 = "1axy34g5ahd1c3qg7ab7h786jibpaj4dvj45x50x5czq06idqchf"; - name = "kxmlrpcclient-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/portingAids/kxmlrpcclient-5.93.0.tar.xz"; + sha256 = "0v1p94ngq6cvw42rf6qfkl45rdcj0v3zjsfnwrgdjq2nkzzimd0c"; + name = "kxmlrpcclient-5.93.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/modemmanager-qt-5.92.0.tar.xz"; - sha256 = "162qzq1aqv2l3bi0r01xrfan20r1zhaaqih4dqbaj7vqibsb9l3y"; - name = "modemmanager-qt-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/modemmanager-qt-5.93.0.tar.xz"; + sha256 = "1a3718kkx288c8ysf3fc5kd51zzw8i7x7sh7x86rsjsj6rlxxv9s"; + name = "modemmanager-qt-5.93.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/networkmanager-qt-5.92.0.tar.xz"; - sha256 = "0r7s3fw9fk3pkrzrl1bxsmkf1qbgv3p0jrsskp28f3561vncipai"; - name = "networkmanager-qt-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/networkmanager-qt-5.93.0.tar.xz"; + sha256 = "0q59xg00pxhva75rncwizjca7fjq7h7ib9hyyn14c28iv3i8qn5q"; + name = "networkmanager-qt-5.93.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/oxygen-icons5-5.92.0.tar.xz"; - sha256 = "1wcy8bv4d6jns7vaisbvjc8nxriw9vkiz7j4za5ry7wnvlzv126a"; - name = "oxygen-icons5-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/oxygen-icons5-5.93.0.tar.xz"; + sha256 = "019h6my69cq32rlmnxkpnzix6m5r78rpzpn518snbrivvi23ykkk"; + name = "oxygen-icons5-5.93.0.tar.xz"; }; }; plasma-framework = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/plasma-framework-5.92.0.tar.xz"; - sha256 = "1xq66lyagjsgfashhqgqgqhda0rqfqf0l5yf1gc4ziv48mibrhn6"; - name = "plasma-framework-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/plasma-framework-5.93.0.tar.xz"; + sha256 = "08n3nnbds4smd0jdqidlshp10n643x25issnqbkxza1fxa3wd8nl"; + name = "plasma-framework-5.93.0.tar.xz"; }; }; prison = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/prison-5.92.0.tar.xz"; - sha256 = "07p47q8sva82hglfzp145a1sajlal8b3qshhkicc9rkbsngywvvy"; - name = "prison-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/prison-5.93.0.tar.xz"; + sha256 = "0mpvhbxxsnanf41cclhdbadw14979qbh3a7rf5mkq9ng49kdwhqz"; + name = "prison-5.93.0.tar.xz"; }; }; purpose = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/purpose-5.92.0.tar.xz"; - sha256 = "02j09zf18dwjk17mn841m7cm0qsn7gcz5lff8dad3yah0lc3wqcl"; - name = "purpose-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/purpose-5.93.0.tar.xz"; + sha256 = "1i1cx5s6mdrfvabvqkllycv5lmck73mwwck1hlhpxcnrqp3w02yw"; + name = "purpose-5.93.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - 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"; + url = "${mirror}/stable/frameworks/5.93/qqc2-desktop-style-5.93.0.tar.xz"; + sha256 = "1a597chr7awbmg2d64gylg1v9rsih33j6xyvp8r3bqi9ln2w07hn"; + name = "qqc2-desktop-style-5.93.0.tar.xz"; }; }; solid = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/solid-5.92.0.tar.xz"; - sha256 = "172sid8l1znzxxz0hi5m19yy4vg7l1nbghvzjvh18ssbmxcwh9l9"; - name = "solid-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/solid-5.93.0.tar.xz"; + sha256 = "1skb1lzib230crrhzbgzl0lch51a0bcrgq1jnpn3yy888vwz7vr2"; + name = "solid-5.93.0.tar.xz"; }; }; sonnet = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/sonnet-5.92.0.tar.xz"; - sha256 = "08jps1hy0qvk62wnzn50qi8iaay7xav3hbcj55sk70mm7pd1vz1i"; - name = "sonnet-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/sonnet-5.93.0.tar.xz"; + sha256 = "170d460vhm42vi21prjg5792h34flcbb2j5wx3r3pr6ybsj6n51w"; + name = "sonnet-5.93.0.tar.xz"; }; }; syndication = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/syndication-5.92.0.tar.xz"; - sha256 = "0ijxpnsygwzzybic5lp8gfq57y84vrp3bq7vdbjh3h0345vvk6hw"; - name = "syndication-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/syndication-5.93.0.tar.xz"; + sha256 = "08ysirymi5j6as8syvx3rxc7yh12ylwxz1a7yh6ifq370wv4xw9m"; + name = "syndication-5.93.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/syntax-highlighting-5.92.0.tar.xz"; - sha256 = "03p5qzf13nbf54gzad3q1q6i33iggz3ik0ydr9szhj92kfppwd4r"; - name = "syntax-highlighting-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/syntax-highlighting-5.93.0.tar.xz"; + sha256 = "06vixhzmmqvbgmzsrhgx0ncfxm80crp3gpy7axscjardjbw53nzb"; + name = "syntax-highlighting-5.93.0.tar.xz"; }; }; threadweaver = { - version = "5.92.0"; + version = "5.93.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.92/threadweaver-5.92.0.tar.xz"; - sha256 = "008in2wbl6zr404m9hbqdvy3d4r06mmb3jrr13myldwljqywzc28"; - name = "threadweaver-5.92.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.93/threadweaver-5.93.0.tar.xz"; + sha256 = "11gi0rfd02zjnn8fizhwzgxbaz0jw8m7jhrba56vqbh5fv9bf3bc"; + name = "threadweaver-5.93.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index a448748ff22..240371917f1 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,36 +1,58 @@ -{ - fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, - acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, +{ lib +, stdenv +, fetchFromGitHub +, acl +, attr +, autoreconfHook +, bzip2 +, e2fsprogs +, lzo +, openssl +, pkg-config +, sharutils +, xz +, zlib +, zstd +# Optional but increases closure only negligibly. Also, while libxml2 builds +# fine on windows, libarchive has trouble linking windows things it depends on +# for some reason. +, xarSupport ? stdenv.hostPlatform.isUnix, libxml2 - # Optional but increases closure only negligibly. Also, while libxml2 - # builds fine on windows, but libarchive has trouble linking windows - # things it depends on for some reason. - xarSupport ? stdenv.hostPlatform.isUnix, - - # for passthru.tests - cmake, nix, samba +# for passthru.tests +, cmake +, nix +, samba }: assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "sha256-u6Zeu9yTjhx5U7KZVUkuuUsQPjWN71mE5egG4T+FGfY="; + hash = "sha256-G4wL5DDbX0FqaA4cnOlVLZ25ObN8dNsRtxyas29tpDA="; }; outputs = [ "out" "lib" "dev" ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = - lib.optional stdenv.hostPlatform.isUnix sharutils - ++ [ zlib bzip2 openssl xz lzo zstd ] - ++ lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + bzip2 + lzo + openssl + xz + zlib + zstd + ] ++ lib.optional stdenv.hostPlatform.isUnix sharutils + ++ lib.optionals stdenv.isLinux [ acl attr e2fsprogs ] ++ lib.optional xarSupport libxml2; # Without this, pkg-config-based dependencies are unhappy @@ -38,11 +60,17 @@ stdenv.mkDerivation rec { configureFlags = lib.optional (!xarSupport) "--without-xml2"; - preBuild = if stdenv.isCygwin then '' + postPatch = '' + substituteInPlace Makefile.am --replace '/bin/pwd' 'pwd' + ''; + + preBuild = lib.optionalString stdenv.isCygwin '' echo "#include <windows.h>" >> config.h - '' else null; + ''; - doCheck = false; # fails + # 484: test_write_disk_perms FAIL + # TODO: how to disable it? Should it be reported upstream? + doCheck = false; preFixup = '' sed -i $lib/lib/libarchive.la \ @@ -52,21 +80,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests = { - inherit cmake nix samba; - }; - - meta = { + meta = with lib; { + homepage = "http://libarchive.org"; description = "Multi-format archive and compression library"; longDescription = '' - This library has code for detecting and reading many archive formats and - compressions formats including (but not limited to) tar, shar, cpio, zip, and - compressed with gzip, bzip2, lzma, xz, ... + The libarchive project develops a portable, efficient C library that can + read and write streaming archives in a variety of formats. It also + includes implementations of the common tar, cpio, and zcat command-line + tools that use the libarchive library. ''; - homepage = "http://libarchive.org"; changelog = "https://github.com/libarchive/libarchive/releases/tag/v${version}"; - license = lib.licenses.bsd3; - platforms = with lib.platforms; all; - maintainers = with lib.maintainers; [ jcumming ]; + license = licenses.bsd3; + maintainers = with maintainers; [ jcumming AndersonTorres ]; + platforms = platforms.all; + }; + + passthru.tests = { + inherit cmake nix samba; }; } diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 2003c8957ff..eb8e6333d41 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; }; - nativeBuildInputs = [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; patches = [ # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 03dd9a33628..d5a2a686b89 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ME/mkaHhFeHajTbc7zhg9vtf/8XgkgSRu9I/mlQXnds="; + sha256 = "sha256-EGu2avkqQXHFX4gKWsVfVdQN99f4J7Hm86C0sAhuP1Y="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libdvbcsa/default.nix b/pkgs/development/libraries/libdvbcsa/default.nix new file mode 100644 index 00000000000..3eebaafe450 --- /dev/null +++ b/pkgs/development/libraries/libdvbcsa/default.nix @@ -0,0 +1,22 @@ +{lib, stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "libdvbcsa"; + version = "1.1.0"; + + src = fetchurl { + url = "http://get.videolan.org/libdvbcsa/${version}/${pname}-${version}.tar.gz"; + sha256 = "4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d"; + }; + + doCheck = true; + + meta = { + description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities"; + homepage = "http://www.videolan.org/developers/libdvbcsa.html"; + platforms = lib.platforms.unix; + license = lib.licenses.gpl1; + maintainers = with lib.maintainers; [ melias122 ]; + }; + +} diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index c54c3c86d23..348fbfee7b8 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "libepoxy"; - version = "1.5.9"; + version = "1.5.10"; src = fetchFromGitHub { owner = "anholt"; repo = pname; rev = version; - sha256 = "sha256-8rdmC8FZUkKkEvWPJIdfrBQHiwa81vl5tmVqRdU4UIY="; + sha256 = "sha256-gZiyPOW2PeTMILcPiUTqPUGRNlMM5mI1z9563v4SgEs="; }; patches = [ ./libgl-path.patch ]; @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" ''; - # tests are running from version 1.5.9 doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index cca5abef4fc..b757e516573 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-L3KeNIBpV5H5SC6DiL1yNAK4nw6vEYBXu96jzs7psjc="; + sha256 = "sha256-HbukG8UW08p6vA2luGLv4+qKcBj6bpuXzp05QBsiQmw="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index eb4e8e94862..56594620963 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -15,11 +15,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.9.4"; + version = "1.10.1"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "1xxabjv45zlxyryiwhmbfblsx41kl267wsb78bny6m14ly1rr17a"; + hash = "sha256-7xSuVGsAhM2EJZ9hpV4Ho4w7U6/A9Ua//O8vAbr/6d4="; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index 9106c197471..0a1a631a6b9 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./install-fix.patch ]; nativeBuildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; preInstall = "mkdir -p $out/lib"; meta = with lib; { diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 0f0fec46a27..68658d20ba6 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + NIX_CFLAGS_COMPILE = + lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-std=c++11" + ]; + dontWrapQtApps = true; meta = with lib; { diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index a8ec4c5f3b9..9a6f6a1d14d 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmnl"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "https://netfilter.org/projects/libmnl/files/${pname}-${version}.tar.bz2"; - sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp"; + sha256 = "09851ns07399rbz0y8slrlmnw3fn1nakr8d37pxjn5gkks8rnjr7"; }; meta = { diff --git a/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch b/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch deleted file mode 100644 index 074bef42b97..00000000000 --- a/pkgs/development/libraries/libnfnetlink/Use-stdlib-uint-instead-of-u_int.patch +++ /dev/null @@ -1,499 +0,0 @@ -From patchwork Fri Apr 3 22:04:46 2015 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: Use stdlib uint* instead of u_int* -From: Nathan McSween <nwmcsween@gmail.com> -X-Patchwork-Id: 458131 -X-Patchwork-Delegate: pablo@netfilter.org -Message-Id: <1428098686-17843-1-git-send-email-nwmcsween@gmail.com> -To: netfilter-devel@vger.kernel.org -Cc: Nathan McSween <nwmcsween@gmail.com> -Date: Fri, 3 Apr 2015 22:04:46 +0000 - -Signed-off-by: Nathan McSween <nwmcsween@gmail.com> ---- - include/libnfnetlink/libnfnetlink.h | 25 +++++----- - include/libnfnetlink/linux_nfnetlink.h | 11 +++-- - include/libnfnetlink/linux_nfnetlink_compat.h | 6 ++- - src/iftable.c | 9 ++-- - src/iftable.h | 6 ++- - src/libnfnetlink.c | 71 ++++++++++++++------------- - src/rtnl.c | 5 +- - src/rtnl.h | 3 +- - 8 files changed, 73 insertions(+), 63 deletions(-) - -diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h -index 1d8c49d..cd0be3d 100644 ---- a/include/libnfnetlink/libnfnetlink.h -+++ b/include/libnfnetlink/libnfnetlink.h -@@ -15,6 +15,7 @@ - #define aligned_u64 unsigned long long __attribute__((aligned(8))) - #endif - -+#include <stdint.h> - #include <sys/socket.h> /* for sa_family_t */ - #include <linux/netlink.h> - #include <libnfnetlink/linux_nfnetlink.h> -@@ -55,7 +56,7 @@ struct nfnlhdr { - struct nfnl_callback { - int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); - void *data; -- u_int16_t attr_count; -+ uint16_t attr_count; - }; - - struct nfnl_handle; -@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); - extern int nfnl_close(struct nfnl_handle *); - - extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, -- u_int8_t, u_int8_t, -+ uint8_t, uint8_t, - unsigned int); - extern void nfnl_subsys_close(struct nfnl_subsys_handle *); - -@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, - const struct iovec *iov, unsigned int num, - unsigned int flags); - extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, -- unsigned int, u_int8_t, u_int16_t, u_int16_t, -- u_int16_t); -+ unsigned int, uint8_t, uint16_t, uint16_t, -+ uint16_t); - extern __attribute__((deprecated)) int - nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, - unsigned, struct nlmsghdr *, -@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, - /* receiving */ - extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); - extern int nfnl_callback_register(struct nfnl_subsys_handle *, -- u_int8_t type, struct nfnl_callback *cb); --extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); -+ uint8_t type, struct nfnl_callback *cb); -+extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); - extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); - - /* parsing */ -@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); - - /* nfnl attribute handling functions */ - extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); --extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); --extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); --extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); -+extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); -+extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); -+extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); - extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); --extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); --extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); -+extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); -+extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); - extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - #define nfnl_parse_nested(tb, max, nfa) \ - nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) -@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); - ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) - - extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, -+ uint16_t type, uint32_t len, - unsigned char *val); - extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, - unsigned int size); -diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h -index 76a8550..7b843c6 100644 ---- a/include/libnfnetlink/linux_nfnetlink.h -+++ b/include/libnfnetlink/linux_nfnetlink.h -@@ -1,5 +1,6 @@ - #ifndef _NFNETLINK_H - #define _NFNETLINK_H -+#include <stdint.h> - #include <linux/types.h> - #include <libnfnetlink/linux_nfnetlink_compat.h> - -@@ -25,9 +26,9 @@ enum nfnetlink_groups { - /* General form of address family dependent message. - */ - struct nfgenmsg { -- u_int8_t nfgen_family; /* AF_xxx */ -- u_int8_t version; /* nfnetlink version */ -- u_int16_t res_id; /* resource id */ -+ uint8_t nfgen_family; /* AF_xxx */ -+ uint8_t version; /* nfnetlink version */ -+ uint16_t res_id; /* resource id */ - }; - - #define NFNETLINK_V0 0 -@@ -59,7 +60,7 @@ struct nfnl_callback - int (*call)(struct sock *nl, struct sk_buff *skb, - struct nlmsghdr *nlh, struct nlattr *cda[]); - const struct nla_policy *policy; /* netlink attribute policy */ -- const u_int16_t attr_count; /* number of nlattr's */ -+ const uint16_t attr_count; /* number of nlattr's */ - }; - - struct nfnetlink_subsystem -@@ -76,7 +77,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); - extern int nfnetlink_has_listeners(unsigned int group); - extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, - int echo); --extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); -+extern int nfnetlink_unicast(struct sk_buff *skb, uint32_t pid, int flags); - - #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ - MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) -diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h -index e145176..cd094fc 100644 ---- a/include/libnfnetlink/linux_nfnetlink_compat.h -+++ b/include/libnfnetlink/linux_nfnetlink_compat.h -@@ -3,6 +3,8 @@ - #ifndef __KERNEL__ - /* Old nfnetlink macros for userspace */ - -+#include <stdint.h> -+ - /* nfnetlink groups: Up to 32 maximum */ - #define NF_NETLINK_CONNTRACK_NEW 0x00000001 - #define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 -@@ -20,8 +22,8 @@ - - struct nfattr - { -- u_int16_t nfa_len; -- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest -+ uint16_t nfa_len; -+ uint16_t nfa_type; /* we use 15 bits for the type, and the highest - * bit to indicate whether the payload is nested */ - }; - -diff --git a/src/iftable.c b/src/iftable.c -index 5976ed8..3411c4c 100644 ---- a/src/iftable.c -+++ b/src/iftable.c -@@ -9,6 +9,7 @@ - /* IFINDEX handling */ - - #include <unistd.h> -+#include <stdint.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -27,10 +28,10 @@ - struct ifindex_node { - struct list_head head; - -- u_int32_t index; -- u_int32_t type; -- u_int32_t alen; -- u_int32_t flags; -+ uint32_t index; -+ uint32_t type; -+ uint32_t alen; -+ uint32_t flags; - char addr[8]; - char name[16]; - }; -diff --git a/src/iftable.h b/src/iftable.h -index 8df7f24..0cc5335 100644 ---- a/src/iftable.h -+++ b/src/iftable.h -@@ -1,8 +1,10 @@ - #ifndef _IFTABLE_H - #define _IFTABLE_H - --int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); --int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif); -+#include <stdint.h> -+ -+int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); -+int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif); - - int iftable_init(void); - void iftable_fini(void); -diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c -index 398b7d7..b8958dc 100644 ---- a/src/libnfnetlink.c -+++ b/src/libnfnetlink.c -@@ -36,6 +36,7 @@ - * minor cleanups - */ - -+#include <stdint.h> - #include <stdlib.h> - #include <stdio.h> - #include <unistd.h> -@@ -72,9 +73,9 @@ - - struct nfnl_subsys_handle { - struct nfnl_handle *nfnlh; -- u_int32_t subscriptions; -- u_int8_t subsys_id; -- u_int8_t cb_count; -+ uint32_t subscriptions; -+ uint8_t subsys_id; -+ uint8_t cb_count; - struct nfnl_callback *cb; /* array of callbacks */ - }; - -@@ -86,11 +87,11 @@ struct nfnl_handle { - int fd; - struct sockaddr_nl local; - struct sockaddr_nl peer; -- u_int32_t subscriptions; -- u_int32_t seq; -- u_int32_t dump; -- u_int32_t rcv_buffer_size; /* for nfnl_catch */ -- u_int32_t flags; -+ uint32_t subscriptions; -+ uint32_t seq; -+ uint32_t dump; -+ uint32_t rcv_buffer_size; /* for nfnl_catch */ -+ uint32_t flags; - struct nlmsghdr *last_nlhdr; - struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; - }; -@@ -145,7 +146,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h) - static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) - { - int i, err; -- u_int32_t new_subscriptions = nfnlh->subscriptions; -+ uint32_t new_subscriptions = nfnlh->subscriptions; - - for (i = 0; i < NFNL_MAX_SUBSYS; i++) - new_subscriptions |= nfnlh->subsys[i].subscriptions; -@@ -273,8 +274,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size) - * a valid address that points to a nfnl_subsys_handle structure is returned. - */ - struct nfnl_subsys_handle * --nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, -- u_int8_t cb_count, u_int32_t subscriptions) -+nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, -+ uint8_t cb_count, uint32_t subscriptions) - { - struct nfnl_subsys_handle *ssh; - -@@ -435,10 +436,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, - */ - void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, - struct nlmsghdr *nlh, unsigned int len, -- u_int8_t family, -- u_int16_t res_id, -- u_int16_t msg_type, -- u_int16_t msg_flags) -+ uint8_t family, -+ uint16_t res_id, -+ uint16_t msg_type, -+ uint16_t msg_flags) - { - assert(ssh); - assert(nlh); -@@ -849,14 +850,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr -+ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header - * @type: type of new attribute - * @data: content of new attribute - */ --int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) -+int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) - { - assert(n); - assert(maxlen > 0); -@@ -866,7 +867,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - } - - /** -- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr -+ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -875,7 +876,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) - * - */ - int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -885,7 +886,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr -+ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -894,7 +895,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, -- u_int16_t data) -+ uint16_t data) - { - assert(n); - assert(maxlen > 0); -@@ -904,7 +905,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - } - - /** -- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr -+ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr - * - * @nfa: struct nfattr - * @maxlen: maximal length of nfattr buffer -@@ -913,7 +914,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, - * - */ - int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(nfa); - assert(maxlen > 0); -@@ -923,7 +924,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - } - - /** -- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr -+ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr - * - * @n: netlink message header to which attribute is to be added - * @maxlen: maximum length of netlink message header -@@ -932,7 +933,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, - * - */ - int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, -- u_int32_t data) -+ uint32_t data) - { - assert(n); - assert(maxlen > 0); -@@ -980,7 +981,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len) - * - */ - void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, -- u_int16_t type, u_int32_t len, unsigned char *val) -+ uint16_t type, uint32_t len, unsigned char *val) - { - assert(iov); - assert(nfa); -@@ -1115,7 +1116,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h, - * appropiately. - */ - int nfnl_callback_register(struct nfnl_subsys_handle *ssh, -- u_int8_t type, struct nfnl_callback *cb) -+ uint8_t type, struct nfnl_callback *cb) - { - assert(ssh); - assert(cb); -@@ -1138,7 +1139,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh, - * On sucess, 0 is returned. On error, -1 is returned and errno is - * set appropiately. - */ --int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) -+int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) - { - assert(ssh); - -@@ -1161,8 +1162,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h, - assert(nfa); - - int min_len; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - const struct nfnl_subsys_handle *ssh; - struct nfnl_callback *cb; - -@@ -1212,8 +1213,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh, - int len) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - int err = 0; - - if (subsys_id > NFNL_MAX_SUBSYS) -@@ -1243,7 +1244,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len) - { - - while (len >= NLMSG_SPACE(0)) { -- u_int32_t rlen; -+ uint32_t rlen; - struct nlmsghdr *nlh = (struct nlmsghdr *)buf; - - if (nlh->nlmsg_len < sizeof(struct nlmsghdr) -@@ -1285,8 +1286,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh) - static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) - { - struct nfnl_subsys_handle *ssh; -- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); -+ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); -+ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); - - /* Is this an error message? */ - if (nfnl_is_error(h, nlh)) { -diff --git a/src/rtnl.c b/src/rtnl.c -index 7b4ac7d..34802fe 100644 ---- a/src/rtnl.c -+++ b/src/rtnl.c -@@ -11,6 +11,7 @@ - /* rtnetlink - routing table netlink interface */ - - #include <unistd.h> -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - #include <errno.h> -@@ -30,7 +31,7 @@ - #define rtnl_log(x, ...) - - static inline struct rtnl_handler * --find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) -+find_handler(struct rtnl_handle *rtnl_handle, uint16_t type) - { - struct rtnl_handler *h; - for (h = rtnl_handle->handlers; h; h = h->next) { -@@ -41,7 +42,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type) - } - - static int call_handler(struct rtnl_handle *rtnl_handle, -- u_int16_t type, -+ uint16_t type, - struct nlmsghdr *hdr) - { - struct rtnl_handler *h = find_handler(rtnl_handle, type); -diff --git a/src/rtnl.h b/src/rtnl.h -index 0c403dc..9858ae5 100644 ---- a/src/rtnl.h -+++ b/src/rtnl.h -@@ -1,13 +1,14 @@ - #ifndef _RTNL_H - #define _RTNL_H - -+#include <stdint.h> - #include <linux/types.h> - #include <linux/rtnetlink.h> - - struct rtnl_handler { - struct rtnl_handler *next; - -- u_int16_t nlmsg_type; -+ uint16_t nlmsg_type; - int (*handlefn)(struct nlmsghdr *h, void *arg); - void *arg; - }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index b22722d3439..3b6b804a8dc 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -2,17 +2,13 @@ stdenv.mkDerivation rec { pname = "libnfnetlink"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${version}.tar.bz2"; - sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; + sha256 = "0xn3rcrzxr6g82kfxzs9bqn2zvl2kf2yda30drwb9vr6sk1wfr5h"; }; - patches = [ - ./Use-stdlib-uint-instead-of-u_int.patch - ]; - meta = { description = "Low-level library for netfilter related kernel/userspace communication"; longDescription = '' diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index bd8a521544c..a9c1d2008af 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; + patches = [ ./fix-regtest-client.patch ]; + outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libotr/fix-regtest-client.patch b/pkgs/development/libraries/libotr/fix-regtest-client.patch new file mode 100644 index 00000000000..bfd0007b961 --- /dev/null +++ b/pkgs/development/libraries/libotr/fix-regtest-client.patch @@ -0,0 +1,11 @@ +diff -Nur a/tests/regression/client/client.c b/tests/regression/client/client.c +--- a/tests/regression/client/client.c 2015-12-25 17:39:45.000000000 +0000 ++++ b/tests/regression/client/client.c 2022-03-29 19:33:18.646398117 +0100 +@@ -27,6 +27,7 @@ + #include <syscall.h> + #include <sys/epoll.h> + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/un.h> + #include <unistd.h> + diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 4791e49ae3f..c4ab1094cce 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.0.5"; + version = "3.0.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9dFD22gws4Je3CocREnWOSc7C/oBeklwhxli2byiIUU="; + sha256 = "sha256-tF1Z+EC5rPm7Rf1FhU4+9nL1fjq5V0AcOtjXUCrCPaY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index f7a77832c18..01b302abd68 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "libunistring"; - version = "0.9.10"; + version = "1.0"; src = fetchurl { url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz"; - sha256 = "02v17za10mxnj095x4pvm80jxyqwk93kailfc2j8xa1r6crmnbm8"; + sha256 = "sha256-PAGEwOSS18IIzjHSXdHSxY8MPtbLvgMsWySM3a0xhUQ="; }; outputs = [ "out" "dev" "info" "doc" ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 4bce1341c7d..bda9001f913 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-SmrsZmmR+0XQiJxErt6K1usQgHHDVU/N/2cfnJR5SXY="; }; + patches = [ + # Fix for aarch64 and non-4K pages. Remove once upgraded past 1.6.2. + (fetchpatch { + url = "https://github.com/libunwind/libunwind/commit/e85b65cec757ef589f28957d0c6c21c498a03bdf.patch"; + sha256 = "1lnlygvhqrdrjgw303pg2k2k4ms4gaghpjsgmhk47q83vy1yjwfg"; + }) + ]; + postPatch = if stdenv.cc.isClang then '' substituteInPlace configure.ac --replace "-lgcc_s" "" '' else lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 7ccc0d2a199..a46ccdf7850 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.1.0"; + version = "2.2.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-yqOhlbOgDIAsxgQWoLKj7WpwJXvxeuW8yCvuKTtE7h0="; + sha256 = "sha256-SqKXxmyP31kb6ikMQRqPaKNIpeLcMLLEGInCGIx5jWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 4df5bde2287..8bba9945abf 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxcrypt"; - version = "4.4.18"; + version = "4.4.28"; src = fetchFromGitHub { owner = "besser82"; repo = "libxcrypt"; rev = "v${version}"; - sha256 = "4015bf1b3a2aab31da5a544424be36c1a0f0ffc1eaa219c0e7b048e4cdcbbfe1"; + sha256 = "sha256-Ohf+RCOXnoCxAFnXXV9e2TCqpfZziQl+FGJTGDSQTF0="; }; preConfigure = '' diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index 0602b4c3b52..1c9a6a1e2ac 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + meta = with lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix index c71bf17a3c7..47b9ba63fc2 100644 --- a/pkgs/development/libraries/mapbox-gl-native/default.nix +++ b/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -30,6 +30,11 @@ mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e"; sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba"; }) + (fetchpatch { + name = "fix-compilation.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=mapbox-gl-native"; + hash = "sha256-KgJHyoIdKdnQo+gedns3C+mEXlaTH/UtyQsaYR1T3iI="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 5d9cc98b1a9..aa584deddb8 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -92,12 +92,14 @@ stdenv.mkDerivation rec { # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; - NIX_CFLAGS_COMPILE = toString [ + NIX_CFLAGS_COMPILE = [ "-DGIT_VERSION=\"v${version}\"" "-Wno-error=deprecated-declarations" "-Wno-error=cast-function-type" "-Wno-error=stringop-truncation" "-Wno-error=stringop-overflow" + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-Wno-error=stringop-overread" ]; NIX_LDFLAGS = "-lXext"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a8711a3eff5..f5dbb30d65f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,7 +6,6 @@ , libelf, libvdpau , libglvnd, libunwind , galliumDrivers ? ["auto"] -, driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , OpenGL, Xplugin @@ -34,7 +33,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.8"; + version = "22.0.1"; branch = versions.major version; self = stdenv.mkDerivation { @@ -48,7 +47,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 = "19wx5plk6z0hhi0zdzxjx8ynl3lhlc5mbd8vhwqyk92kvhxjf3g7"; + sha256 = "0vs20kyq9sxh52hd242yf7nz2wzw6di8jw7s19pb6q25qn19cpy0"; }; # TODO: @@ -114,7 +113,6 @@ self = stdenv.mkDerivation { "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" "-Dplatforms=${concatStringsSep "," eglPlatforms}" - "-Ddri-drivers=${concatStringsSep "," driDrivers}" "-Dgallium-drivers=${concatStringsSep "," galliumDrivers}" "-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}" diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index ae73a7991eb..60e543c4629 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { "--enable-shared" "--enable-sharedlib" "--with-pm=${withPm}" + ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [ + "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 + "FCFLAGS=-fallow-argument-mismatch" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index c496927ebca..0f358c27962 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "--enable-threads=multiple" "--enable-hybrid" "--enable-shared" + "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10 ] ++ optional useSlurm "--with-pm=slurm" ++ optional (network == "ethernet") "--with-device=ch3:sock" ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" ] diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 40f22b0cabe..d64d631f94c 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin CoreFoundation; doCheck = true; + FFLAGS = [ "-std=legacy" ]; + FCFLAGS = [ "-std=legacy" ]; + meta = with lib; { description = "Fortran API to manipulate netcdf files"; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index fe51d4b524a..da2ad9c3f9b 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -1,6 +1,5 @@ { lib, stdenv -, fetchpatch -, fetchurl +, fetchurl, unzip , hdf5 , m4 , curl # for DAP @@ -11,25 +10,13 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; - version = "4.8.0"; # Remove patch mentioned below on upgrade + version = "4.8.1"; src = fetchurl { - url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz"; - sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7"; + url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz"; + sha256 = "1cbjwjmp9691clacw5v88hmpz46ngxs3bfpkf2xy1j7cvlkc72l0"; }; - patches = [ - # Fixes: - # *** Checking vlen of compound file...Sorry! Unexpected result, tst_h_atts3.c, line: 289 - # FAIL tst_h_atts3 (exit status: 2) - # TODO: Remove with next netcdf release (see https://github.com/Unidata/netcdf-c/pull/1980) - (fetchpatch { - name = "netcdf-Fix-tst_h_atts3-for-hdf5-1.12.patch"; - url = "https://github.com/Unidata/netcdf-c/commit/9fc8ae62a8564e095ff17f4612874581db0e4db5.patch"; - sha256 = "128kxz5jikq32x5qjmi0xdngi0k336rf6bvbcppvlk5gibg5nk7v"; - }) - ]; - postPatch = '' patchShebangs . @@ -61,6 +48,7 @@ in stdenv.mkDerivation rec { ''; doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64)); + checkInputs = [ unzip ]; meta = { description = "Libraries for the Unidata network Common Data Format"; diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix new file mode 100644 index 00000000000..a958fa059d6 --- /dev/null +++ b/pkgs/development/libraries/nss/esr.nix @@ -0,0 +1,4 @@ +import ./generic.nix { + version = "3.68.3"; + sha256 = "sha256-5NDZsLVhfLM0gSZC7YAfjlH1mVyN2FwN78jMra/Lwzc="; +} diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/generic.nix index 454c09e1b02..3d109b96790 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -1,3 +1,4 @@ +{ version, sha256 }: { lib , stdenv , fetchurl @@ -22,14 +23,7 @@ let sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - # NOTE: Whenever you updated this version check if the `cacert` package also - # needs an update. You can run the regular updater script for cacerts. - # 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.76"; underscoreVersion = lib.replaceStrings [ "." ] [ "_" ] version; - in stdenv.mkDerivation rec { pname = "nss"; @@ -37,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0c0nmajcvnm8gqz2v6wrlq04yzy3y7hcs806wjnx4r6kml8073hv"; + inherit sha256; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -192,7 +186,7 @@ stdenv.mkDerivation rec { 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; [ ]; + maintainers = with maintainers; [ hexa ajs124 ]; license = licenses.mpl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix new file mode 100644 index 00000000000..db8d0179add --- /dev/null +++ b/pkgs/development/libraries/nss/latest.nix @@ -0,0 +1,10 @@ +# NOTE: Whenever you updated this version check if the `cacert` package also +# needs an update. You can run the regular updater script for cacerts. +# 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 + +import ./generic.nix { + version = "3.76.1"; + sha256 = "0ai37ncg50n4s5243bfvsip8isqq1y6w2swg1n4xgqg2fk1h8cg1"; +} diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 6e253b97318..0b870bf9e40 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -129,6 +129,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; + platforms = platforms.all; + broken = stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 5fc8d496ba9..9d4e52acb4d 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" "man" ]; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 - configureFlags = optional (!stdenv.hostPlatform.isRiscV && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit" ++ [ + configureFlags = optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [ "--enable-unicode-properties" "--disable-cpp" ] diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 8393cb8c591..0c57b4cd5cf 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" - ] ++ lib.optional (!stdenv.hostPlatform.isRiscV && - !(stdenv.hostPlatform.isDarwin && - stdenv.hostPlatform.isAarch64)) "--enable-jit"; + ] ++ lib.optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto"; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 834e3fcbba8..f09a1a0e19b 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; buildInputs = [ zlib ]; + FFLAGS = [ + "-std=legacy" # fix build with gfortran 10 + ]; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index 6e0b6ab6722..1f02bfa0dab 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "pmdk"; - version = "1.9.2"; + version = "1.11.1"; src = fetchFromGitHub { owner = "pmem"; repo = "pmdk"; rev = "refs/tags/${version}"; - sha256 = "0awmkj6j9y2pbqqmp9ql00s7qa3mnpppa82dfy5324lindq0z8a1"; + hash = "sha256-8bnyLtgkKfgIjJkfY/ZS1I9aCYcrz0nrdY7m/TUVWAk="; }; nativeBuildInputs = [ autoconf pkg-config gnum4 pandoc ]; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { patchPhase = "patchShebangs utils"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + installPhase = '' make install prefix=$out diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index 86ef2af96e7..e6cb90994d9 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "polkit-qt-1"; - version = "0.113.0"; + version = "0.114.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-W4ZqKVTvEP+2YVbi/orQMhtVKKjfLkqRsC9QQc5VY6c="; + sha256 = "sha256-LrDyJEWIgpX/or+8DDaThHoPlzu2sMPkzOAhi+fjkH4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 2f119311c1f..d3d821ba1db 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -25,12 +25,14 @@ stdenv.mkDerivation rec { "LAPACK=-L${lapack}/lib -llapack" "BLAS=-L${blas}/lib -lblas" "PREFIX=${placeholder "out"}" - ${lib.optionalString blas.isILP64 - # If another application intends to use qrupdate compiled with blas with - # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): - # https://savannah.gnu.org/bugs/?50339 - "FFLAGS=-fdefault-integer-8" - } + "FFLAGS=${toString ([ + "-std=legacy" + ] ++ lib.optionals blas.isILP64 [ + # If another application intends to use qrupdate compiled with blas with + # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): + # https://savannah.gnu.org/bugs/?50339 + "-fdefault-integer-8" + ])}" ) ''; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index a3664ae9e05..2b8dccf162c 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -84,12 +84,6 @@ 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 { @@ -152,7 +146,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 2bb0695c8d0..b95d49fef87 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -126,13 +126,6 @@ let ./qtwebkit-darwin-no-qos-classes.patch ]; qttools = [ ./qttools.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; @@ -151,7 +144,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; diff --git a/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch b/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch deleted file mode 100644 index fb3d6327e45..00000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 7217ea9cf297e664be876eb82b66a1b4f157ca80 -Author: Peter Seiderer <ps.report@gmx.net> -Date: Fri Apr 3 21:52:30 2020 +0200 - - fix libdrm related configure test failure - - Fixes: - - Project ERROR: Test config.qtwayland_client.tests.dmabuf-server-buffer tries to use undeclared library 'drm' - Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-server-buffer tries to use undeclared library 'drm' - Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-client-buffer tries to use undeclared library 'drm' - - Task-number: QTBUG-83303 - Change-Id: I3970f4e3855fcfa760493631a14adb6a16950aa9 - Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> - Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> - Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> - (cherry picked from commit ca63fe81df8ac910f43539719566ed6745700c2b) - (cherry picked from commit 1344ca6b5a8fbc1b28727feea6d856af8bf3bc93) - -diff --git a/src/client/configure.json b/src/client/configure.json -index 06213968..27c73f89 100644 ---- a/src/client/configure.json -+++ b/src/client/configure.json -@@ -74,7 +74,8 @@ - "label": "Linux dma-buf Buffer Sharing", - "type": "compile", - "test": "dmabuf_server_buffer", -- "use": "egl drm" -+ "libs": "-ldrm", -+ "use": "egl" - }, - "vulkan-server-buffer": { - "label": "Vulkan Buffer Sharing", -diff --git a/src/compositor/configure.json b/src/compositor/configure.json -index 0dbb3364..73e4c1a8 100644 ---- a/src/compositor/configure.json -+++ b/src/compositor/configure.json -@@ -80,13 +80,15 @@ - "label": "Linux dma-buf Buffer Sharing", - "type": "compile", - "test": "dmabuf_server_buffer", -- "use": "egl drm" -+ "libs": "-ldrm", -+ "use": "egl" - }, - "dmabuf-client-buffer": { - "label": "Linux Client dma-buf Buffer Sharing", - "type": "compile", - "test": "dmabuf_client_buffer", -- "use": "egl drm" -+ "libs": "-ldrm", -+ "use": "egl" - }, - "vulkan-server-buffer": { - "label": "Vulkan Buffer Sharing", diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 946c196f4a2..763bfc675cb 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -60,12 +60,6 @@ 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"; @@ -107,7 +101,7 @@ let } { inherit self srcs patches; }; - callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 8bf6386c4c6..b772331fc3d 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,117 +1,117 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "dba14d48611b9e9d59576172658779ab4a39b416", + "rev": "6d926ec2739f2289c6b0bbfbc325700046e1ceee", "sha256": "1w2m1rm6mhj9qbanak36rqvc30x495zvj7mh2syy1yd29by0g5i8" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "f0d03da0e37a84029a4eae1733813521482ac1fb", + "rev": "2c53a16f431bbb950bfca8ac32ddabf217a0bf04", "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "8cce1098c59534352aa0f343ea73861f603ac04a", + "rev": "1939eada1cdf00052bba32657d9d975c1e255128", "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "d16bf02a11953dcac01dca73e6f3778f293adefe", - "sha256": "0rpyd5r60707lzfmfi3y501c7is1gzhh30bframsy8bwglck2hjj" + "rev": "ee7a89b2c4750bc3cabe4aeb466645d6ac2a872b", + "sha256": "10aj4nxfpx34k0if2kl5sxfjpk3sb1r9z7p6haypjpw60cssjbsl" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "130463160b4923069eb98da49edaf7d93180f4f8", - "sha256": "19g35cddbfh307mk76wac1ps03warynlsj7xi8i596bxiaf7i4pw" + "rev": "f13988aa1ad9de5d92e7b0ba4d0d947dd019d759", + "sha256": "1l7zmdkakc7bc9c10nzijg86ps9f3jpi1nblkfxr6521g0xjrmb8" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26", - "sha256": "1lpiq3svlnj8f8apd12if11sng7k0l8y6vhr317srzz4dd77cfry" + "rev": "aa2def2bdb76f8fd2454dc4515883fd7b5ddb521", + "sha256": "1fy4anhj432fz05kinb67v8ckdp9h7150fhy4dm6hgbjq6y7j16g" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "c085311c02dd216e5a041b90c164d55b3cf3ce92", + "rev": "19af9584f7b80928ee49950c573c770af68c9519", "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "1d49a5b678957adde7e2db23a485a3f48157bc8f", - "sha256": "1wdpgh23mdn0nny9c837iyg9kszc3m4cdmaanf8glymkzn0rkd8w" + "rev": "02105099301450c890e1caba977ef44efdc43da7", + "sha256": "0wk8a9fbjwrqwb4gj5s78ipg1svdrhz80cykjd6qgkd26dh1p4kn" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "897e90fe304d844beaf694b82a93a50237fa8b9e", - "sha256": "1c4m9vlgg6bfw7hwzanl5s4vslg0r7xiz50lanhqrlcrr9i36xs1" + "rev": "ed002122ce74b3505ba55262ddbc842a810e8159", + "sha256": "03hb1jgx49rh5gldxq7d85s1ny0yl64nylw7d61dvsgbs422fqn9" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "64afa18a0a1e9588060e2e6d917bb01ccdd48a81", + "rev": "6b7a6303439f83147680723f4d8142d676cdb928", "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "c36998dc1581167b12cc3de8e4ac68c2a5d9f76e", + "rev": "379577925766385991f413a2b0d0d46831381ffa", "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "cb82c74310837fe4e832c8ab72176a5d63e4355f", - "sha256": "0j4cv5sa6mm3adcjw8cv6kbzrslmhjc1rgxqgc130l8vm3vmgbkr" + "rev": "90038c936763645610fe1e5f05cfc025e4d98631", + "sha256": "1yqfz58p7s92jr8d4lk4n0dv6ij8fslh4sxdz0azd0p6077rim77" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "861e372b6ad81570d4f496e42fb25a6699b72f2f", - "sha256": "1g24pg9v6sv5zf80r48innp3h4g0hss69hnr7ygfzfvfnmmn6g52" + "rev": "e07f35879536640ad784e71e5261c5a597d504f5", + "sha256": "1yhwaz2wyq2hx9bqrcimabj9jbv2kr9h0czxxryh5b9b6aim6ncw" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4", + "rev": "fca3f80f0ce389271e5bd9af864ce56a313d359a", "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "e72896968697e2a8af16a312e1560948e4c40f30", - "sha256": "1hndpbr1nnybn7frg76q99bk1c8fhvra6wjm0q78p4a8pinrvcms" + "rev": "80bc8d86508579c7a57110c09a44e33f9d8bc0e5", + "sha256": "1n9qixhgz66frsp56cr7zzaxcns3ijip46pa9zcz3m0f438n08z7" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "bd29c87027637a013f2c5e3b549fcda84e4d7545", - "sha256": "11pz9zzrhsr3n78ga7l3kp3gi20rpxsa4iz3wclhcbcm2xr3nd94" + "rev": "fa6c3d653682f9fd331d859c7196a291a8a4d8d5", + "sha256": "0x4112b93dryfgy6w49z3jqd8xi8pvc3xqfn2j0n0qhdp4vvz5sl" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a", + "rev": "958db00a2064f77b354b573102ca2c2b2e07529c", "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "cbf444fb570ca4f4ca21d963d2ae4010f10d473e", + "rev": "255b9e16f286003bbfaff9d48e4548fb0cb3b398", "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "3e3e53c834b25dc2959dd30f319d12d6f84ee1e3", - "sha256": "1b1khfg26zl3p28yvhwjfldqy3flh10pb5hm5z0av03rz7jy7l8s" + "rev": "1ede2ac20170357b3e8d7d9810e5474e08170827", + "sha256": "1sxlyv1y6aanln7cv1m8fgjkp72lgx2k4q8a23m79g7xryl0xx2a" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420", - "sha256": "1vxp0kwigwhqyyfm0xg8llyd1l1f4l18hmk6xqkm57xpi15x55bc" + "rev": "d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b", + "sha256": "0inym59pnr6pk9y4im2fsq1hzs8b4rwqs3x6cgc61z3kqyv74cb6" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "d8d6b14b9907adbc6ce307d52be34aaa761a58fa", - "sha256": "15c7nrvvn7qc3l7kdbl5wdpazqwv8zvg1aij2jvcrhbymn0zl3mc" + "rev": "26bd7f5414dc592ab5277e2bb4ad0199faa889de", + "sha256": "0d53d1fqcc7ccd9ljr3q1qxd7k7kkn6msqa81592pg6b4ridzdsq" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "67503cdadea43b95ddad0de1a04951aff0ce1a07", - "sha256": "0h4b3ibcf6rsmqmcfbwbk9pbvw3b9cac8nx2538aqvnpyyp1vhid" + "rev": "98b1ff53458887061b4bcc183efcce899f432394", + "sha256": "1q4d88cym0c5vmw40qjp968x5sp7dx4mq6cr1r6px9i0ifvimdrg" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735", + "rev": "581475dfeb44c8b51c0be86e0f2f57df7d117a80", "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146" }, "qtscript": { @@ -121,87 +121,87 @@ }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "7a15000f42c7a3171719727cd056f82a78244ed7", - "sha256": "1i2ajsj9pb1s4lk4djj1h1ay9mkz1z3m75a747cspyc1p1iymipq" + "rev": "50d2da3965ed8e85f3f5f5760393c42b12d34a9f", + "sha256": "148qdyw084agpp4n31cfcgk39ppwf9ndifnvihd94c6ksf1ax3ks" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "921a31375f29e429e95352b08b2b9dbfea663cb1", - "sha256": "1ijayk6lf34nwv7s3ib3cfqx9sjrmr1c6jnziwmxa1l6fy3ik4g8" + "rev": "975ba788d3d0ee87aa08bb5301cd33dcbf00521b", + "sha256": "13x0d0ky5dybp1lq39yy82xg7hxdvmksam8r85gqargsi0zr5s8x" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "8884c5e43df846deac5a0c7c290eeb633d6bfe32", - "sha256": "1ydb5x21j26pl58mr6klnwixkqx8h119nvnzvyawz83gji3ay3a5" + "rev": "22b3cad193232ab379a0c9e16989a7db1fdc9234", + "sha256": "1j084szvdmfxbc9n37phxsd7k4vxd073vwy1hcnjhmpyg9hwrw81" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4", + "rev": "f95e2411d7c978def87846ea7cedf3dc5fd7c8b8", "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b", - "sha256": "1ljf45f65pfp8x367qnzl0ssz7n17cxhk29qvqpz9z7rh65zqix5" + "rev": "08b27c29aadc0cc0303cca97c9a3baa2a690dfe4", + "sha256": "0lm6i85d7zav43lsrxnhdqcq68np32s3widla8z6c208q1pf3qs6" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "728012f7762ecd5762d493f8796907c6456f31e7", + "rev": "2f42157cabbd1db6249ccb1d14e6eede80451e0c", "sha256": "1ldizgybl4fp95xlzf103hqmsqdmr3jbx048jyxcb5gjd3pbwh7p" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "33693a928986006d79c1ee743733cde5966ac402", - "sha256": "02n0lppsp6g4s9bdvnfxpf7ndkbs9bzm0clcwvirwf2cd8q95a4n" + "rev": "a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4", + "sha256": "1x7vzqvc80k0fanvahibmglcv4za07hfiamp26wkhmk0g634ms2q" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "8fbbdf21f127197f97b58c7d80d2fa2a59135638", + "rev": "a6d5e7f84a57394db4c8b069f81c56cfeb802e19", "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "98d1fd864cbb6c7c012c4139118808af110fb8f0", - "sha256": "07xjmhca7z5bva03zk73d948qz0a3wnn4kvyy6j4cnp3w5giz5kc" + "rev": "bb40dee811333929dd467a480dce24ab7af84ef9", + "sha256": "0w6li1qwm2x4plzixd1dv6s1jvcmyrbaw328sri2cmiswajhywdw" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "214f7ab9d3384a4123f14d9f6cd0205cf0aaa794", - "sha256": "1qd64w5c16gmpgi936dfjc0pn1a1rbs752k8lfqv2xwysx7qkqwi" + "rev": "118674630cdb5933e66a8b4415afe7c716ad4662", + "sha256": "1zvx11z0cfv2avj211zsh79806m6mdkk3kczwhcd98k1qs9r9d3p" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "fa8b07105b5e274daaa8adcc129fa4aa0447f9f7", + "rev": "611016a49f3a9ba7b58bef29bc295323e06373ae", "sha256": "0mggqa8kixknbm1p5i5lkrmkj1na3b2xflj011dkjbj8wb78i42n" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "550a8cee241bbf8c11863dec9587d579dcb1108b", + "rev": "4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1", "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "b13b56904b76e96ea52d0efe56395acc94b17d96", - "sha256": "047asrq7c44v7cn2d7c5zba47qzpsb6nidba77i2xn7gqlfv6z3b" + "rev": "7196d2cc34adf9f45b50a9488f4ff95b36092993", + "sha256": "1a7n5i4s6nsb19z4r3m3w7gadjpp0irm77ysk61axqjda4ypi7fw" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "920de5f1cd9f9001cfef1bfd2c19e6720793362f", - "sha256": "04hnqalabhypkd2hgl45jxf9p1p6dgjwlc5b7gs4f6588lafgd3f" + "rev": "ec4de0cec2299f4ae0228ea2c71011e0520ca40e", + "sha256": "1na9xv2q4wwy10bcr7684i59d9a20n6s91m12n49yjgrhpn4f4jv" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "3df03dab21f3e84d5a7274c64dd879854ca1bfe7", - "sha256": "12dkw982xcm7hxw3lxhg34wny4srbickxm9s3nz7bdyp9dmqnygx" + "rev": "051202df9c553d7c0a384f07bd67fde98f3b02c4", + "sha256": "0d8y4x41slqjr3nflb14ah1wl2hrlir7331ch9k1qfrk3798a760" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "3898f5484fd4864b047729bfeda9a1222f32364f", + "rev": "f628d7a60e45d90a439cb0a393a6229ac6892be5", "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "189e28d0aff1f3d7960228ba318b83e3cadac98c", + "rev": "af4958af9d628d6124e64abd9743abce42f15a6f", "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq" } } diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0222a708bb8..c3da951ca52 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -7,11 +7,10 @@ , libiconv, libobjc, xcbuild, AGL, AppKit, ApplicationServices, Carbon, Cocoa, CoreAudio, CoreBluetooth , CoreLocation, CoreServices, DiskArbitration, Foundation, OpenGL, MetalKit, IOKit -, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite -, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng -, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev -, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm -, zlib, at-spi2-core +, dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite +, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb +, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, xcbutil +, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm , zlib, at-spi2-core # optional dependencies , cups ? null, libmysqlclient ? null, postgresql ? null @@ -62,6 +61,8 @@ stdenv.mkDerivation { # Text rendering fontconfig freetype + libdrm + # X11 libs libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm @@ -151,6 +152,9 @@ stdenv.mkDerivation { ''} NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" + + # paralellize compilation of qtmake, which happens within ./configure + export MAKEFLAGS+=" -j$NIX_BUILD_CORES" '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' ./bin/syncqt.pl -version $version ''; diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index baf5c30e73c..41a7eb6776c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -15,8 +15,9 @@ qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] - ++ lib.optional (stdenv.isLinux) alsa-lib + buildInputs = [ gstreamer gst-plugins-base ] + # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio + ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] ++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 1bd1adedaf0..851e4ad6966 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). Beware: shared among different Qt5 versions. + ./qtwayland-app_id.patch + ]; } diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 3323e3fb4cc..b74d5e08680 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -14,7 +14,7 @@ in mkDerivation (args // { inherit pname version src; - patches = args.patches or patches.${pname} or []; + patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 2cdad981fbd..4c8249abe87 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2022-02-01"; + version = "2022-04-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - sha256 = "sha256-3RspCfJD2jV7GYuzeBUcxkZsdHyL14kaz8lSoIrH7b8="; + sha256 = "sha256-ywmXIAyVWYMKBOsAndcq7dFYpn9ZgNz5YWTPjylXxsk="; }; preConfigure = '' diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index f1d3ffd0212..6f641bd6a60 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +}: stdenv.mkDerivation rec { pname = "rlottie"; @@ -11,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"; }; + patches = [ + # Fixed build with GCC 11 + (fetchpatch { + url = "https://github.com/Samsung/rlottie/commit/2d7b1fa2b005bba3d4b45e8ebfa632060e8a157a.patch"; + hash = "sha256-2JPsj0WiBMMu0N3NUYDrHumvPN2YS8nPq5Zwagx6UWE="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config ]; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index 172935fc979..f1bdfb9836e 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -5,7 +5,11 @@ final: prev: let ### CuDNN - buildCuDnnPackage = args: callPackage ./generic.nix {} args; + buildCuDnnPackage = args: + let + useCudatoolkitRunfile = lib.versionOlder cudaVersion "11.3.999"; + in + callPackage ./generic.nix { inherit useCudatoolkitRunfile; } args; toUnderscore = str: lib.replaceStrings ["."] ["_"] str; diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 2e53bdcdfc4..1e9bac5efed 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,8 +1,14 @@ { stdenv , lib -, cudatoolkit +, zlib +, useCudatoolkitRunfile ? false +, cudaVersion +, cudaMajorVersion +, cudatoolkit # if cuda>=11: only used for .cc +, libcublas ? null # cuda <11 doesn't ship redist packages +, autoPatchelfHook +, autoAddOpenGLRunpathHook , fetchurl -, addOpenGLRunpath , # The distributed version of CUDNN includes both dynamically liked .so files, # as well as statically linked .a files. However, CUDNN is quite large # (multiple gigabytes), so you can save some space in your nix store by @@ -17,44 +23,53 @@ , url , hash ? null , sha256 ? null -, supportedCudaVersions ? [] +, supportedCudaVersions ? [ ] }: assert (hash != null) || (sha256 != null); +assert useCudatoolkitRunfile || (libcublas != null); + let + inherit (cudatoolkit) cc; + majorMinorPatch = version: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); version = majorMinorPatch fullVersion; -in stdenv.mkDerivation { - name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; + cudatoolkit_root = + if useCudatoolkitRunfile + then cudatoolkit + else libcublas; +in +stdenv.mkDerivation { + pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; inherit version; - # It's often the case that the src depends on the version of cudatoolkit it's - # being linked against, so we pass in `cudatoolkit` as an argument to `mkSrc`. + src = fetchurl { inherit url hash sha256; }; - nativeBuildInputs = [ addOpenGLRunpath ]; + # Check and normalize Runpath against DT_NEEDED using autoPatchelf. + # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") + nativeBuildInputs = [ + autoPatchelfHook + autoAddOpenGLRunpathHook + ]; + + # Used by autoPatchelfHook + buildInputs = [ + cc.cc.lib # libstdc++ + zlib + cudatoolkit_root + ]; - # Some cuDNN libraries depend on things in cudatoolkit, eg. - # libcudnn_ops_infer.so.8 tries to load libcublas.so.11. So we need to patch - # cudatoolkit into RPATH. See also https://github.com/NixOS/nixpkgs/blob/88a2ad974692a5c3638fcdc2c772e5770f3f7b21/pkgs/development/python-modules/jaxlib/bin.nix#L78-L98. + # We used to patch Runpath here, but now we use autoPatchelfHook # # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in # version 8.3.2 it seems to have been renamed to simply "lib/". installPhase = '' runHook preInstall - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc cudatoolkit.lib ]}:${cudatoolkit}/lib:\$ORIGIN/" $1 - } - - for sofile in {lib,lib64}/lib*.so; do - fixRunPath $sofile - done - mkdir -p $out cp -a include $out/include [ -d "lib/" ] && cp -a lib $out/lib @@ -66,20 +81,20 @@ in stdenv.mkDerivation { runHook postInstall ''; - # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - postFixup = '' - for lib in $out/lib/lib*.so; do - addOpenGLRunpath $lib - done + # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. + postFixup = lib.optionalString (lib.versionAtLeast fullVersion "8.0.5") '' + patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so ''; - propagatedBuildInputs = [ - cudatoolkit - ]; - passthru = { - inherit cudatoolkit; + inherit useCudatoolkitRunfile; + + cudatoolkit = lib.warn '' + cudnn.cudatoolkit passthru attribute is deprecated; + if your derivation uses cudnn directly, it should probably consume cudaPackages instead + '' + cudatoolkit; + majorVersion = lib.versions.major version; }; @@ -89,9 +104,10 @@ in stdenv.mkDerivation { # official version constraints (as recorded in default.nix). In some cases # you _may_ be able to smudge version constraints, just know that you're # embarking into unknown and unsupported territory when doing so. - broken = !(elem cudatoolkit.majorMinorVersion supportedCudaVersions); + broken = !(elem cudaVersion supportedCudaVersions); description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; + # TODO: consider marking unfreRedistributable when not using runfile license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mdaiter samuela ]; diff --git a/pkgs/development/libraries/smesh/default.nix b/pkgs/development/libraries/smesh/default.nix index 8494799333b..0181977873a 100644 --- a/pkgs/development/libraries/smesh/default.nix +++ b/pkgs/development/libraries/smesh/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ opencascade ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + meta = with lib; { description = "Extension to OCE providing advanced meshing features"; homepage = "https://github.com/tpaviot/smesh"; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 75c238a430c..0b3dff1ebd8 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -59,6 +59,19 @@ stdenv.mkDerivation rec { )] ; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/127608 + # + # build error: + # + # /private/tmp/nix-build-sundials-5.7.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. + # ldr x0, [x0, ___stack_chk_guard];momd + # ^ + # /private/tmp/nix-build-sundials-5.7.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. + # ldr x0, [x0, ___stack_chk_guard];momd + + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 07d830f00ce..cb7af61a63e 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - fixDarwinDylibNames python3 wafHook docbook-xsl-nons docbook_xml_dtd_42 + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; buildInputs = [ diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 5ab4ff3b413..34a545d7996 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -2,6 +2,7 @@ , autoreconfHook, autoconf-archive, pkg-config, doxygen, perl , openssl, json_c, curl, libgcrypt , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which +, shadow }: let # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss, @@ -14,17 +15,18 @@ in stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "3.0.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "106yhsjwjadxsl9dqxywg287mdwsksman02hdalhav18vcnvnlpj"; + sha256 = "1jijxnvjcsgz5yw4i9fj7ycdnnz90r3l0zicpwinswrw47ac3yy5"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config doxygen perl + shadow ]; # cmocka is checked / used(?) in the configure script @@ -57,6 +59,8 @@ stdenv.mkDerivation rec { --replace '@PREFIX@' $out/lib/ substituteInPlace ./test/unit/tctildr-dl.c \ --replace '@PREFIX@' $out/lib + substituteInPlace ./configure.ac \ + --replace 'm4_esyscmd_s([git describe --tags --always --dirty])' '${version}' ''; configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ @@ -85,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tpm2-software/tpm2-tss"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ ]; }; } 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 <madler@alumni.caltech.edu> +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 <madler@alumni.caltech.edu> +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 + |