diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/libraries | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
242 files changed, 2887 insertions, 1719 deletions
diff --git a/nixpkgs/pkgs/development/libraries/NSPlist/default.nix b/nixpkgs/pkgs/development/libraries/NSPlist/default.nix deleted file mode 100644 index 0ad160673973..000000000000 --- a/nixpkgs/pkgs/development/libraries/NSPlist/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, flex, cmake }: - -stdenv.mkDerivation { - pname = "NSPlist"; - version = "unstable-2017-04-11"; - - src = fetchFromGitHub { - owner = "matthewbauer"; - repo = "NSPlist"; - rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a"; - sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; - }; - - nativeBuildInputs = [ flex cmake ]; - - preConfigure = '' - # Regenerate the lexer for improved compatibility with clang 16. - flex -o src/NSPlistLexer.cpp <(tail --lines=+17 src/NSPlistLexer.l) - ''; - - meta = with lib; { - maintainers = with maintainers; [ matthewbauer ]; - description = "Parses .plist files"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix b/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix deleted file mode 100644 index 4eea44e3ba0b..000000000000 --- a/nixpkgs/pkgs/development/libraries/PlistCpp/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: - -stdenv.mkDerivation { - pname = "PlistCpp"; - version = "unstable-11615d"; - - src = fetchFromGitHub { - owner = "matthewbauer"; - repo = "PlistCpp"; - rev = "11615deab3369356a182dabbf5bae30574967264"; - sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv"; - }; - - postPatch = '' - sed -i "1i #include <algorithm>" src/Plist.cpp - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost NSPlist pugixml ]; - - meta = with lib; { - maintainers = with maintainers; [ matthewbauer ]; - description = "CPP bindings for Plist"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix index a8824904aea8..03b3f146ca93 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_image/default.nix @@ -1,20 +1,15 @@ { lib, stdenv, fetchurl , pkg-config , SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation -, version ? "2.6.3" -, hash ? "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw=" }: -let +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; -in - -stdenv.mkDerivation { - inherit pname version; + version = "2.8.2"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; - inherit hash; + url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz"; + hash = "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw="; }; nativeBuildInputs = [ pkg-config ]; @@ -44,4 +39,4 @@ stdenv.mkDerivation { license = licenses.zlib; maintainers = with maintainers; [ cpages ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix index 41d84184c165..bccc11f43d41 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_gfx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL_gfx"; - version = "2.0.26"; + version = "2.0.27"; src = fetchurl { url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz"; - sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; + sha256 = "sha256-37FaxfjOeklS3BLSrtl0dRjF5rM1wOMWNtI/k8Yw9Bk="; }; # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h diff --git a/nixpkgs/pkgs/development/libraries/aemu/default.nix b/nixpkgs/pkgs/development/libraries/aemu/default.nix new file mode 100644 index 000000000000..e2ea8e5b1cd5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/aemu/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitiles, cmake, darwin }: + +stdenv.mkDerivation { + pname = "aemu"; + version = "0.1.2"; + + src = fetchFromGitiles { + url = "https://android.googlesource.com/platform/hardware/google/aemu"; + rev = "07ccc3ded3357e67e39104f18f35feaf8b3b6a0e"; + hash = "sha256-H3IU9aTFSzUAqYgrtHd4F18hbhZsbOJGC4K5JwMQOOw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ]; + + cmakeFlags = [ + "-DAEMU_COMMON_GEN_PKGCONFIG=ON" + "-DAEMU_COMMON_BUILD_CONFIG=gfxstream" + # "-DENABLE_VKCEREAL_TESTS=OFF" + ]; + + meta = with lib; { + homepage = "https://android.googlesource.com/platform/hardware/google/aemu"; + description = "Android emulation utilities library"; + maintainers = with maintainers; [ qyliss ]; + # The BSD license comes from host-common/VpxFrameParser.cpp, which + # incorporates some code from libvpx, which uses the 3-clause BSD license. + license = with licenses; [ asl20 mit bsd3 ]; + # See base/include/aemu/base/synchronization/Lock.h + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/aspell/default.nix b/nixpkgs/pkgs/development/libraries/aspell/default.nix index b839092228b3..8c152d32ef6c 100644 --- a/nixpkgs/pkgs/development/libraries/aspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fetchzip, perl, ncurses +{ lib, stdenv, fetchurl, fetchzip, perl, ncurses # for tests , aspell, glibc, runCommand @@ -20,21 +20,14 @@ in stdenv.mkDerivation rec { pname = "aspell"; - version = "0.60.8"; + version = "0.60.8.1"; src = fetchurl { url = "mirror://gnu/aspell/aspell-${version}.tar.gz"; - sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; + hash = "sha256-1toSs01C1Ff6YE5DWtSEp0su/80SD/QKzWuz+yiH0hs="; }; - patches = [ - (fetchpatch { - # objstack: assert that the alloc size will fit within a chunk - name = "CVE-2019-25051.patch"; - url = "https://github.com/gnuaspell/aspell/commit/0718b375425aad8e54e1150313b862e4c6fd324a.patch"; - sha256 = "03z259xrk41x3j190gaprf3mqysyfgh3a04rjmch3h625vj95x39"; - }) - ] ++ lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index 9827e6f52a77..3c691c245ce5 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { buildInputs = [ libsndfile serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; - mesonFlags = [ "-Ddocs=disabled" ]; + mesonFlags = [ + "-Ddocs=disabled" + # Tests require building a shared library. + (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic)) + ]; passthru = { tests = { diff --git a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix index 8def8041ced9..57070c8f442e 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix @@ -1,13 +1,30 @@ -{ lib, stdenv, fetchurl, cmake, boost, python3 }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, boost +, python3 +}: stdenv.mkDerivation rec { pname = "avro-c++"; - version = "1.11.0"; + version = "1.11.3"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - sha256 = "sha256-73DKihz+7XAX3LLA7VkTdN6rFhuGvmyksxK8JMranFY="; + hash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64="; }; + patches = [ + # This patch fixes boost compatibility and can be removed when + # upgrading beyond 1.11.3 https://github.com/apache/avro/pull/1920 + (fetchpatch { + name = "fix-boost-compatibility.patch"; + url = "https://github.com/apache/avro/commit/016323828f147f185d03f50d2223a2f50bfafce1.patch"; + hash = "sha256-hP/5J2JzSplMvg8EjEk98Vim8DfTyZ4hZ/WGiVwvM1A="; + }) + ]; + patchFlags = [ "-p3" ]; nativeBuildInputs = [ cmake python3 ]; buildInputs = [ boost ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix index 7a57315a5f4d..284671b43f17 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.7.0"; + version = "0.7.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-DzUobQ8qZNb83CwVKK9E1V51uHHo22nlBGKdN55W7UY="; + sha256 = "sha256-GO3Sfbi1dwsqQM6rlnEHyE7wolQjdVwD5BAu5ychEuY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index a76ee7ab003c..6340545e3667 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.6.0"; + version = "0.6.9"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qsYQViMto5j6piCg6gBjzFfPJlLkJt4949o217QsV6Q="; + sha256 = "sha256-m/RwGXeSjYOJQwCxfPyL4TdJ3gV66zHgVkWd3bpSaJE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 1df8bef5be12..5c3abbc58087 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.8.23"; + version = "0.9.10"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HkRaQnlasayg5Nu2KaEA18360rxAH/tdJ1iqzoi6i2E="; + sha256 = "sha256-xqNqyVtibR8oSMvl5RTU166FIxcbvGjZJOjJ9j6fU78="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix index 6b3c8af43f50..7f273ac80fa0 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2MPTr1vSUPuemdlQIalZTp6eGXJl3Xr1eUEnZjikBzg="; + sha256 = "sha256-uKprdBJn9yHDm2HCBOiuanizCtLi/VKrvUUScNv6OPY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix index 045f5f97a806..52d3507b5570 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.7.11"; + version = "0.7.14"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-gKuWhXxWHqTS66yANdKLsCZRk7jeDmyYMlme4WXT5Wc="; + sha256 = "sha256-HrNdePWNw/5tDBeybnUjK3LgftnGQ4CBXPG0URaxIeU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix index e1eb1939c212..abb51d0df417 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.29"; + version = "0.13.36"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZeogbjgpbqdCioLeb34CRol1Fa5BJOloAxxgE50yfQs="; + sha256 = "sha256-TwPcsTMBOE1uIInH6/eQdUMV6uD7d60773THzc1/G9Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix index 082887ee3a3d..eb20be82f353 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.8.14"; + version = "0.9.10"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-LPhd4ygh/3BtqDZwWtigXWUGZ0fzkcWkFl6dpJIspow="; + sha256 = "sha256-hxisqBUARJLtmZniXaZ2th0hqWiKn4XQIy6I0Oz/kUs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix index ca07b930109e..b3051916fbb8 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.3.13"; + version = "0.4.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-SXMDyzQ8hjPx9q9GhE11lYjj3IZY35mvUWELlYQmgGU="; + sha256 = "sha256-tb9h78Gd4N11DPB2ETq241lvDQqHIy2HYBsJrBlLpxA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch index 9b61316ffb91..2b06ce0aec63 100644 --- a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch +++ b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch @@ -1,6 +1,6 @@ -From 2370ee92e78cfb0d55e3958b63ac71b16567b5fd Mon Sep 17 00:00:00 2001 +From fd3f3a28e7fce7fe4e10ed2d7edc4bfda8ab27df Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> -Date: Wed, 9 Nov 2022 17:59:17 +0100 +Date: Sun, 9 Jan 2022 01:57:18 +0100 Subject: [PATCH] build: Make includedir properly overrideable This is required by some package managers like Nix. @@ -9,33 +9,33 @@ This is required by some package managers like Nix. 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f13d21..f6e62c7 100644 +index ec6d172..6514c23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,6 +66,10 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR "lib") +@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64") + set(FIND_LIBRARY_USE_LIB64_PATHS true) endif() - + +if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR) + set(CMAKE_INSTALL_INCLUDEDIR "include") +endif() + - if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64") - set(FIND_LIBRARY_USE_LIB64_PATHS true) + if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) endif() -@@ -322,7 +326,7 @@ endif() - +@@ -307,7 +311,7 @@ endif() target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> + $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}> - $<INSTALL_INTERFACE:include>) + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) - + aws_use_package(aws-c-http) aws_use_package(aws-c-mqtt) -@@ -336,14 +340,14 @@ aws_use_package(aws-c-s3) - - target_link_libraries(${PROJECT_NAME} ${DEP_AWS_LIBS}) - +@@ -324,14 +328,14 @@ aws_add_sanitizers(${PROJECT_NAME}) + + target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS}) + -install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development) -install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development) -install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development) @@ -52,8 +52,8 @@ index 9f13d21..f6e62c7 100644 +install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development) +install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development) +install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development) - + install( TARGETS ${PROJECT_NAME} --- -2.37.3 +-- +2.42.0 diff --git a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix index 0f44dab59db4..0cd6e4940c4d 100644 --- a/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.20.3"; + version = "0.24.7"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-70AchkuhuyumwpBYaj9mOVPJ8+6VSLTLtr3ghwqG3wM="; + sha256 = "sha256-AYO0ckqEx2jG7HduvaxASQMOsxuHGkRkyVsUP5WOs98="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch deleted file mode 100644 index b2f12e77025c..000000000000 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/cmake/AWSSDKConfig.cmake -+++ b/cmake/AWSSDKConfig.cmake -@@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE) - message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first") - endif() - --# based on core header file path, inspects the actual AWSSDK_ROOT_DIR --get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) --get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) --get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) --get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) -- --if (NOT AWSSDK_ROOT_DIR) -- message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") -+if (IS_ABSOLUTE ${AWSSDK_INSTALL_LIBDIR}) -+ set(AWSSDK_ROOT_DIR "") -+else() -+ # based on core header file path, inspects the actual AWSSDK_ROOT_DIR -+ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) -+ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) -+ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) -+ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) -+ -+ if (NOT AWSSDK_ROOT_DIR) -+ message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") -+ endif() - endif() - - -diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake -index 283a14a138..646aea1da3 100644 ---- a/cmake/utilities.cmake -+++ b/cmake/utilities.cmake -@@ -43,7 +43,8 @@ macro(setup_install) - EXPORT "${PROJECT_NAME}-targets" - ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY} - LIBRARY DESTINATION ${LIBRARY_DIRECTORY} -- RUNTIME DESTINATION ${BINARY_DIRECTORY} ) -+ RUNTIME DESTINATION ${BINARY_DIRECTORY} -+ INCLUDES DESTINATION ${INCLUDE_DIRECTORY} ) - - if (BUILD_SHARED_LIBS) - install( -@@ -57,7 +58,8 @@ macro(setup_install) - install (TARGETS ${PROJECT_NAME} - ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} - LIBRARY DESTINATION ${LIBRARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} -- RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) -+ RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} -+ INCLUDES DESTINATION ${INCLUDE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) - endif() - endif() - endmacro() -diff --git a/toolchains/pkg-config.pc.in b/toolchains/pkg-config.pc.in -index 9b519d2772..a61069225c 100644 ---- a/toolchains/pkg-config.pc.in -+++ b/toolchains/pkg-config.pc.in -@@ -1,5 +1,5 @@ --includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_DIRECTORY@ --libdir=@CMAKE_INSTALL_PREFIX@/@LIBRARY_DIRECTORY@ -+includedir=@INCLUDE_DIRECTORY@ -+libdir=@LIBRARY_DIRECTORY@ - - Name: @PROJECT_NAME@ - Description: @PROJECT_DESCRIPTION@ diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 8fdb63f165e8..448139358e65 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -8,6 +8,9 @@ , aws-crt-cpp , CoreAudio , AudioToolbox +, nix +, arrow-cpp +, aws-sdk-cpp , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -24,19 +27,15 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.11.118"; + version = "1.11.207"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-jqGXh8xLD2gIjV9kSvlldrxA5TxTTXQoC/B66FVprvk="; + sha256 = "sha256-IsPDQJo+TZ2noLefroiWl/Jx8fXmrmY73WHNRO41sik="; }; - patches = [ - ./cmake-dirs.patch - ]; - postPatch = '' # Append the dev output to path hints in finding Aws.h to avoid # having to pass `AWS_CORE_HEADER_FILE` explicitly to cmake configure @@ -79,8 +78,6 @@ stdenv.mkDerivation rec { # propagation is needed for Security.framework to be available when linking propagatedBuildInputs = [ aws-crt-cpp ]; - # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails - LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; cmakeFlags = [ "-DBUILD_DEPS=OFF" @@ -109,6 +106,42 @@ stdenv.mkDerivation rec { # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; + passthru = { + tests = { + inherit nix arrow-cpp; + cmake-find-package = stdenv.mkDerivation { + pname = "aws-sdk-cpp-cmake-find-package-test"; + version = "0"; + dontUnpack = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ aws-sdk-cpp ]; + buildCommand = '' + cat > CMakeLists.txt <<'EOF' + find_package(AWSSDK) + EOF + + # Intentionally not using 'cmakeConfigurePhase' to test that find_package works without it. + mkdir build && cd build + if output=$(cmake -Wno-dev .. 2>&1); then + if grep -Fw -- "Found AWS" - <<< "$output"; then + touch "$out" + else + echo "'Found AWS' not found in the cmake output!" >&2 + echo "The output was:" >&2 + echo "$output" >&2 + exit 1 + fi + else + echo -n "'cmake -Wno-dev ..'" >&2 + echo " returned a non-zero exit code." >&2 + echo "$output" >&2 + exit 1 + fi + ''; + }; + }; + }; + meta = with lib; { description = "A C++ interface for Amazon Web Services"; homepage = "https://github.com/aws/aws-sdk-cpp"; diff --git a/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch deleted file mode 100644 index bcdad510e10d..000000000000 --- a/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/./CMake/FindLLVM.cmake b/../Beignet-1.1.2-Source_new/CMake/FindLLVM.cmake -index a148321..96cafb8 100644 ---- a/./CMake/FindLLVM.cmake -+++ b/../Beignet-1.1.2-Source_new/CMake/FindLLVM.cmake -@@ -22,6 +22,7 @@ if (LLVM_CONFIG_EXECUTABLE) - else (LLVM_CONFIG_EXECUTABLE) - message(FATAL_ERROR "Could NOT find LLVM executable, please add -DLLVM_INSTALL_DIR=/path/to/llvm-config/ in cmake command") - endif (LLVM_CONFIG_EXECUTABLE) -+ - execute_process( - COMMAND ${LLVM_CONFIG_EXECUTABLE} --version - OUTPUT_VARIABLE LLVM_VERSION -@@ -44,10 +45,16 @@ if (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR) - endif (LLVM_VERSION_NODOT VERSION_LESS LLVM_FIND_VERSION_NODOT) - endif (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR) - --if (LLVM_INSTALL_DIR) -+if (CLANG_INSTALL_DIR) - find_program(CLANG_EXECUTABLE - NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang -- PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) -+ PATHS ${CLANG_INSTALL_DIR} NO_DEFAULT_PATH) -+else (CLANG_INSTALL_DIR) -+ find_program(CLANG_EXECUTABLE -+ NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang) -+endif (CLANG_INSTALL_DIR) -+ -+if (LLVM_INSTALL_DIR) - find_program(LLVM_AS_EXECUTABLE - NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as - PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) -@@ -55,8 +62,6 @@ if (LLVM_INSTALL_DIR) - NAMES llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link - PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) - else (LLVM_INSTALL_DIR) -- find_program(CLANG_EXECUTABLE -- NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang) - find_program(LLVM_AS_EXECUTABLE - NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as) - find_program(LLVM_LINK_EXECUTABLE -@@ -105,7 +110,7 @@ endif (LLVM_VERSION_NODOT VERSION_GREATER 34) - macro(add_one_lib name) - FIND_LIBRARY(CLANG_LIB - NAMES ${name} -- PATHS ${LLVM_LIBRARY_DIR} NO_DEFAULT_PATH) -+ PATHS ${CLANG_LIBRARY_DIR} NO_DEFAULT_PATH) - set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB}) - unset(CLANG_LIB CACHE) - endmacro() diff --git a/nixpkgs/pkgs/development/libraries/beignet/default.nix b/nixpkgs/pkgs/development/libraries/beignet/default.nix deleted file mode 100644 index 3d88c93784a8..000000000000 --- a/nixpkgs/pkgs/development/libraries/beignet/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, libclang -, libllvm -, libdrm -, libX11 -, libpthreadstubs -, libXdmcp -, libXdamage -, libXext -, python3 -, ocl-icd -, libGL -, makeWrapper -, beignet -}: - -stdenv.mkDerivation rec { - pname = "beignet"; - version = "unstable-2018.08.20"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "beignet"; - rev = "fc5f430cb7b7a8f694d86acbb038bd5b38ec389c"; - sha256 = "1z64v69w7f52jrskh1jfyh1x46mzfhjrqxj9hhgzh3xxv9yla32h"; - }; - - patches = [ ./clang_llvm.patch ]; - - postPatch = '' - substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" - patchShebangs src/git_sha1.sh - ''; - - cmakeFlags = [ "-DCLANG_LIBRARY_DIR=${libclang.lib}/lib" ]; - - buildInputs = [ - libllvm - libclang - libX11 - libXext - libpthreadstubs - libdrm - libXdmcp - libXdamage - ocl-icd - libGL - ]; - - nativeBuildInputs = [ - cmake - pkg-config - python3 - ]; - - passthru.utests = stdenv.mkDerivation { - pname = "beignet-utests"; - inherit version src; - - preConfigure = '' - cd utests - ''; - - nativeBuildInputs = [ - cmake - python3 - pkg-config - makeWrapper - ]; - - buildInputs = [ - ocl-icd - ]; - - installPhase = '' - wrapBin() { - install -Dm755 "$1" "$out/bin/$(basename "$1")" - wrapProgram "$out/bin/$(basename "$1")" \ - --set OCL_BITCODE_LIB_PATH ${beignet}/lib/beignet/beignet.bc \ - --set OCL_HEADER_FILE_DIR "${beignet}/lib/beignet/include" \ - --set OCL_PCH_PATH "${beignet}/lib/beignet/beignet.pch" \ - --set OCL_GBE_PATH "${beignet}/lib/beignet/libgbe.so" \ - --set OCL_INTERP_PATH "${beignet}/lib/beignet/libgbeinterp.so" \ - --set OCL_KERNEL_PATH "$out/lib/beignet/kernels" \ - --set OCL_IGNORE_SELF_TEST 1 - } - - install -Dm755 libutests.so $out/lib/libutests.so - wrapBin utest_run - wrapBin flat_address_space - mkdir $out/lib/beignet - cp -r ../../kernels $out/lib/beignet - ''; - }; - - meta = with lib; { - homepage = "https://cgit.freedesktop.org/beignet/"; - description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; - longDescription = '' - The package provides an open source implementation of the OpenCL specification for Intel GPUs. - It supports the Intel OpenCL runtime library and compiler. - ''; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ artuuge zimbatm ]; - platforms = platforms.linux; - # Requires libdrm_intel - badPlatforms = [ "aarch64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/boost/1.84.nix b/nixpkgs/pkgs/development/libraries/boost/1.84.nix new file mode 100644 index 000000000000..a55f55afaae0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/1.84.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.84.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_84_0.html + sha256 = "cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454"; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/boost/default.nix b/nixpkgs/pkgs/development/libraries/boost/default.nix index 7f6422515ace..6434c6d19699 100644 --- a/nixpkgs/pkgs/development/libraries/boost/default.nix +++ b/nixpkgs/pkgs/development/libraries/boost/default.nix @@ -24,4 +24,5 @@ in { boost181 = makeBoost ./1.81.nix; boost182 = makeBoost ./1.82.nix; boost183 = makeBoost ./1.83.nix; + boost184 = makeBoost ./1.84.nix; } diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index 080c944c90f5..ad67806398f9 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -73,8 +73,7 @@ let else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x" else toString stdenv.hostPlatform.parsed.cpu.family}" # env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o" - "binary-format=${if stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.macho - then "mach-o" + "binary-format=${if stdenv.hostPlatform.isMacho then "mach-o" else toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}" diff --git a/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/nixpkgs/pkgs/development/libraries/capnproto/default.nix index 0312eeaf7eed..669e2c7d1859 100644 --- a/nixpkgs/pkgs/development/libraries/capnproto/default.nix +++ b/nixpkgs/pkgs/development/libraries/capnproto/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "1.0.1.1"; + version = "1.0.2"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "sha256-LFpCQiepPG78iMq/d3NAN6cSZI1X0QgkKRIxeeZhfEQ="; + sha256 = "sha256-LVdkqVBTeh8JZ1McdVNtRcnFVwEJRNjt0JV2l7RkuO8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cpp-jwt/default.nix b/nixpkgs/pkgs/development/libraries/cpp-jwt/default.nix index 7f55913b85bf..a9295629bf20 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-jwt/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-jwt/default.nix @@ -19,12 +19,14 @@ stdenv.mkDerivation rec { "-DCPP_JWT_BUILD_EXAMPLES=OFF" ]; - nativeBuildInputs = [ cmake gtest ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl nlohmann_json ]; + buildInputs = [ gtest openssl nlohmann_json ]; doCheck = true; + strictDeps = true; + meta = { description = "JSON Web Token library for C++"; homepage = "https://github.com/arun11299/cpp-jwt"; diff --git a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index 324a11a6c7a2..e8e67c3ad437 100644 --- a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-jqeLNKOGdGtAVx7ExGGDxxgi5zDmQgmJ6bxIuguaM3k="; + hash = "sha256-RK5GQymtaYOM6HK2eRK5Rbz6NZva3Jt7lTPTUbSQXxI="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index 883b30c6a576..7eb13f7136c7 100644 --- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { ./cyrus-sasl-ac-try-run-fix.patch # make compatible with openssl3. can probably be dropped with any release after 2.1.28 (fetchpatch { - url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...c2bd3afbca57f176d8c650670ce371444bb7fcc0.patch"; - hash = "sha256-bYeIkvle1Ms7Lnoob4eLd4RbPFHtPkKRZvfHNCBJY/s="; + url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...dfaa62392e7caecc6ecf0097b4d73738ec4fc0a8.patch"; + hash = "sha256-pc0cZqj1QoxDqgd/j/5q3vWONEPrTm4Pr6MzHlfjRCc="; }) ]; diff --git a/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix index 97162779a6f9..7f6e747e6c36 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -45,5 +45,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; + # Broken for Musl at 2023-12-28: + # https://github.com/NixOS/nixpkgs/issues/277198 + broken = stdenv.hostPlatform.isMusl; }; } diff --git a/nixpkgs/pkgs/development/libraries/directx-headers/default.nix b/nixpkgs/pkgs/development/libraries/directx-headers/default.nix index 946385ab0917..b15a6baa7cab 100644 --- a/nixpkgs/pkgs/development/libraries/directx-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/directx-headers/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "directx-headers"; - version = "1.610.2"; + version = "1.611.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "DirectX-Headers"; rev = "v${version}"; - hash = "sha256-se+/TgqKdatTnBlHcBC1K4aOGGfPEW+E1efpP34+xc0="; + hash = "sha256-HG2Zj8hvsgv8oeSDp1eK+1A5bvFL6oQIh5mMFWOFsvk="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/draco/default.nix b/nixpkgs/pkgs/development/libraries/draco/default.nix index 1cc8a843dcd5..ee2c5b8e5b72 100644 --- a/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -49,6 +49,11 @@ stdenv.mkDerivation (finalAttrs: { "-DDRACO_TINYGLTF_PATH=${tinygltf}" ]; + CXXFLAGS = [ + # error: expected ')' before 'value' in 'explicit GltfValue(uint8_t value)' + "-include cstdint" + ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index d4ab53f37bcd..43f9093848b8 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , aspell , groff , pkg-config @@ -14,23 +13,15 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.6.2"; + version = "2.6.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-ZoanKOVudg+N7gmiLw+1O0bunb59ZM+eW7NaZYv/fh0="; + hash = "sha256-wcVxnypZfOPgbJOM+5n7aX2gk96nuFfMAE3B3PG7oYI="; }; - patches = [ - # fix build with clang 16 - (fetchpatch { - url = "https://github.com/AbiWord/enchant/commit/f71eb22e4af7f9917011807a41cf295d3ce0ccbc.patch"; - hash = "sha256-9WWvpU3HKzPlxNBYQAKPppW6G3kOIC2A+MqX5eheBDA="; - }) - ]; - nativeBuildInputs = [ groff pkg-config diff --git a/nixpkgs/pkgs/development/libraries/fastcdr/default.nix b/nixpkgs/pkgs/development/libraries/fastcdr/default.nix index e8968043a1d7..64a7eeac1915 100644 --- a/nixpkgs/pkgs/development/libraries/fastcdr/default.nix +++ b/nixpkgs/pkgs/development/libraries/fastcdr/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-rdRn/vRcZuej7buyb1K6f+9A4oLSodNw3pwefjsUXHA="; + hash = "sha256-eSf6LNTVsGEBXjTmTBjjWKBqs68pbnVcw1p2bi1Asgg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/faudio/default.nix b/nixpkgs/pkgs/development/libraries/faudio/default.nix index a393d9577fc1..546824ec8e24 100644 --- a/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.12"; + version = "24.01"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-bftS5gcIzvJlv9K2hKIIXl5lzP4RVwSK5/kxpQrJe/A="; + sha256 = "sha256-9/hgGrMtEz2CXZUPVMT1aSwDMlb+eQ9soTp1X1uME7I="; }; nativeBuildInputs = [cmake]; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 8dc42dea247d..e57c0fcff5bc 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "4.4.4"; - sha256 = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA="; + hash = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA="; extraPatches = [ { name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix index a3ff054f1e60..68edb0fd37e4 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "5.1.3"; - sha256 = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE="; + hash = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE="; extraPatches = [ { name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix index 37bdf5b060f7..62d3919c0646 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "6.0"; - sha256 = "sha256-RVbgsafIbeUUNXmUbDQ03ZN42oaUo0njqROo7KOQgv0="; + version = "6.1"; + hash = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg="; } diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index e713ca1413fb..9d4369003e47 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ version, sha256, extraPatches ? [] }: +{ version, hash, extraPatches ? [] }: { lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm @@ -27,6 +27,7 @@ # Feature flags , withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT , withAom ? withFullDeps # AV1 reference encoder +, withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library @@ -85,7 +86,7 @@ , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps # Vdpau hardware acceleration , withVidStab ? withFullDeps # Video stabilization -, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 # Netflix's VMAF (Video Multi-Method Assessment Fusion) +, withVmaf ? withFullDeps && withGPLv3 && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding @@ -179,8 +180,8 @@ */ , alsa-lib , bzip2 -, clang , celt +, clang , dav1d , fdk_aac , fontconfig @@ -188,27 +189,32 @@ , frei0r , fribidi , game-music-emu +, glslang , gnutls , gsm -, libjack2 +, intel-media-sdk , ladspaH , lame -, libass , libaom +, libaribcaption +, libass , libbluray , libbs2b , libcaca , libdc1394 -, libraw1394 , libdrm +, libGL +, libGLU , libiconv -, intel-media-sdk +, libjack2 , libmodplug , libmysofa , libogg , libopenmpt , libopus , libplacebo +, libpulseaudio +, libraw1394 , librsvg , libssh , libtensorflow @@ -223,41 +229,37 @@ , libwebp , libX11 , libxcb -, libXv , libXext , libxml2 -, xz +, libXv , nv-codec-headers -, nv-codec-headers-11 -, openal +, nv-codec-headers-12 , ocl-icd # OpenCL ICD +, openal , opencl-headers # OpenCL headers , opencore-amr -, libGL -, libGLU , openh264 , openjpeg -, libpulseaudio , rav1e -, svt-av1 , rtmpdump , samba , SDL2 , soxr , speex , srt +, svt-av1 , vid-stab , vo-amrwbenc +, vulkan-headers +, vulkan-loader , x264 , x265 , xavs , xvidcore +, xz , zeromq4 , zimg , zlib -, vulkan-headers -, vulkan-loader -, glslang /* * Darwin frameworks */ @@ -334,7 +336,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchgit { url = "https://git.ffmpeg.org/ffmpeg.git"; rev = "n${finalAttrs.version}"; - inherit sha256; + inherit hash; }; postPatch = '' @@ -344,10 +346,6 @@ stdenv.mkDerivation (finalAttrs: { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi \ --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 - '' + lib.optionalString withVulkan '' - # FIXME: horrible hack, remove for next release - substituteInPlace libavutil/hwcontext_vulkan.c \ - --replace VK_EXT_VIDEO_DECODE VK_KHR_VIDEO_DECODE ''; patches = map (patch: fetchpatch patch) (extraPatches @@ -357,6 +355,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/814178f92647be2411516bbb82f48532373d2554"; hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI="; } + ) + ++ (lib.optional (stdenv.isDarwin && lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") + { # this can be removed post 6.1 + name = "fix_build_failure_due_to_PropertyKey_EncoderID"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; + hash = "sha256-Ittka0mId1N/BwJ0FQ0ygpTSS6Y11u2SjWDpbGN+KXo="; + } )); configurePlatforms = []; @@ -441,6 +446,8 @@ stdenv.mkDerivation (finalAttrs: { * External libraries */ (enableFeature withAlsa "alsa") + # FIXME: see if jellyfin-ffmpeg is already on a version >= 6.1 to use enableFeature + (optionalString (withAribcaption && lib.versionAtLeast finalAttrs.version "6.1") "--enable-libaribcaption") (enableFeature withBzlib "bzlib") (enableFeature withCelt "libcelt") (enableFeature withCuda "cuda") @@ -553,9 +560,10 @@ stdenv.mkDerivation (finalAttrs: { # TODO This was always in buildInputs before, why? buildInputs = optionals withFullDeps [ libdc1394 ] ++ optionals (withFullDeps && !stdenv.isDarwin) [ libraw1394 ] # TODO where does this belong to - ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast version "6") then nv-codec-headers-11 else nv-codec-headers) ] + ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast version "6") then nv-codec-headers-12 else nv-codec-headers) ] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAom [ libaom ] + ++ optionals withAribcaption [ libaribcaption ] ++ optionals withAss [ libass ] ++ optionals withBluray [ libbluray ] ++ optionals withBs2b [ libbs2b ] @@ -698,7 +706,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optional withUnfree unfreeRedistributable; pkgConfigModules = [ "libavutil" ]; platforms = platforms.all; - maintainers = with maintainers; [ atemu ]; + maintainers = with maintainers; [ atemu arthsmn ]; mainProgram = "ffmpeg"; }; }) diff --git a/nixpkgs/pkgs/development/libraries/folks/default.nix b/nixpkgs/pkgs/development/libraries/folks/default.nix index b3c6f0a59156..c100a8862d5c 100644 --- a/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -25,15 +25,15 @@ # TODO: enable more folks backends -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "folks"; - version = "0.15.6"; + version = "0.15.7"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "yGZjDFU/Kc6b4cemAmfLQICmvM9LjVUdxMfmI02EAkg="; + url = "mirror://gnome/sources/folks/${lib.versions.majorMinor finalAttrs.version}/folks-${finalAttrs.version}.tar.xz"; + sha256 = "Eg8hnvYyEsqpWuf2rrZOKZKLCxqLlFIFQwSgDQ80eHE="; }; nativeBuildInputs = [ @@ -78,13 +78,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - # For some reason, the tests are getting stuck on 31/32, - # even though the one missing test finishes just fine on next run, - # when tests are permuted differently. And another test that - # previously passed will be stuck instead. - "-Dtests=false" + "-Dtests=${lib.boolToString (finalAttrs.doCheck && stdenv.isLinux)}" ]; + # backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c:10697:4: + # error: call to undeclared function 'folks_persona_store_set_is_user_set_default'; + # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + + # Checks last re-enabled in https://github.com/NixOS/nixpkgs/pull/279843, but timeouts in tests still + # occur inconsistently doCheck = false; # Prevents e-d-s add-contacts-stress-test from timing out @@ -100,7 +103,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "folks"; versionPolicy = "none"; }; }; @@ -112,4 +115,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/nixpkgs/pkgs/development/libraries/frei0r/default.nix index 0215b82a828c..fcdec34ac425 100644 --- a/nixpkgs/pkgs/development/libraries/frei0r/default.nix +++ b/nixpkgs/pkgs/development/libraries/frei0r/default.nix @@ -1,7 +1,7 @@ { lib , config , stdenv -, fetchurl +, fetchFromGitHub , cairo , cmake , opencv @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { pname = "frei0r-plugins"; - version = "1.8.0"; + version = "2.3.1"; - src = fetchurl { - url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz"; - hash = "sha256-RaKGVcrwVyJ7RCuADKOJnpNJBRXIHiEtIZ/fSnYT9cQ="; + src = fetchFromGitHub { + owner = "dyne"; + repo = "frei0r"; + rev = "v${version}"; + hash = "sha256-5itlZfnloQXV/aCiNgOOZzEeO1d+NLY4qSk8uMVAOmA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/functionalplus/default.nix b/nixpkgs/pkgs/development/libraries/functionalplus/default.nix index b456dd887344..af25030ab560 100644 --- a/nixpkgs/pkgs/development/libraries/functionalplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.20-p0"; + version = "0.2.22"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-PKd3gx63VTxyq1q0v7WaKXVA0oICpZQfVsKsgUml9wk="; + sha256 = "sha256-y0IRmgG9lhWO4IR4G9/VP2a3B+ORTnF7MCf4FU5EuMk="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/futuresql/default.nix b/nixpkgs/pkgs/development/libraries/futuresql/default.nix index fb6e4061e6f6..ed6a7033909a 100644 --- a/nixpkgs/pkgs/development/libraries/futuresql/default.nix +++ b/nixpkgs/pkgs/development/libraries/futuresql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }: +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, qtbase }: stdenv.mkDerivation rec { pname = "futuresql"; version = "0.1.1"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ qtbase ]; + cmakeFlags = ["-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}"]; # a library, nothing to wrap dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index f53868a0926f..7292b3452826 100644 --- a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.8.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0="; + sha256 = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME="; }; nativeBuildInputs = [ cmake ]; @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; - doCheck = true; + # Tests fail on 32-bit due to not enough precision + doCheck = stdenv.is64bit; passthru.tests = { inherit prometheus-cpp; diff --git a/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix index c168113fa3c4..600ca69f46d0 100644 --- a/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcc/libgcc/default.nix @@ -10,6 +10,7 @@ let "--disable-intl" "--enable-threads=posix" "--with-glibc-version=${glibc.version}" + "--disable-plugin" # these are required in order to prevent inhibit_libc=true, # which will cripple libgcc's unwinder; see: diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 9c321bb1231a..6f0e06213626 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.8.2"; + version = "3.8.3"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-R21zRjEvJO+97yXJDvzDJryQ7ps9uEN62DZ0GCxdoFk="; + hash = "sha256-GYBGGZ2bobVYElO0WJrsQzLMdNR5AfQwgdjBtPeGH1g="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gettext/default.nix b/nixpkgs/pkgs/development/libraries/gettext/default.nix index dc4af0813918..4366f9df5aad 100644 --- a/nixpkgs/pkgs/development/libraries/gettext/default.nix +++ b/nixpkgs/pkgs/development/libraries/gettext/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz, bash -, gnulib +{ stdenv, lib, fetchurl, libiconv, xz, bash }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -25,11 +24,7 @@ stdenv.mkDerivation rec { # fix reproducibile output, in particular in the grub2 build # https://savannah.gnu.org/bugs/index.php?59658 ./0001-msginit-Do-not-use-POT-Creation-Date.patch - ] ++ lib.optional stdenv.hostPlatform.isWindows (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/gettext_formatstring-ruby.patch?h=mingw-w64-gettext&id=e8b577ee3d399518d005e33613f23363a7df07ee"; - name = "gettext_formatstring-ruby.patch"; - sha256 = "sha256-6SxZObOMkQDxuKJuJY+mQ/VuJJxSeGbf97J8ZZddCV0="; - }); + ]; outputs = [ "out" "man" "doc" "info" ]; @@ -55,6 +50,8 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.hostPlatform.isCygwin '' sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in + '' + lib.optionalString stdenv.hostPlatform.isMinGW '' + sed -i "s/@GNULIB_CLOSE@/1/" */*/unistd.in.h ''; strictDeps = true; @@ -95,10 +92,10 @@ stdenv.mkDerivation rec { computer screen showing a lot less of English, and far more of their own language. - GNU `gettext' is an important step for the GNU Translation Project, as + GNU `gettext` is an important step for the GNU Translation Project, as it is an asset on which we may build many other steps. This package offers to programmers, translators, and even users, a well integrated - set of tools and documentation. Specifically, the GNU `gettext' + set of tools and documentation. Specifically, the GNU `gettext` utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. ''; diff --git a/nixpkgs/pkgs/development/libraries/gfxstream/default.nix b/nixpkgs/pkgs/development/libraries/gfxstream/default.nix new file mode 100644 index 000000000000..196bca7cdc5f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gfxstream/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitiles, meson, ninja, pkg-config, python3 +, aemu, libdrm, libglvnd, vulkan-headers, vulkan-loader, xorg +}: + +stdenv.mkDerivation { + pname = "gfxstream"; + version = "0.1.2"; + + src = fetchFromGitiles { + url = "https://android.googlesource.com/platform/hardware/google/gfxstream"; + rev = "a29282666c0e2fdbb2c98cfe68a7c0677163ef91"; + hash = "sha256-IYXkaHZPEYIE9KW731GN6x6yRS+FYtP1zyHcaSofhIM="; + }; + + nativeBuildInputs = [ meson ninja pkg-config python3 ]; + buildInputs = [ aemu libglvnd vulkan-headers vulkan-loader xorg.libX11 ] + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform libdrm) libdrm; + + # dlopens libvulkan. + # + # XXX: Unsure if this is required on Darwin. If it is, it probably + # needs to be done using install_name_tool. + preConfigure = lib.optionalString (!stdenv.isDarwin) '' + mesonFlagsArray=(-Dcpp_link_args="-Wl,--push-state -Wl,--no-as-needed -lvulkan -Wl,--pop-state") + ''; + + meta = with lib; { + homepage = "https://android.googlesource.com/platform/hardware/google/gfxstream"; + description = "Graphics Streaming Kit"; + license = licenses.free; # https://android.googlesource.com/platform/hardware/google/gfxstream/+/refs/heads/main/LICENSE + maintainers = with maintainers; [ qyliss ]; + platforms = aemu.meta.platforms; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix index edcb29f3ccb7..b7f91afa3710 100644 --- a/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -23,21 +23,22 @@ , which , xvfb-run , nixosTests +, installTests ? true }: let testDeps = [ gtk3 atk pango.out gdk-pixbuf harfbuzz ]; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.78.0"; + version = "1.78.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-+6og4JF2aIMIAPkpUWiPn8CPASlq/9XNtLNfdQvifck="; + url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; + hash = "sha256-fpBRHEKRJ8OerABoxKyaNT335vu8ZG9fGOiWKILBhkE="; }; patches = [ @@ -107,12 +108,12 @@ in stdenv.mkDerivation rec { postInstall = '' # TODO: make the glib setup hook handle moving the schemas in other outputs. - installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}" + installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/gjs-${finalAttrs.version}" mkdir -p "$installedTestsSchemaDatadir" mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir" ''; - postFixup = '' + postFixup = lib.optionalString installTests '' wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}" @@ -145,4 +146,4 @@ in stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index a2e4ad8f47cf..f92db5b0e5d6 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.78.1"; + version = "2.78.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "kVvD0PhQfWUOrTgy4vj7Zw/OWarE13VKfatvHm/teLI="; + sha256 = "YJgB3Tc3luUVlyv5X8Cy2qRFRUge4vRlxPIE0iSyvCE="; }; patches = lib.optionals stdenv.isDarwin [ @@ -280,7 +280,7 @@ stdenv.mkDerivation (finalAttrs: { "gobject-2.0" "gthread-2.0" ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; longDescription = '' GLib provides the core application building blocks for libraries diff --git a/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch b/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch index f3497e6a7811..0333c5c9ca29 100644 --- a/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/nixpkgs/pkgs/development/libraries/glib/split-dev-programs.patch @@ -1,5 +1,5 @@ diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build -index 65faae9..4297513 100644 +index 65faae9b2..4297513d4 100644 --- a/gio/gdbus-2.0/codegen/meson.build +++ b/gio/gdbus-2.0/codegen/meson.build @@ -20,7 +20,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) @@ -12,12 +12,12 @@ index 65faae9..4297513 100644 configuration : gdbus_codegen_conf ) diff --git a/gio/meson.build b/gio/meson.build -index b19c59f..3b20e84 100644 +index 75686bb3e..2f1a73482 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -879,14 +879,15 @@ pkg.generate(libgio, - 'datadir=' + '${prefix}' / get_option('datadir'), +@@ -882,14 +882,15 @@ pkg.generate(libgio, 'schemasdir=' + '${datadir}' / schemas_subdir, + 'dtdsdir=' + '${datadir}' / dtds_subdir, 'bindir=' + '${prefix}' / get_option('bindir'), + 'devbindir=' + get_option('devbindir'), 'giomoduledir=' + pkgconfig_giomodulesdir, @@ -36,7 +36,7 @@ index b19c59f..3b20e84 100644 'gsettings=' + '${bindir}' / 'gsettings', ], version : glib_version, -@@ -989,6 +990,7 @@ executable('gio', gio_tool_sources, +@@ -992,6 +993,7 @@ executable('gio', gio_tool_sources, executable('gresource', 'gresource-tool.c', install : true, @@ -44,7 +44,7 @@ index b19c59f..3b20e84 100644 install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, -@@ -996,7 +998,7 @@ executable('gresource', 'gresource-tool.c', +@@ -999,7 +1001,7 @@ executable('gresource', 'gresource-tool.c', gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', install : true, @@ -53,7 +53,7 @@ index b19c59f..3b20e84 100644 install_tag : 'bin', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH -@@ -1006,7 +1008,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -1009,7 +1011,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu glib_compile_schemas = executable('glib-compile-schemas', ['glib-compile-schemas.c'], install : true, @@ -62,7 +62,7 @@ index b19c59f..3b20e84 100644 install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, -@@ -1015,6 +1017,7 @@ glib_compile_schemas = executable('glib-compile-schemas', +@@ -1018,6 +1020,7 @@ glib_compile_schemas = executable('glib-compile-schemas', glib_compile_resources = executable('glib-compile-resources', [gconstructor_as_data_h, 'glib-compile-resources.c'], install : true, @@ -70,8 +70,49 @@ index b19c59f..3b20e84 100644 install_tag : 'bin-devel', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index 4ef3343ab..2a0a6b56b 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -1131,16 +1131,18 @@ if have_bash and have_pkg_config + + gio_binaries = [ + 'gio', +- 'glib-compile-resources', + 'gdbus', +- 'gdbus-codegen', +- 'gresource', + 'gsettings', + ] +- gio_multiarch_binaries = [ ++ gio_dev_binaries = [ ++ 'glib-compile-resources', ++ 'gdbus-codegen', ++ 'gresource', + 'gio-querymodules', + 'glib-compile-schemas', + ] ++ gio_multiarch_binaries = [ ++ ] + + foreach binary: gio_binaries + pkg_config_tests += [ +@@ -1149,6 +1151,13 @@ if have_bash and have_pkg_config + prefix / get_option('bindir') / binary) + ] + endforeach ++ foreach binary: gio_dev_binaries ++ pkg_config_tests += [ ++ 'test "$(pkg-config --variable=@0@ gio-2.0)" = "@1@"'.format( ++ binary.underscorify(), ++ prefix / get_option('devbindir') / binary) ++ ] ++ endforeach + + foreach binary: gio_multiarch_binaries + pkg_config_tests += [ diff --git a/glib/meson.build b/glib/meson.build -index c26a35e..38effe1 100644 +index c26a35e42..38effe12a 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -447,9 +447,10 @@ pkg.generate(libglib, @@ -105,8 +146,24 @@ index c26a35e..38effe1 100644 install_tag : 'bin-devel', configuration: report_conf, install_mode: 'rwxr-xr-x' +diff --git a/glib/tests/meson.build b/glib/tests/meson.build +index 09ecd5ab3..9748d4122 100644 +--- a/glib/tests/meson.build ++++ b/glib/tests/meson.build +@@ -508,9 +508,9 @@ if have_bash and have_pkg_config + 'test "$(pkg-config --variable=datadir glib-2.0)" = "@0@"'.format( + prefix / get_option('datadir')), + 'test "$(pkg-config --variable=gobject_query glib-2.0)" = "@0@"'.format( +- prefix / get_option('bindir') / 'gobject-query'), ++ prefix / get_option('devbindir') / 'gobject-query'), + 'test "$(pkg-config --variable=glib_mkenums glib-2.0)" = "@0@"'.format( +- prefix / get_option('bindir') / 'glib-mkenums'), ++ prefix / get_option('devbindir') / 'glib-mkenums'), + 'test "$(pkg-config --variable=glib_valgrind_suppressions glib-2.0)" = "@0@"'.format( + prefix / get_option('datadir') / + valgrind_suppression_file_install_subdir / fs.name(valgrind_suppression_file)), diff --git a/gobject/meson.build b/gobject/meson.build -index 2129aaf..da84624 100644 +index 2129aaf8a..da8462428 100644 --- a/gobject/meson.build +++ b/gobject/meson.build @@ -94,7 +94,7 @@ foreach tool: python_tools @@ -127,7 +184,7 @@ index 2129aaf..da84624 100644 dependencies : [libglib_dep, libgobject_dep]) diff --git a/meson_options.txt b/meson_options.txt -index 517d575..198cc1b 100644 +index 517d5757c..198cc1b3c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,6 +4,11 @@ option('runtime_libdir', @@ -143,7 +200,7 @@ index 517d575..198cc1b 100644 type : 'string', value : '', diff --git a/tools/meson.build b/tools/meson.build -index 257312e..f831539 100644 +index 257312ebf..f8315392b 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -8,7 +8,7 @@ if have_sh diff --git a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index 9aa1284bbee9..0a6be882120b 100644 --- a/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , c-ares , cmake , crc32c @@ -18,6 +19,7 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let + # defined in cmake/GoogleapisConfig.cmake googleapisRev = "85f8c758016c279fb7fa8f0d51ddc7ccc0dd5e05"; googleapis = fetchFromGitHub { name = "googleapis-src"; @@ -39,6 +41,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-0SoOaAqvk8cVC5W3ejTfe4O/guhrro3uAzkeIpAkCpg="; }; + patches = [ + # https://github.com/googleapis/google-cloud-cpp/pull/12554, tagged in 2.16.0 + (fetchpatch { + name = "prepare-for-GCC-13.patch"; + url = "https://github.com/googleapis/google-cloud-cpp/commit/ae30135c86982c36e82bb0f45f99baa48c6a780b.patch"; + hash = "sha256-L0qZfdhP8Zt/gYBWvJafteVgBHR8Kup49RoOrLDtj3k="; + }) + ]; + postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ --replace "https://github.com/googleapis/googleapis/archive/\''${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" @@ -69,7 +80,7 @@ stdenv.mkDerivation rec { ]; # https://hydra.nixos.org/build/222679737/nixlog/3/tail - NIX_CFLAGS_COMPILE = if stdenv.isAarch64 then "-Wno-error=maybe-uninitialized" else null; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=maybe-uninitialized"; doInstallCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index 4dec79e0e2da..ca359fcc912b 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -19,6 +19,7 @@ , swig2 ? null # only for passthru.tests , libsForQt5 +, qt6Packages , python3 }: let @@ -26,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.23.0"; + version = "1.23.2"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - hash = "sha256-BD4u/hi0rSK5bUNN3nY/vtMs+NbCINxp3w0P+53Gb8Y="; + hash = "sha256-lJnosfM8zLaBVSehvBYEnTWmGYpsX64BhfK9VhvOUiQ="; }; patches = [ @@ -109,7 +110,8 @@ stdenv.mkDerivation rec { passthru.tests = { python = python3.pkgs.gpgme; - qt = libsForQt5.qgpgme; + qt5 = libsForQt5.qgpgme; + qt6 = qt6Packages.qgpgme; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 2874f0d2fa04..7706975ca056 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -109,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.7"; + version = "1.22.8"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-xxb43/qPrD+2RpQa8cbscv/wWgRRMTEb8tBJ/ch7zi4="; + hash = "sha256-RYeD+CNgaJkePilu3Wccjt24vm+skzwcLhUDRihk6g8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index e87555fef57b..c68693681ee1 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.7"; + version = "1.22.8"; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-YlGeDY+Wnr9iqaeZby0j792jMCF6Y19KMsC/HHFXdGg="; + hash = "sha256-62eS5cc8be+5FZw26m5LeKL4r2USZ4tL07AsjS1JKs8="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index 6a44f3e01a27..9979184b089a 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.7"; + version = "1.22.8"; outputs = [ "bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-AeQsY1Kga9+kRW5ksGq32YxcSHolVXx2FVRjHL2mQhc="; + hash = "sha256-rU49sXcRObHbF7Gvp8BdsIOuAQC9TaJEtx8WLczkG/w="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix index 662009005e36..1bfdf5b24de3 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/default.nix @@ -14,6 +14,7 @@ , Security , VideoToolbox , ipu6ep-camera-hal +, ipu6epmtl-camera-hal }: { @@ -47,6 +48,9 @@ icamerasrc-ipu6ep = callPackage ./icamerasrc { ipu6-camera-hal = ipu6ep-camera-hal; }; + icamerasrc-ipu6epmtl = callPackage ./icamerasrc { + ipu6-camera-hal = ipu6epmtl-camera-hal; + }; # note: gst-python is in ../../python-modules/gst-python - called under python3Packages } diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index 87097dddd8d3..6ce4723b5a32 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.7"; + version = "1.22.8"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FXz5P7J0HPDD3qcxvjry/65wPJ8s08DJGzgPvGheufk="; + hash = "sha256-zWNAVvyxbQNbPfWVPsha6L1Wxo8pkgtyDvkgynHqdqc="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index 764bd78c083a..317fc4e53728 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.7"; + version = "1.22.8"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-/sVqLDeiU80EjSiNTH7abv8ZECKwnbl14HosEF0bUh4="; + hash = "sha256-0dXnXhkOsL4/1JQJ5Bo6qOaM+03qpzU0iFVGdJVs0d8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 7e4c7d77363d..6bea24314695 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -54,13 +54,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.7"; + version = "1.22.8"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-ttsOGOOYtSZlt83OMBw0qHUEg9X0+6we3p+AsDdDzRU="; + hash = "sha256-4wW58H9SdDykgdoKTgx2w179YK2vGwaU6zuwIeITfjk="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index b03dd953e140..4d6c5671f0e2 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -8,15 +8,15 @@ , libdrm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "icamerasrc-${ipu6-camera-hal.ipuVersion}"; - version = "unstable-2023-03-09"; + version = "unstable-2023-10-23"; src = fetchFromGitHub { owner = "intel"; repo = "icamerasrc"; - rev = "17841ab6249aaa69bd9b3959262bf182dee74111"; - hash = "sha256-j8ZYe4nyy5yfo10CGeXDwbAaAPvdr0ptMWB8hQDyESQ="; + rev = "528a6f177732def4d5ebc17927220d8823bc8fdc"; + hash = "sha256-Ezcm5OpF/NKvJf5sFeJyvNc2Uq0166GukC9MuNUV2Fs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix index c183f8ee48a2..f3dfac82c799 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.7"; + version = "1.22.8"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FSW5FxQbiV/lz2GP6IZ2IrJSgnigKG6fcntfNzF9rKE="; + hash = "sha256-vjk0m8B6tM29ml/W6phIxgHHVguloFd61SALg71CSYE="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index ee467f965c81..708a735939af 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = (lib.elem "webp" selectedPlugins) && !stdenv.hostPlatform.isStatic && - stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf; + stdenv.hostPlatform.isElf; installCheckPhase = '' runHook preInstallCheck readelf -a $out/lib/gstreamer-1.0/libgstrswebp.so | grep -F 'Shared library: [libwebpdemux.so' diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 1420a438b6f6..6b0dfcc8598f 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.7"; + version = "1.22.8"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-9/rAAeIK0h420YOXdBxGV8XUNXHrHMO0n5qTrhJ9yI8="; + hash = "sha256-cFF3BRwimXbxca3Nerl2Kua8xLt33DCKC9gKY9psM38="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix index b92bb9dc0d4c..cc78a6ec0f80 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.7"; + version = "1.22.8"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-UgtGvKY3GJrYaimP8kWy2JN128rIsF102uqRD4Gp6do="; + hash = "sha256-B2HZa6UI4BwCcYgbJoKMK//X2K/VCHIhnwiPdVslLKc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix index b779d132210d..b3a7142edae9 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.7"; + version = "1.22.8"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-Dp//douJ3m0xizQUbk54HYK5oPQCXcVBssg0nHvLf2c="; + hash = "sha256-Epi6NHpwxCuIzev5G2Wf6gKxu3Jp6r+OKePAvVgniSg="; }; outputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index 4fbf6f3a6e39..5ecfc299edd4 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM="; + hash = "sha256-8wpfoZcgusJdEbKGZ02UtOOcSogMTNP9Lm+ujo/eKdA="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 27afba7833e8..c244414c5508 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.38"; + version = "3.24.39"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version; in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-zhHezwGLJb3YUFVEpPhyQoVOyIvgVNmt5fOiBETdjuc="; + sha256 = "sha256-HKw+VmubLzZTpFjAjC3N/cqfkIA3rAPJ2FZLQpV3jXk="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 218efb6559fb..2d14823accf4 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -3,7 +3,6 @@ , buildPackages , substituteAll , fetchurl -, fetchpatch , pkg-config , gettext , graphene @@ -69,7 +68,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.12.3"; + version = "4.12.4"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -81,19 +80,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "FIziYvbIZIdFX7HZeTw/WLw+HaR3opYX+tsEIPWHCok="; + sha256 = "umfGSY5Vmfko7a+54IoyCt+qUKsvDab8arIlL8LVdSA="; }; patches = [ # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 ./patches/4.0-fix-darwin-build.patch - - # gdk: Fix compilation on macos - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/aa888c0b3f775776fe3b71028396b7a8c6adb1d6.patch"; - sha256 = "sha256-Jw6BvWDX0wIs4blUiX3qdQCR574yhcaO06Vy/IqfbJo="; - }) ]; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/gumbo/default.nix b/nixpkgs/pkgs/development/libraries/gumbo/default.nix index b8cfef1f3247..68416ef2edc0 100644 --- a/nixpkgs/pkgs/development/libraries/gumbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/gumbo/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool }: +{ lib +, stdenv +, fetchFromGitea +, autoreconfHook }: stdenv.mkDerivation rec { pname = "gumbo"; - version = "0.10.1"; + version = "0.12.1"; - src = fetchFromGitHub { - owner = "google"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "grisha"; repo = "gumbo-parser"; - rev = "v${version}"; - sha256 = "0xslckwdh2i0g2qjsb6rnm8mjmbagvziz0hjlf7d1lbljfms1iw1"; + rev = version; + hash = "sha256-d4V4bI08Prmg3U0KGu4yIwpHcvTJT3NAd4lbzdBU/AE="; }; - strictDeps = true; - nativeBuildInputs = [ autoconf automake libtool ]; - - preConfigure = "./autogen.sh"; + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { description = "C99 HTML parsing algorithm"; diff --git a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix index 96a6f99925de..651dc26ca1ae 100644 --- a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.7.3"; + version = "22.8.0"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Vo+lFUGLeGPKq3aUCiiBcBYu6BZ4KQI5vCtnQyRUUiU="; + hash = "sha256-nFqYpt9OWEPgSbaNsHLhs9mg7ChQcmfcgHh7nFfQh18="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 88f373dd4afa..993fca591e84 100644 --- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/harfbuzz/harfbuzz/raw/${version}/NEWS"; maintainers = [ maintainers.eelco ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "harfbuzz" "harfbuzz-gobject" diff --git a/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix b/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix index ad07025cc35d..f0a0bc6bef48 100644 --- a/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix +++ b/nixpkgs/pkgs/development/libraries/hfst-ospell/default.nix @@ -2,6 +2,7 @@ , stdenv , autoreconfHook , fetchFromGitHub +, fetchpatch , icu , libarchive , pkg-config @@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k="; }; + patches = [ + # Pull upstream fix for gcc-13 + (fetchpatch { + name = "cstdint.patch"; + url = "https://github.com/hfst/hfst-ospell/commit/7481bffbf622bc9aee3547183fbe8db9cf8b22ce.patch"; + hash = "sha256-q/B5mLx8Oc0nIRe3n3gl0OTyjIaEMCBsPc1GvpE226c="; + }) + ]; + buildInputs = [ icu libarchive diff --git a/nixpkgs/pkgs/development/libraries/hpx/default.nix b/nixpkgs/pkgs/development/libraries/hpx/default.nix index 2464e95c6b6d..bcaf1233d300 100644 --- a/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, asio, boost, cmake, hwloc, gperftools, ninja -, pkg-config, python3 }: +{ lib +, stdenv +, fetchFromGitHub +, asio +, boost +, cmake +, hwloc +, gperftools +, ninja +, pkg-config +, python3 +}: stdenv.mkDerivation rec { pname = "hpx"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; - rev = version; - sha256 = "sha256-YJ4wHaPE5E6ngUAYrQB1SkW4IoHW71tUDKKNANVA9Xw="; + rev = "v${version}"; + hash = "sha256-1gLDwgCqv+3+rOSG7a3fFsnjqfKpnPpWnBmrW+z+jWw="; }; - buildInputs = [ asio boost hwloc gperftools ]; + propagatedBuildInputs = [ hwloc ]; + buildInputs = [ asio boost gperftools ]; nativeBuildInputs = [ cmake pkg-config python3 ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/iir1/default.nix b/nixpkgs/pkgs/development/libraries/iir1/default.nix deleted file mode 100644 index d277e14f567a..000000000000 --- a/nixpkgs/pkgs/development/libraries/iir1/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "iir1"; - version = "1.9.4"; - - src = fetchFromGitHub { - owner = "berndporr"; - repo = "iir1"; - rev = version; - hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "A DSP IIR realtime filter library written in C++"; - downloadPage = "https://github.com/berndporr/iir1"; - homepage = "http://berndporr.github.io/iir1/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.AndersonTorres ]; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index da8568bc8dc5..b20b6782d9b0 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11 -, libXau, libXdmcp, libpthreadstubs }: +, libXau, libXdmcp, libpthreadstubs, fetchpatch }: stdenv.mkDerivation rec { pname = "intel-media-sdk"; @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { hash = "sha256-wno3a/ZSKvgHvZiiJ0Gq9GlrEbfHCizkrSiHD6k/Loo="; }; + patches = [ + # https://github.com/Intel-Media-SDK/MediaSDK/pull/3005 + (fetchpatch { + name = "include-cstdint-explicitly.patch"; + url = "https://github.com/Intel-Media-SDK/MediaSDK/commit/a4f37707c1bfdd5612d3de4623ffb2d21e8c1356.patch"; + hash = "sha256-OPwGzcMTctJvHcKn5bHqV8Ivj4P7+E4K9WOKgECqf04="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs diff --git a/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix b/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix index 7fce11d21a43..3ec63fd0807d 100644 --- a/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -8,20 +8,32 @@ # runtime , expat -, ipu6-camera-bin +, ipu6-camera-bins , libtool , gst_all_1 -}: +# Pick one of +# - ipu6 (Tiger Lake) +# - ipu6ep (Alder Lake) +# - ipu6epmtl (Meteor Lake) +, ipuVersion ? "ipu6" +}: +let + ipuTarget = { + "ipu6" = "ipu_tgl"; + "ipu6ep" = "ipu_adl"; + "ipu6epmtl" = "ipu_mtl"; + }.${ipuVersion}; +in stdenv.mkDerivation { - pname = "${ipu6-camera-bin.ipuVersion}-camera-hal"; - version = "unstable-2023-02-08"; + pname = "${ipuVersion}-camera-hal"; + version = "unstable-2023-09-25"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-camera-hal"; - rev = "884b81aae0ea19a974eb8ccdaeef93038136bdd4"; - hash = "sha256-AePL7IqoOhlxhfPRLpCman5DNh3wYS4MUcLgmgBUcCM="; + rev = "9fa05a90886d399ad3dda4c2ddc990642b3d20c9"; + hash = "sha256-yS1D7o6dsQ4FQkjfwcisOxcP7Majb+4uQ/iW5anMb5c="; }; nativeBuildInputs = [ @@ -29,25 +41,23 @@ stdenv.mkDerivation { pkg-config ]; + PKG_CONFIG_PATH = "${lib.makeLibraryPath [ ipu6-camera-bins ]}/${ipuTarget}/pkgconfig"; + cmakeFlags = [ - "-DIPU_VER=${ipu6-camera-bin.ipuVersion}" + "-DIPU_VER=${ipuVersion}" # missing libiacss "-DUSE_PG_LITE_PIPE=ON" - # missing libipu4 - "-DENABLE_VIRTUAL_IPU_PIPE=OFF" ]; NIX_CFLAGS_COMPILE = [ "-Wno-error" - "-I${lib.getDev ipu6-camera-bin}/include/ia_imaging" - "-I${lib.getDev ipu6-camera-bin}/include/ia_camera" ]; enableParallelBuilding = true; buildInputs = [ expat - ipu6-camera-bin + ipu6-camera-bins libtool gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -59,12 +69,13 @@ stdenv.mkDerivation { ''; postFixup = '' - substituteInPlace $out/lib/pkgconfig/libcamhal.pc \ - --replace 'prefix=/usr' "prefix=$out" + for lib in $out/lib/*.so; do + patchelf --add-rpath "${lib.makeLibraryPath [ ipu6-camera-bins ]}/${ipuTarget}" $lib + done ''; passthru = { - inherit (ipu6-camera-bin) ipuVersion; + inherit ipuVersion; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/itk/generic.nix b/nixpkgs/pkgs/development/libraries/itk/generic.nix index e2db993707e2..652fce4a6797 100644 --- a/nixpkgs/pkgs/development/libraries/itk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/itk/generic.nix @@ -1,6 +1,6 @@ { version, rev, sourceSha256 }: -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake , expat, fftw, gdcm, hdf5-cpp, libjpeg, libminc, libtiff, libpng , libX11, libuuid, xz, vtk, zlib, Cocoa }: @@ -38,6 +38,14 @@ stdenv.mkDerivation { sha256 = sourceSha256; }; + patches = [ + (fetchpatch { + name = "fix-gcc13-build"; + url = "https://github.com/InsightSoftwareConsortium/ITK/commit/9a719a0d2f5f489eeb9351b0ef913c3693147a4f.patch"; + hash = "sha256-dDyqYOzo91afR8W7k2N64X6l7t6Ws1C9iuRkWHUe0fg="; + }) + ]; + postPatch = '' substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \ --replace "-march=corei7" "" \ diff --git a/nixpkgs/pkgs/development/libraries/java/cup/default.nix b/nixpkgs/pkgs/development/libraries/java/cup/default.nix index f7732ff637af..2f673a8e5a67 100644 --- a/nixpkgs/pkgs/development/libraries/java/cup/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/cup/default.nix @@ -1,38 +1,56 @@ -{ lib, stdenv, fetchurl, jdk, ant } : - -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, ant +, jdk +, makeWrapper +, canonicalize-jars-hook +}: + +stdenv.mkDerivation (finalAttrs: { pname = "java-cup"; version = "11b-20160615"; src = fetchurl { - url = "http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${version}.tar.gz"; - sha256 = "1ymz3plngxclh7x3xr31537rvvak7lwyd0qkmnl1mkj5drh77rz0"; + url = "http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${finalAttrs.version}.tar.gz"; + hash = "sha256-4OdzYG5FzhqorROD5jk9U+2dzyhh5D76gZT1Z+kdv/o="; }; sourceRoot = "."; - nativeBuildInputs = [ jdk ant ]; - patches = [ ./javacup-0.11b_beta20160615-build-xml-git.patch ]; - buildPhase = "ant"; + nativeBuildInputs = [ + ant + jdk + makeWrapper + canonicalize-jars-hook + ]; + + buildPhase = '' + runHook preBuild + ant + runHook postBuild + ''; installPhase = '' - mkdir -p $out/{bin,share/{java,java-cup}} - cp dist/java-cup-11b.jar $out/share/java-cup/ - cp dist/java-cup-11b-runtime.jar $out/share/java/ - cat > $out/bin/javacup <<EOF - #! $shell - exec ${jdk.jre}/bin/java -jar $out/share/java-cup/java-cup-11b.jar "\$@" - EOF - chmod a+x $out/bin/javacup + runHook preInstall + + install -Dm644 dist/java-cup-11b.jar -t $out/share/java-cup + install -Dm644 dist/java-cup-11b-runtime.jar -t $out/share/java + + makeWrapper ${jdk.jre}/bin/java $out/bin/javacup \ + --add-flags "-jar $out/share/java-cup/java-cup-11b.jar" + + runHook postInstall ''; meta = { - homepage = "http://www2.cs.tum.edu/projects/cup/"; description = "LALR parser generator for Java"; + homepage = "http://www2.cs.tum.edu/projects/cup/"; license = lib.licenses.mit; - platforms = lib.platforms.all; + mainProgram = "javacup"; maintainers = [ lib.maintainers.romildo ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 4b18cd7cfadc..96b6cd05ed1a 100644 --- a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,4 +1,10 @@ -{ fetchFromGitHub, lib, stdenv, ant, jdk }: +{ lib +, stdenv +, fetchFromGitHub +, ant +, jdk +, canonicalize-jars-hook +}: stdenv.mkDerivation { pname = "hydra-ant-logger"; @@ -8,19 +14,30 @@ stdenv.mkDerivation { owner = "NixOS"; repo = "hydra-ant-logger"; rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; - sha256 = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; + hash = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; }; - buildInputs = [ ant jdk ]; + nativeBuildInputs = [ + ant + jdk + canonicalize-jars-hook + ]; - buildPhase = "mkdir lib; ant"; + buildPhase = '' + runHook preBuild + mkdir lib + ant + runHook postBuild + ''; installPhase = '' - mkdir -p $out/share/java - cp -v *.jar $out/share/java + runHook preBuild + install -Dm644 *.jar -t $out/share/java + runHook postBuild ''; meta = { + homepage = "https://github.com/NixOS/hydra-ant-logger"; platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix index f89152820698..af99944dae72 100644 --- a/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix +++ b/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { patchShebangs test_jbig2dec.py ''; - preConfigure = '' - ./autogen.sh - ''; - nativeBuildInputs = [ autoconf automake libtool ]; + # `autogen.sh` runs `configure`, and expects that any flags needed + # by `configure` (like `--host`) are passed to `autogen.sh`. + configureScript = "./autogen.sh"; + nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index a33a55d63e7d..7109a5d6dfd1 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -1,21 +1,18 @@ { ffmpeg_6-full -, nv-codec-headers-12 , chromaprint , fetchFromGitHub , lib }: -(ffmpeg_6-full.override { - nv-codec-headers-11 = nv-codec-headers-12; -}).overrideAttrs (old: rec { +ffmpeg_6-full.overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-7"; + version = "6.0.1-1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-Z4getn/mVYIRANkIOyt7jMpcqHBvq5GXLK/ST5zV1r4="; + hash = "sha256-LMwGxx++z6TpZLnpeRGraid4653Mp8T4pY5EP4Z7GXY="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/nixpkgs/pkgs/development/libraries/json-c/default.nix b/nixpkgs/pkgs/development/libraries/json-c/default.nix index 785548c211a9..ab3d2be6f010 100644 --- a/nixpkgs/pkgs/development/libraries/json-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/json-c/default.nix @@ -1,24 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "json-c"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "json-c"; repo = "json-c"; - rev = "json-c-0.16-20220414"; - sha256 = "sha256-KbnUWLgpg6/1wvXhUoYswyqDcgiwEcvgaWCPjNcX20o="; + rev = "json-c-0.17-20230812"; + hash = "sha256-R5KIJ0xVgGqffjzJaZvvvhAneJ+ZBuanyF6KYTTxb58="; }; - patches = [ - # needed for emscripten, which uses LLVM 15+ - (fetchpatch { - url = "https://github.com/json-c/json-c/commit/6eca65617aacd19f4928acd5766b8dd20eda0b34.patch"; - sha256 = "sha256-fyugX+HgYlt/4AVtfNDaKS+blyUt8JYTNqkmhURb9dk="; - }) - ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; @@ -31,9 +27,10 @@ stdenv.mkDerivation rec { and parse JSON formatted strings back into the C representation of JSON objects. ''; - homepage = "https://github.com/json-c/json-c/wiki"; + homepage = "https://github.com/json-c/json-c/wiki"; + changelog = "https://github.com/json-c/json-c/blob/${finalAttrs.src.rev}/ChangeLog"; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.unix; license = licenses.mit; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix index 4245aa0ed20e..cc87ec2afa57 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix @@ -120,7 +120,8 @@ let kwindowsystem = callPackage ./kwindowsystem {}; modemmanager-qt = callPackage ./modemmanager-qt.nix {}; networkmanager-qt = callPackage ./networkmanager-qt.nix {}; - oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; + oxygen-icons = callPackage ./oxygen-icons.nix {}; + oxygen-icons5 = oxygen-icons; prison = callPackage ./prison.nix {}; qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix {}; solid = callPackage ./solid {}; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index f53e0d6c16bf..590818546a4b 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.112/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.113/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons.nix index 7121944d5d39..4760c51abe54 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/oxygen-icons.nix @@ -5,7 +5,7 @@ }: mkDerivation { - pname = "oxygen-icons5"; + pname = "oxygen-icons"; meta.license = lib.licenses.lgpl3Plus; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index f6909957ba44..06b5e6b04cfa 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/attica-5.112.0.tar.xz"; - sha256 = "0syg508bjfq5ycr246p3f4q37ihvqk5j7n66vkn7h7dvgwspjff5"; - name = "attica-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/attica-5.113.0.tar.xz"; + sha256 = "0p6n2jvky5x9gpwmp31mdxf0bzywaljgnkszgbklyc35xk9i6j14"; + name = "attica-5.113.0.tar.xz"; }; }; baloo = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/baloo-5.112.0.tar.xz"; - sha256 = "17h83s5r70hg8qjv9vli43zv854jll40cmmh2pjcg7nlfi1ypcbz"; - name = "baloo-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/baloo-5.113.0.tar.xz"; + sha256 = "1jv7202dj2w0vcv49bgp0iv1sfy3kdqr974rcr77pcfzhhda9bix"; + name = "baloo-5.113.0.tar.xz"; }; }; bluez-qt = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/bluez-qt-5.112.0.tar.xz"; - sha256 = "03kzvklzj9h4sl1850c1lh4b3z9lis7d6l9fb9cfnffh3wjpjagb"; - name = "bluez-qt-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/bluez-qt-5.113.0.tar.xz"; + sha256 = "1y6nkl9zc5298jc6klxz88h6srmma085w1q5l4jmjihgys2zkcx7"; + name = "bluez-qt-5.113.0.tar.xz"; }; }; breeze-icons = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/breeze-icons-5.112.0.tar.xz"; - sha256 = "0n3xdja42hzn3hssj0a8d97kkb790kinp2xmslfl7w8izsz53p39"; - name = "breeze-icons-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/breeze-icons-5.113.0.tar.xz"; + sha256 = "0kb3wchx84dpi77zsi1b9pzlkhg3sjagxcsf1pdappagq3xn1p48"; + name = "breeze-icons-5.113.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/extra-cmake-modules-5.112.0.tar.xz"; - sha256 = "1qn2shanzsv06q34zwhkjhb88j7crdp83qp265gpxmc049vq845c"; - name = "extra-cmake-modules-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/extra-cmake-modules-5.113.0.tar.xz"; + sha256 = "1i1vpf9860cwrq5b01yrgf94hmzk9dx637j638shgjmyxr058pi6"; + name = "extra-cmake-modules-5.113.0.tar.xz"; }; }; frameworkintegration = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/frameworkintegration-5.112.0.tar.xz"; - sha256 = "1kiy4vcr8lj82mhpgn99yw4w6lwr26yjmsfdv3n6ha667gqv2gn6"; - name = "frameworkintegration-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/frameworkintegration-5.113.0.tar.xz"; + sha256 = "17i7frachq23kfg78ar33x5acwf7pmwl1a5c02qif44mml8b09hi"; + name = "frameworkintegration-5.113.0.tar.xz"; }; }; kactivities = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kactivities-5.112.0.tar.xz"; - sha256 = "0nzbvby11f14h5w2q5wa5kij7bpx01ffqsi8mmjk71imhq5mzkfz"; - name = "kactivities-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kactivities-5.113.0.tar.xz"; + sha256 = "1d9lkhp344wdss9vab3gh9h31f1k6fifdhp17fblpkykgyvbb26y"; + name = "kactivities-5.113.0.tar.xz"; }; }; kactivities-stats = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kactivities-stats-5.112.0.tar.xz"; - sha256 = "0czic2s147nhjphdkfymnakrw73bzi0pbmb8s3frrxsf4yp7gvzy"; - name = "kactivities-stats-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kactivities-stats-5.113.0.tar.xz"; + sha256 = "136z2njw3k2l71xp4vg10sm5q925xh8yfr9a784wnr0kwngdb71i"; + name = "kactivities-stats-5.113.0.tar.xz"; }; }; kapidox = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kapidox-5.112.0.tar.xz"; - sha256 = "0fa80ncx4h5izhw6vjjglmxcs9h4rvf2q1bcm0m4zcpky5h8bdqi"; - name = "kapidox-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kapidox-5.113.0.tar.xz"; + sha256 = "05407c01wnjyslbbz0w5wipjpx6ng3izya41mg13g700ainj9q1x"; + name = "kapidox-5.113.0.tar.xz"; }; }; karchive = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/karchive-5.112.0.tar.xz"; - sha256 = "0rzxxgp5hcs63yfqisvf1m2m0qyrj2ri9966h5hc25jh5ajrgmi7"; - name = "karchive-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/karchive-5.113.0.tar.xz"; + sha256 = "03a3p85hmx4ycfp0y5l9yw4cy3i9jwy7jd27psmckr4q0538k91d"; + name = "karchive-5.113.0.tar.xz"; }; }; kauth = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kauth-5.112.0.tar.xz"; - sha256 = "1xq5jhnp3dyykx84p5ijhi6kj0x2iz8k665bkkz4zcv9l8gf9jv7"; - name = "kauth-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kauth-5.113.0.tar.xz"; + sha256 = "0ncpyq2l53p4yhhxkvk23x0ji9amrbnm6kbz8dp573cqww79pih2"; + name = "kauth-5.113.0.tar.xz"; }; }; kbookmarks = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kbookmarks-5.112.0.tar.xz"; - sha256 = "12m8wx8sv12mwj2xprbr3ywr66mq3415byjfsz8f5yx4lhywkcfi"; - name = "kbookmarks-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kbookmarks-5.113.0.tar.xz"; + sha256 = "1fgnh8amy2ghn50i59al0iyqvj05pzdxai9qxqzbvi65f1pibi7d"; + name = "kbookmarks-5.113.0.tar.xz"; }; }; kcalendarcore = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kcalendarcore-5.112.0.tar.xz"; - sha256 = "0najg934lylb5m64lmkpv3v7ri2g3ncsg8ycg7gkm8r93nypa60r"; - name = "kcalendarcore-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kcalendarcore-5.113.0.tar.xz"; + sha256 = "18psjzqcfzaplcfjpjda983mrpv306il0j49q3rm9hj9ycj54wc2"; + name = "kcalendarcore-5.113.0.tar.xz"; }; }; kcmutils = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kcmutils-5.112.0.tar.xz"; - sha256 = "0b4l5hf90jrbj4bbrkmyz1va6znwd8dpp2w0i5h002xbpf6vwp2y"; - name = "kcmutils-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kcmutils-5.113.0.tar.xz"; + sha256 = "1xbfzw2zfl966zp70jzfp3hjzn334zf4hnwr82priffafgrin57s"; + name = "kcmutils-5.113.0.tar.xz"; }; }; kcodecs = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kcodecs-5.112.0.tar.xz"; - sha256 = "0pnmqq5asj361x9fk1vapwssafbb2zxjr0nh8lp8666f675wg2yx"; - name = "kcodecs-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kcodecs-5.113.0.tar.xz"; + sha256 = "1xvaq0yg4n4lwyq3yx2m8jrvfg7f0qrwgxxam4rmp2l245bvn34i"; + name = "kcodecs-5.113.0.tar.xz"; }; }; kcompletion = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kcompletion-5.112.0.tar.xz"; - sha256 = "1k09ahwgz1fipdc1l2k13r97hgyvwjsr5dlvhkbrd384sip84q8j"; - name = "kcompletion-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kcompletion-5.113.0.tar.xz"; + sha256 = "016280h98j1ssvc3a4b3vyh4s93s9y9hn1jrpbfbkm9xxnvi7k79"; + name = "kcompletion-5.113.0.tar.xz"; }; }; kconfig = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kconfig-5.112.0.tar.xz"; - sha256 = "080qv53727ijdz9325kzl81nxchds3cpy6siv1h5s4scbb92dpl6"; - name = "kconfig-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kconfig-5.113.0.tar.xz"; + sha256 = "0fwhn3yp4gfwjiy5dx7gs0zd65yjlrrzkqpy7fpg7n97qf99q2a8"; + name = "kconfig-5.113.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kconfigwidgets-5.112.0.tar.xz"; - sha256 = "0yk84f9pwb600pligwa2022r9srz4fd7kkf90r7q7vmf5r3hl3r9"; - name = "kconfigwidgets-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kconfigwidgets-5.113.0.tar.xz"; + sha256 = "0bmk5qxiss7a71xpfsbqj831wkcf94b7wfbw9xisvnxlfmf60y4v"; + name = "kconfigwidgets-5.113.0.tar.xz"; }; }; kcontacts = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kcontacts-5.112.0.tar.xz"; - sha256 = "0q20xnj43ysq1wdymvl8j8zyvycsqs4hm2x72gz42hd9dlbp77s5"; - name = "kcontacts-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kcontacts-5.113.0.tar.xz"; + sha256 = "1y9cdv1g2ypwl4b0hk1sxk7lvb5qkbm4n1gh62plqsran62jsimm"; + name = "kcontacts-5.113.0.tar.xz"; }; }; kcoreaddons = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kcoreaddons-5.112.0.tar.xz"; - sha256 = "032n4fl4d8lhgmd08f7nfa18izrccggxhdbgk33vnf1lw7c6yamp"; - name = "kcoreaddons-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kcoreaddons-5.113.0.tar.xz"; + sha256 = "1bhanzfjw2i49sx2hjnim8k72vvbs7gyig7nkqkgbaxzpa8qgwrf"; + name = "kcoreaddons-5.113.0.tar.xz"; }; }; kcrash = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kcrash-5.112.0.tar.xz"; - sha256 = "1sarh8ncibl8bz7pkd5xs4dd5vciyj82pckazxx4f482irdzyxzx"; - name = "kcrash-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kcrash-5.113.0.tar.xz"; + sha256 = "1mg90xm6ckcd30s07psn30sgh81lx8kfs0p1h6cblg4q8bkgkndv"; + name = "kcrash-5.113.0.tar.xz"; }; }; kdav = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kdav-5.112.0.tar.xz"; - sha256 = "1m6basdd6p0yaij9jdsc35sj198gsackk3dx4kci3a8zlvvag32g"; - name = "kdav-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kdav-5.113.0.tar.xz"; + sha256 = "1djng9c741xairr84nvjbkq4dk551p7yk91g8d4nndy8s1kiz1dv"; + name = "kdav-5.113.0.tar.xz"; }; }; kdbusaddons = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kdbusaddons-5.112.0.tar.xz"; - sha256 = "0n04z0srf3xzd0m9sa9f3q7hrzbjrg1hbajzm89p71hfr7dmcgjq"; - name = "kdbusaddons-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kdbusaddons-5.113.0.tar.xz"; + sha256 = "101a406f8i0wgaxd0ilvfcb3plzjgvxw9bhhm5pin6fpr0xkjrnk"; + name = "kdbusaddons-5.113.0.tar.xz"; }; }; kdeclarative = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kdeclarative-5.112.0.tar.xz"; - sha256 = "1wzhqp5mzbk9lz7ks4ggzb1k6c3fkxwwyzdapwfgn79k5qrhqvjk"; - name = "kdeclarative-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kdeclarative-5.113.0.tar.xz"; + sha256 = "1wj9arkmjdrac04cq2w5bw5184jnlq5xn2cw6n7lajc31yrbc0rk"; + name = "kdeclarative-5.113.0.tar.xz"; }; }; kded = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kded-5.112.0.tar.xz"; - sha256 = "16qiybj9q1v6j5csyx2f7pdpxih60psszyyvq9yj4ycdzjhjzmmn"; - name = "kded-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kded-5.113.0.tar.xz"; + sha256 = "1vb3z7r2l206n7p70a4cbkrm7fvyk7hqqf0bz7514r4g86l4l5n4"; + name = "kded-5.113.0.tar.xz"; }; }; kdelibs4support = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/kdelibs4support-5.112.0.tar.xz"; - sha256 = "0rrzqyawck0mmh8xfs73jx6jghv5bm1346h3xkhgw6ydfzdv3kcv"; - name = "kdelibs4support-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/kdelibs4support-5.113.0.tar.xz"; + sha256 = "1z843zq1g5n3b8gb20y8266hyikvbzdsgc77gvcgzvqfdxk19l24"; + name = "kdelibs4support-5.113.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/kdesignerplugin-5.112.0.tar.xz"; - sha256 = "0rrk7d06m1ywxf6n1crf510imidhfkpfb58qpaby2fzwb1ifmlyj"; - name = "kdesignerplugin-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/kdesignerplugin-5.113.0.tar.xz"; + sha256 = "05hwq8rpm1f9ad5fyk2gjqxm6gvvx2gx2zdbklww9ghlh8qndl9i"; + name = "kdesignerplugin-5.113.0.tar.xz"; }; }; kdesu = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kdesu-5.112.0.tar.xz"; - sha256 = "1yn16q3yrycrh6xsfh7faa5n9cr0lafiwh9dwr5p8rm62nmas83g"; - name = "kdesu-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kdesu-5.113.0.tar.xz"; + sha256 = "085d3d6qpl4m7z8smm0bq9khfjjglpb1gd9n8q0d541127y2cpq4"; + name = "kdesu-5.113.0.tar.xz"; }; }; kdewebkit = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/kdewebkit-5.112.0.tar.xz"; - sha256 = "11za35zxaa3mlvmrkp4rx47sl6ihbc1xgcaf18r6a0cyn4zhx2fz"; - name = "kdewebkit-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/kdewebkit-5.113.0.tar.xz"; + sha256 = "18bmg88xj07h8y5f3f2ckjs9m61mf8jrxrg4vg8hrf4nabxz20xn"; + name = "kdewebkit-5.113.0.tar.xz"; }; }; kdnssd = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kdnssd-5.112.0.tar.xz"; - sha256 = "0cd1dm44f12n29d8idh29djhfd2z6lj4hc4l42hxx2nasi009p2s"; - name = "kdnssd-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kdnssd-5.113.0.tar.xz"; + sha256 = "1hbb9zy1f13m45b6kzndxw619vnmx0s418brqgkdaxgsh12j5anq"; + name = "kdnssd-5.113.0.tar.xz"; }; }; kdoctools = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kdoctools-5.112.0.tar.xz"; - sha256 = "1cinjrbg31pilzlir9vmigf86ypgpxr9mmyqpjfvq6yxvxfnq7li"; - name = "kdoctools-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kdoctools-5.113.0.tar.xz"; + sha256 = "0cfs4znhp7psrz99j3brp8q39gg0bpzvkrdx90zl6vvrc06d2zaa"; + name = "kdoctools-5.113.0.tar.xz"; }; }; kemoticons = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kemoticons-5.112.0.tar.xz"; - sha256 = "037xj9i1x81npm7fyqizkyi7k4slakx1c5x9drp0py5133a0k6z8"; - name = "kemoticons-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kemoticons-5.113.0.tar.xz"; + sha256 = "127frvsp1h9hg755vz2i609wxqqgzgsz15iqr7hcpbmmf6xvm8i2"; + name = "kemoticons-5.113.0.tar.xz"; }; }; kfilemetadata = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kfilemetadata-5.112.0.tar.xz"; - sha256 = "1yvz3439jmg8m0ry9z0930ya679fahphb6s7mci23xf5zjpczgy4"; - name = "kfilemetadata-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kfilemetadata-5.113.0.tar.xz"; + sha256 = "1ap25y66y1r185fghvkkkkp4f6acnkazny8wxw5hv1gg25ilpsir"; + name = "kfilemetadata-5.113.0.tar.xz"; }; }; kglobalaccel = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kglobalaccel-5.112.0.tar.xz"; - sha256 = "0flb0rkw5bh1xb706pgzsjq41slma4xwg3ghmvrdr622qf87w9hh"; - name = "kglobalaccel-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kglobalaccel-5.113.0.tar.xz"; + sha256 = "0ibm1wd7fhi3j5za0agyq2zrs9nx5a8b47iijkzgkpz9ylxniwrs"; + name = "kglobalaccel-5.113.0.tar.xz"; }; }; kguiaddons = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kguiaddons-5.112.0.tar.xz"; - sha256 = "0yw4ikb14f2q1z0hr64bxnxvg770jjllqfvhbnl5hn3m7l61psmb"; - name = "kguiaddons-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kguiaddons-5.113.0.tar.xz"; + sha256 = "1ykhxgx89x1qv916pcz3j0q14ylalg9v23jjw0dbwpg5hlj4qlyc"; + name = "kguiaddons-5.113.0.tar.xz"; }; }; kholidays = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kholidays-5.112.0.tar.xz"; - sha256 = "1b5jdss17wvm66gwzh6qb0caz9b3fnr6cd902bvqa7dr1aby4j52"; - name = "kholidays-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kholidays-5.113.0.tar.xz"; + sha256 = "1wq397j3m3s9a45k9h5hsdsfansvb3a5q8biag2w3fsb1i84id0i"; + name = "kholidays-5.113.0.tar.xz"; }; }; khtml = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/khtml-5.112.0.tar.xz"; - sha256 = "0rw6286w971q61gahm1qzic0gsfmfz8x449jw6zy38d9k17h7s2n"; - name = "khtml-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/khtml-5.113.0.tar.xz"; + sha256 = "0m284rwq8f49j71lcapzr4qi0f72a0adnv67mfg5blar867161mq"; + name = "khtml-5.113.0.tar.xz"; }; }; ki18n = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/ki18n-5.112.0.tar.xz"; - sha256 = "06wng9mpr2ln9dd1ayvwglc6071iqg5285jisg95vgf2c3kl5m9k"; - name = "ki18n-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/ki18n-5.113.0.tar.xz"; + sha256 = "0hl0qp3653xiwa5ndk82ygy2kgrc0pygqkknb1cx5w54s56bm57w"; + name = "ki18n-5.113.0.tar.xz"; }; }; kiconthemes = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kiconthemes-5.112.0.tar.xz"; - sha256 = "04nqw9a2c7bba5y7y741wqwm95jfpbva71q1fj43grd6hcqlff53"; - name = "kiconthemes-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kiconthemes-5.113.0.tar.xz"; + sha256 = "0q2c1s8pwl7dnx9v7q061zn5n1prk0vv0j77kki9wfncjaf15g0g"; + name = "kiconthemes-5.113.0.tar.xz"; }; }; kidletime = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kidletime-5.112.0.tar.xz"; - sha256 = "0pch2baf9867w6llk98mxag2y3sjz6irqci88rrsnwn4s1vcs356"; - name = "kidletime-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kidletime-5.113.0.tar.xz"; + sha256 = "1cdfhn3mcxvizba1gpf0viba3g0mnva3l226lkca3p9ps8c4z3rm"; + name = "kidletime-5.113.0.tar.xz"; }; }; kimageformats = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kimageformats-5.112.0.tar.xz"; - sha256 = "1lw9vvmb032ymy0a1443q3p9nwn8shc9kbaz05jw4jwa74wp7i65"; - name = "kimageformats-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kimageformats-5.113.0.tar.xz"; + sha256 = "0gys83sazgbj7h3yiaacqr464z951ixygrhzcw16cnqjm8phic44"; + name = "kimageformats-5.113.0.tar.xz"; }; }; kinit = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kinit-5.112.0.tar.xz"; - sha256 = "1mij6nw1w0zyv724096pfbb0r95300yqb884bx3wlm5nibawwpz7"; - name = "kinit-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kinit-5.113.0.tar.xz"; + sha256 = "1ydmgxyr5j9zi0a5vlb64kkjxka3rsyvzj10y3dww92qyapnn2bv"; + name = "kinit-5.113.0.tar.xz"; }; }; kio = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kio-5.112.0.tar.xz"; - sha256 = "16gv0f8l4jn19mrwc52c6gw2n8hb28n6v7x6kx7qbs3z0wf57f44"; - name = "kio-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kio-5.113.0.tar.xz"; + sha256 = "1bjmv3wdpmzqbv1xzzl0ydirccbknnjyqn6wzb057zgy7kpi1cd8"; + name = "kio-5.113.0.tar.xz"; }; }; kirigami2 = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kirigami2-5.112.0.tar.xz"; - sha256 = "048f3sji3dx7q415fkmkj0xmnl0dxacdr9d08d5rqkxz2d94hzk3"; - name = "kirigami2-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kirigami2-5.113.0.tar.xz"; + sha256 = "0zy3s841q2xw4d048a3qh4cfh9kb3qaqxml4ny5zi73crm173h8y"; + name = "kirigami2-5.113.0.tar.xz"; }; }; kitemmodels = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kitemmodels-5.112.0.tar.xz"; - sha256 = "130avvp4lq8f8pag39mna0p3rjyvhbq6akng9d4l01nf8287zv2s"; - name = "kitemmodels-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kitemmodels-5.113.0.tar.xz"; + sha256 = "01i1s7rw7ndp3gnl3bg0pv8a9qz95rmz0jxkw97p72gcah2q2yvk"; + name = "kitemmodels-5.113.0.tar.xz"; }; }; kitemviews = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kitemviews-5.112.0.tar.xz"; - sha256 = "1xpk5xfrp38bjgsyvc3wmcq7vj1sa2wxz0wld2bby3nsixbrdq68"; - name = "kitemviews-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kitemviews-5.113.0.tar.xz"; + sha256 = "0wnmgm72kv7vxadsrkdbnjknb4lkzrmn6gk7car7jx2i91kz7xdd"; + name = "kitemviews-5.113.0.tar.xz"; }; }; kjobwidgets = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kjobwidgets-5.112.0.tar.xz"; - sha256 = "1x1ip1c1v7mydvrz620gaajx6c1p88vlbi3i66fdfnxvhkcrqzqv"; - name = "kjobwidgets-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kjobwidgets-5.113.0.tar.xz"; + sha256 = "0f5shrapjvwp8bc34vypzfsfl07pj7nmdflf9lcwc8h3kwf2rxqr"; + name = "kjobwidgets-5.113.0.tar.xz"; }; }; kjs = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/kjs-5.112.0.tar.xz"; - sha256 = "00nr7darrijxm7czvjwvs4jrw8yd8ypz49l4xym19fvslcb5d0x9"; - name = "kjs-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/kjs-5.113.0.tar.xz"; + sha256 = "0h50jyd9mddnavafikn9haqqcq1mql2v8qcc1c233ffplkx1f6hb"; + name = "kjs-5.113.0.tar.xz"; }; }; kjsembed = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/kjsembed-5.112.0.tar.xz"; - sha256 = "0hs6ka5qj1w3kha6rssvvpw6dh4pw001wfpfjzn8klawjwndjv1r"; - name = "kjsembed-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/kjsembed-5.113.0.tar.xz"; + sha256 = "0bwsj0n3d038vs3n2mw6x8srbg4da40bw59q14cpv70ws1sg2r2n"; + name = "kjsembed-5.113.0.tar.xz"; }; }; kmediaplayer = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/kmediaplayer-5.112.0.tar.xz"; - sha256 = "1bdanmrbzyh6hbpkflq7gwrjm03647pbbiv670li0cmyfmnz904r"; - name = "kmediaplayer-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/kmediaplayer-5.113.0.tar.xz"; + sha256 = "1nyn7x28j17yrb7zx31519h2ghp5h3pwk6baxais0q1mv9azyfay"; + name = "kmediaplayer-5.113.0.tar.xz"; }; }; knewstuff = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/knewstuff-5.112.0.tar.xz"; - sha256 = "1l417xsqpwxv73wm0fdgjpfnvs19casm1x2xsl299pj66kcm1y7l"; - name = "knewstuff-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/knewstuff-5.113.0.tar.xz"; + sha256 = "0fj17rxyp9wmmc9jh8zjpgwpia9r4xlvabvkb4ynd1vhy58k8w51"; + name = "knewstuff-5.113.0.tar.xz"; }; }; knotifications = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/knotifications-5.112.0.tar.xz"; - sha256 = "1xlx91rn826gw3mqddvfs884mx95rhksf70wc1m5jd49cdcgw1mz"; - name = "knotifications-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/knotifications-5.113.0.tar.xz"; + sha256 = "1yzpf12wsi3h3v7z68b42rjdrnfkah6avq4y611b0r004shgkl1x"; + name = "knotifications-5.113.0.tar.xz"; }; }; knotifyconfig = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/knotifyconfig-5.112.0.tar.xz"; - sha256 = "18qikgc5lp5xjmar823j0cgwqpgc8b5sr8rq1x2p23pbb9ywfpqj"; - name = "knotifyconfig-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/knotifyconfig-5.113.0.tar.xz"; + sha256 = "1gdzyxcc371lmnzc153k8wdyxgsv7r2y44j8d5srld36amssxnc6"; + name = "knotifyconfig-5.113.0.tar.xz"; }; }; kpackage = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kpackage-5.112.0.tar.xz"; - sha256 = "0g84q54yhm9a1h48pim371rjbl208ka56a6xx23zqis20wqjs0kp"; - name = "kpackage-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kpackage-5.113.0.tar.xz"; + sha256 = "04605kr2w0yhwx64lqq1qc1zmmip7vkxnxv3fs2846864814fkk2"; + name = "kpackage-5.113.0.tar.xz"; }; }; kparts = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kparts-5.112.0.tar.xz"; - sha256 = "0mr45zk4i7jfazkawi7i2ry88y9a17wsny4ck0zln3ggb6wra32c"; - name = "kparts-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kparts-5.113.0.tar.xz"; + sha256 = "0mx95xrr6pad4q5p0sn2iqmc59787bpfkvkyiz9li56wynh1jf48"; + name = "kparts-5.113.0.tar.xz"; }; }; kpeople = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kpeople-5.112.0.tar.xz"; - sha256 = "0xfczzy2pwdszzzmyj8ldr1178d93za26j0rqbj3wnqsnji9yn6n"; - name = "kpeople-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kpeople-5.113.0.tar.xz"; + sha256 = "08g44hq1iywycf44imdqkql4gx2vyg87n1nxxqq6ssva0kybia7n"; + name = "kpeople-5.113.0.tar.xz"; }; }; kplotting = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kplotting-5.112.0.tar.xz"; - sha256 = "0a18ly62ilsmaihm398q1jvj10ccw00di3rywq0wq45n0ghnx7zx"; - name = "kplotting-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kplotting-5.113.0.tar.xz"; + sha256 = "16pfia711y9iqnl0svyg00g7a2x4ln8yaxmrmy74xj7y0dj5jcyj"; + name = "kplotting-5.113.0.tar.xz"; }; }; kpty = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kpty-5.112.0.tar.xz"; - sha256 = "1p6rm94hvq6w54h84vhcqbbnj2gmypipj05vx7c9bnijy0d4nfxf"; - name = "kpty-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kpty-5.113.0.tar.xz"; + sha256 = "0hzn18lidiiaxr08fjhk0r5zh0m01ls46w1fyjnv42bvf7vd7v5y"; + name = "kpty-5.113.0.tar.xz"; }; }; kquickcharts = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kquickcharts-5.112.0.tar.xz"; - sha256 = "1c634jda7lqmv009jg2jdarkd08q1hf4fb3wnj35hilj37c57b5a"; - name = "kquickcharts-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kquickcharts-5.113.0.tar.xz"; + sha256 = "0v47c6mdx72rdz441zk4csc6a2bj6wi7772vlpz2yr3ay70l8f5d"; + name = "kquickcharts-5.113.0.tar.xz"; }; }; kross = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/kross-5.112.0.tar.xz"; - sha256 = "1b887bx4d3nr55305mk91wnm6bfhbgnqjmbc3a9jkv65c78j9hsa"; - name = "kross-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/kross-5.113.0.tar.xz"; + sha256 = "1cqdcm086a4kjrb9k6cwqn05fg5ij3zppc8bi7dxrgrfxc494c8s"; + name = "kross-5.113.0.tar.xz"; }; }; krunner = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/krunner-5.112.0.tar.xz"; - sha256 = "00bfszbpr2w21nz3vhih8hp0f9gzn1906axvib3jm1w3kjmy2avn"; - name = "krunner-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/krunner-5.113.0.tar.xz"; + sha256 = "0z7d6nyvrlgr7aw9ibz1xgp62220iwzvhqpqikwlxhc9hjggmdlh"; + name = "krunner-5.113.0.tar.xz"; }; }; kservice = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kservice-5.112.0.tar.xz"; - sha256 = "01aj0yrlxlwr5sm1z0pq6caa4ijj3nsgqhza1zr4mzrx2ybf753z"; - name = "kservice-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kservice-5.113.0.tar.xz"; + sha256 = "09ph72jb40pkw1nzayvzzav4m6240amkj6jvx390dmsvr7jzn0nb"; + name = "kservice-5.113.0.tar.xz"; }; }; ktexteditor = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/ktexteditor-5.112.0.tar.xz"; - sha256 = "0d0cw9qd7mmnhdqayx4lcpd60hp1al5zwy565rsvxmjly564l3i9"; - name = "ktexteditor-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/ktexteditor-5.113.0.tar.xz"; + sha256 = "02nclhfgqximsl8w6la5w0fshzcj71nrz5kjb2p1s28xdf1ahvgg"; + name = "ktexteditor-5.113.0.tar.xz"; }; }; ktextwidgets = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/ktextwidgets-5.112.0.tar.xz"; - sha256 = "0x83f0ih3c25yggmvyibyfaiikk4zc0k5gf6yr87c62ihgv7gniz"; - name = "ktextwidgets-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/ktextwidgets-5.113.0.tar.xz"; + sha256 = "060grfna4kj8nhxgk38yf3csqfgxg0358dkwmg8aw5y5k0jys2az"; + name = "ktextwidgets-5.113.0.tar.xz"; }; }; kunitconversion = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kunitconversion-5.112.0.tar.xz"; - sha256 = "1zi47yd3aydy2mcmgfgwp4g12w7681lyc1niq5p13670mxhlkrwc"; - name = "kunitconversion-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kunitconversion-5.113.0.tar.xz"; + sha256 = "1x7gwrz43wvd3r87x545bxxyzhqj87mhhx05dqh0b09vqk6gxzza"; + name = "kunitconversion-5.113.0.tar.xz"; }; }; kwallet = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kwallet-5.112.0.tar.xz"; - sha256 = "1v38wyz9hhhvzwrpxsjkd8yqyy4yv9hii1413ffcm9x971nliq2s"; - name = "kwallet-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kwallet-5.113.0.tar.xz"; + sha256 = "0aq8d5c5p9j19bzspd205gh297n7fh5f26m49826fx5mp1im4lwn"; + name = "kwallet-5.113.0.tar.xz"; }; }; kwayland = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kwayland-5.112.0.tar.xz"; - sha256 = "0nzpg4x9hg9jd1kg6sq0lh658kz3cz25z5kji7hpq2h0svmxx709"; - name = "kwayland-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kwayland-5.113.0.tar.xz"; + sha256 = "1anhvz4b1q835py451jznnfj9z2jh1fwnx4lfwhi67viaplpiwqg"; + name = "kwayland-5.113.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kwidgetsaddons-5.112.0.tar.xz"; - sha256 = "0x5mz04dwlpl0h75v0c5w04qjpcb3fbpjk7hbslwgfwr7gviqyib"; - name = "kwidgetsaddons-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kwidgetsaddons-5.113.0.tar.xz"; + sha256 = "01rabfl2v5l9r3fgwgy75krib1486mdc4k3kfi035s6dvg8iy015"; + name = "kwidgetsaddons-5.113.0.tar.xz"; }; }; kwindowsystem = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kwindowsystem-5.112.0.tar.xz"; - sha256 = "08ihg6zq979h4v6c157n80pi3cfsg9w9qiyqaw3h79365zji73j1"; - name = "kwindowsystem-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kwindowsystem-5.113.0.tar.xz"; + sha256 = "1hzavawsl14rsl9qb874zahvsvkrbcin7fg1xn1d7ssypphlis51"; + name = "kwindowsystem-5.113.0.tar.xz"; }; }; kxmlgui = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/kxmlgui-5.112.0.tar.xz"; - sha256 = "17jsqzxn5wgwsm3lrfgdygyzvqibzv9vfgg11s2gc5bq9x4s0j8g"; - name = "kxmlgui-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/kxmlgui-5.113.0.tar.xz"; + sha256 = "022l557z9jgrz2hj8hh9z7cjkvfhl5rdp81jhk2gd3wzmyf5zzmq"; + name = "kxmlgui-5.113.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/portingAids/kxmlrpcclient-5.112.0.tar.xz"; - sha256 = "09zwgrh336bk5cfab2zcdzcfdzjvlqa47ljfrciyh4h8m5f7y12h"; - name = "kxmlrpcclient-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/portingAids/kxmlrpcclient-5.113.0.tar.xz"; + sha256 = "141vlxxnyll5q0wg2va5prg0wf0hpymlzfkg37h1ngjwjs2x2yc1"; + name = "kxmlrpcclient-5.113.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/modemmanager-qt-5.112.0.tar.xz"; - sha256 = "0323zp03wj4ignfc94qg89h3j4qmh3mkdac5snr1axjaaf6sk6w8"; - name = "modemmanager-qt-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/modemmanager-qt-5.113.0.tar.xz"; + sha256 = "069irg7ckws06qzq5mwkxvzx4r2xqwagwif6dq284hjihrz38l8b"; + name = "modemmanager-qt-5.113.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/networkmanager-qt-5.112.0.tar.xz"; - sha256 = "1larg78j7rlbbscv04imc1k6f1srapr2yrbyxif38d4iipfg04f9"; - name = "networkmanager-qt-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/networkmanager-qt-5.113.0.tar.xz"; + sha256 = "03wdbw6dr9a49qcs1j2lm9q894rvdl8xqjpwm3yrrjb866yyhcg1"; + name = "networkmanager-qt-5.113.0.tar.xz"; }; }; - oxygen-icons5 = { - version = "5.112.0"; + oxygen-icons = { + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/oxygen-icons5-5.112.0.tar.xz"; - sha256 = "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a"; - name = "oxygen-icons5-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/oxygen-icons-5.113.0.tar.xz"; + sha256 = "0grdn0gz59lfp4n5mmlan71x3iwgm87dnhk8mla02dn7hv0fl0xx"; + name = "oxygen-icons-5.113.0.tar.xz"; }; }; plasma-framework = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/plasma-framework-5.112.0.tar.xz"; - sha256 = "0nq8dzqk1hxzm8yngzgm9zqw8155fy38zq6k3613af5mgj7jmdhj"; - name = "plasma-framework-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/plasma-framework-5.113.0.tar.xz"; + sha256 = "0iijawnh9ri1n6qgdrraf3lq5sy7z0jy5ihmfzk22pn10ba992ky"; + name = "plasma-framework-5.113.0.tar.xz"; }; }; prison = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/prison-5.112.0.tar.xz"; - sha256 = "1blgs0k4kz3smsf0qb9y6krzbssyv1hbqvjc7qvk4qwk81qhyfvq"; - name = "prison-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/prison-5.113.0.tar.xz"; + sha256 = "18y4gxj5zml59a8i7gzr5cbbzi5wyknbva2ihfdpqf85vw3x2wdp"; + name = "prison-5.113.0.tar.xz"; }; }; purpose = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/purpose-5.112.0.tar.xz"; - sha256 = "1cqcmhbb26xypllmk3z4r0z8sw79idzz6nz72ahwa4ha0pqbl8p3"; - name = "purpose-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/purpose-5.113.0.tar.xz"; + sha256 = "0p5zcvrkaw71w8795x2a4lx3z977j6jcnwbi9wi1956gcx4avhhf"; + name = "purpose-5.113.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/qqc2-desktop-style-5.112.0.tar.xz"; - sha256 = "1k74vwj07xf3fjfj8ff9zx5ndzq5m3bdnj4zgymkxm1gk3r6gl5y"; - name = "qqc2-desktop-style-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/qqc2-desktop-style-5.113.0.tar.xz"; + sha256 = "0sk0sk7cq511m0rjmgsg1z8s4sy064qmbql472ljyblafm71wj6p"; + name = "qqc2-desktop-style-5.113.0.tar.xz"; }; }; solid = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/solid-5.112.0.tar.xz"; - sha256 = "0hpm5akhk24fzbg27p6ql598s5mxa6n8h359ajf45afabimhjx0y"; - name = "solid-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/solid-5.113.0.tar.xz"; + sha256 = "0vhhkn15axfvlwrf9np91hnipw1lb2x9zh0ajpngvxzcnj6kvn7r"; + name = "solid-5.113.0.tar.xz"; }; }; sonnet = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/sonnet-5.112.0.tar.xz"; - sha256 = "026iivz27d7v4kpwkl6qwbcqnd71kvg77szy91fch37iki7z6361"; - name = "sonnet-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/sonnet-5.113.0.tar.xz"; + sha256 = "17v3a2j0vhx7mzv0wfgqky248m57gasyv1xbjqpzjdr3x2f1zhy6"; + name = "sonnet-5.113.0.tar.xz"; }; }; syndication = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/syndication-5.112.0.tar.xz"; - sha256 = "03if949klq28kaf3xzcva917fqv7cn6pzjwsgymya3nc730kfsc8"; - name = "syndication-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/syndication-5.113.0.tar.xz"; + sha256 = "1nzcfk4qsjvrgci3vk78jjpbig61pm0y73h3qs83yld1zw3az3jx"; + name = "syndication-5.113.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/syntax-highlighting-5.112.0.tar.xz"; - sha256 = "1m88nfmf4kxliqkgm78f95yvsjv76xm2rmg92v9mg00r9d00y95h"; - name = "syntax-highlighting-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/syntax-highlighting-5.113.0.tar.xz"; + sha256 = "1blifnqikvrlkcskwjdk54mvh8yd4r0vzz282mi64w7alimlilgl"; + name = "syntax-highlighting-5.113.0.tar.xz"; }; }; threadweaver = { - version = "5.112.0"; + version = "5.113.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.112/threadweaver-5.112.0.tar.xz"; - sha256 = "1i3qj6qf0sv5pf8d5wx6gy11dqyp4x4b4759gwbhlrizkm4fa7f9"; - name = "threadweaver-5.112.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.113/threadweaver-5.113.0.tar.xz"; + sha256 = "1x7i7mdg5v22y04m720k9fqj7xagm8qnlssb1xjs9nj0aqif8jgp"; + name = "threadweaver-5.113.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/nixpkgs/pkgs/development/libraries/kdsoap/default.nix index 80eb6d683207..c2f94b8e6927 100644 --- a/nixpkgs/pkgs/development/libraries/kdsoap/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdsoap/default.nix @@ -1,11 +1,15 @@ -{ mkDerivation +{ stdenv , lib , fetchurl , cmake , qtbase +, wrapQtAppsHook }: -mkDerivation rec { +let + isQt6 = lib.versions.major qtbase.version == "6"; + cmakeName = if isQt6 then "KDSoap-qt6" else "KDSoap"; +in stdenv.mkDerivation rec { pname = "kdsoap"; version = "2.1.1"; @@ -16,15 +20,17 @@ mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; + cmakeFlags = [ (lib.cmakeBool "KDSoap_QT6" isQt6) ]; + postInstall = '' - moveToOutput bin/kdwsdl2cpp "$dev" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ + moveToOutput bin/kdwsdl2cpp* "$dev" + sed -i "$out/lib/cmake/${cmakeName}/KDSoapTargets.cmake" \ -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ + sed -i "$out/lib/cmake/${cmakeName}/KDSoapTargets-release.cmake" \ -e "s@$out/bin@$dev/bin@" ''; diff --git a/nixpkgs/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch b/nixpkgs/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch deleted file mode 100644 index a0fa625538b7..000000000000 --- a/nixpkgs/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib/hx509/Makefile.am 2018-03-21 15:41:38.622968809 +0100 -+++ b/lib/hx509/Makefile.am 2018-03-21 15:41:32.655162197 +0100 -@@ -9,6 +9,8 @@ - sel-gram.h \ - $(gen_files_ocsp:.x=.c) \ - $(gen_files_pkcs10:.x=.c) \ -+ ocsp_asn1.h \ -+ pkcs10_asn1.h \ - hx509_err.c \ - hx509_err.h diff --git a/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix index e4a61a3c0731..ff211b6b9c34 100644 --- a/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix +++ b/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,63 +1,138 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, bison, flex -, texinfo, perlPackages -, openldap, libcap_ng, sqlite, openssl, db, libedit, pam -, CoreFoundation, Security, SystemConfiguration +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, python3 +, perl +, bison +, flex +, texinfo +, perlPackages + +, openldap +, libcap_ng +, sqlite +, openssl +, db +, libedit +, pam +, krb5 +, libmicrohttpd +, cjson + +, CoreFoundation +, Security +, SystemConfiguration + +, curl +, jdk +, unzip +, which + +, nixosTests + +, withCJSON ? true +, withCapNG ? stdenv.isLinux +# libmicrohttpd should theoretically work for darwin as well, but something is broken. +# It affects tests check-bx509d and check-httpkadmind. +, withMicroHTTPD ? stdenv.isLinux +, withOpenLDAP ? true +, withOpenLDAPAsHDBModule ? false +, withOpenSSL ? true +, withSQLite3 ? true }: -stdenv.mkDerivation rec { +assert lib.assertMsg (withOpenLDAPAsHDBModule -> withOpenLDAP) '' + OpenLDAP needs to be enabled in order to build the OpenLDAP HDB Module. +''; + +stdenv.mkDerivation { pname = "heimdal"; - version = "7.8.0"; + version = "7.8.0-unstable-2023-11-29"; src = fetchFromGitHub { owner = "heimdal"; repo = "heimdal"; - rev = "heimdal-${version}"; - sha256 = "sha256-iXOaar1S3y0xHdL0S+vS0uxoFQjy43kABxqE+KEhxjU="; + rev = "3253c49544eacb33d5ad2f6f919b0696e5aab794"; + hash = "sha256-uljzQBzXrZCZjcIWfioqHN8YsbUUNy14Vo+A3vZIXzM="; }; outputs = [ "out" "dev" "man" "info" ]; - patches = [ ./heimdal-make-missing-headers.patch ]; - - nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ] - ++ (with perlPackages; [ JSON ]); - buildInputs = lib.optionals (stdenv.isLinux) [ libcap_ng ] - ++ [ db sqlite openssl libedit openldap pam] - ++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + perl + bison + flex + texinfo + ] + ++ (with perlPackages; [ JSON ]); + + buildInputs = [ db libedit pam ] + ++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ] + ++ lib.optionals (withCJSON) [ cjson ] + ++ lib.optionals (withCapNG) [ libcap_ng ] + ++ lib.optionals (withMicroHTTPD) [ libmicrohttpd ] + ++ lib.optionals (withOpenLDAP) [ openldap ] + ++ lib.optionals (withOpenSSL) [ openssl ] + ++ lib.optionals (withSQLite3) [ sqlite ]; + + doCheck = true; + nativeCheckInputs = [ + curl + jdk + unzip + which + ]; - ## ugly, X should be made an option configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--infodir=$info/share/info" - "--enable-hdb-openldap-module" - "--with-sqlite3=${sqlite.dev}" - - # ugly, --with-libedit is not enought, it fall back to bundled libedit "--with-libedit-include=${libedit.dev}/include" "--with-libedit-lib=${libedit}/lib" - "--with-openssl=${openssl.dev}" - "--without-x" - "--with-berkeley-db" "--with-berkeley-db-include=${db.dev}/include" - "--with-openldap=${openldap.dev}" - ] ++ lib.optionals (stdenv.isLinux) [ + "--with-berkeley-db" + + "--without-x" + "--disable-afs-string-to-key" + ] ++ lib.optionals (withCapNG) [ "--with-capng" + ] ++ lib.optionals (withCJSON) [ + "--with-cjson=${cjson}" + ] ++ lib.optionals (withOpenLDAP) [ + "--with-openldap=${openldap.dev}" + ] ++ lib.optionals (withOpenLDAPAsHDBModule) [ + "--enable-hdb-openldap-module" + ] ++ lib.optionals (withSQLite3) [ + "--with-sqlite3=${sqlite.dev}" ]; - postUnpack = '' - sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common - sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac + # (check-ldap) slapd resides within ${openldap}/libexec, + # which is not part of $PATH by default. + # (check-ldap) prepending ${openldap}/bin to the path to avoid + # using the default installation of openldap on unsandboxed darwin systems, + # which does not support the new mdb backend at the moment (2024-01-13). + # (check-ldap) the bdb backend got deprecated in favour of mdb in openldap 2.5.0, + # but the heimdal tests still seem to expect bdb as the openldap backend. + # This might be fixed upstream in a future update. + patchPhase = '' + runHook prePatch + + substituteInPlace tests/ldap/slapd-init.in \ + --replace 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' + substituteInPlace tests/ldap/check-ldap.in \ + --replace 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' + substituteInPlace tests/ldap/slapd.conf \ + --replace 'database bdb' 'database mdb' + + runHook postPatch ''; - preConfigure = '' - configureFlagsArray+=( - "--bindir=$out/bin" - "--sbindir=$out/sbin" - "--libexecdir=$out/libexec/heimdal" - "--mandir=$man/share/man" - "--infodir=$man/share/info" - "--includedir=$dev/include") + # (test_cc) heimdal uses librokens implementation of `secure_getenv` on darwin, + # which expects either USER or LOGNAME to be set. + preCheck = lib.optionalString (stdenv.isDarwin) '' + export USER=nix-builder ''; # We need to build hcrypt for applications like samba @@ -71,15 +146,12 @@ stdenv.mkDerivation rec { (cd include/hcrypto; make -j $NIX_BUILD_CORES install) (cd lib/hcrypto; make -j $NIX_BUILD_CORES install) - # Do we need it? - rm $out/bin/su - mkdir -p $dev/bin mv $out/bin/krb5-config $dev/bin/ # asn1 compilers, move them to $dev - mv $out/libexec/heimdal/heimdal/* $dev/bin - rmdir $out/libexec/heimdal/heimdal + mv $out/libexec/heimdal/* $dev/bin + rmdir $out/libexec/heimdal # compile_et is needed for cross-compiling this package and samba mv lib/com_err/.libs/compile_et $dev/bin @@ -90,11 +162,17 @@ stdenv.mkDerivation rec { # hx_locl.h:67:25: fatal error: pkcs10_asn1.h: No such file or directory #enableParallelBuilding = true; + passthru = { + implementation = "heimdal"; + tests.nixos = nixosTests.kerberos.heimdal; + }; + meta = with lib; { + homepage = "https://www.heimdal.software"; + changelog = "https://github.com/heimdal/heimdal/releases"; description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; platforms = platforms.unix; + maintainers = with maintainers; [ h7x4 ]; }; - - passthru.implementation = "heimdal"; } diff --git a/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/nixpkgs/pkgs/development/libraries/kpmcore/default.nix deleted file mode 100644 index 260a94e06ade..000000000000 --- a/nixpkgs/pkgs/development/libraries/kpmcore/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, lib -, fetchurl -, extra-cmake-modules -, qca-qt5 -, kauth -, kio -, polkit-qt -, util-linux -}: - -stdenv.mkDerivation rec { - pname = "kpmcore"; - # NOTE: When changing this version, also change the version of `partition-manager`. - version = "23.04.1"; - - src = fetchurl { - url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-NFIq8CZwYvpqDOOYLlBqoGdgfNPsyf15FkB3dToDCB8="; - }; - - patches = [ - ./nixostrustedprefix.patch - ]; - - nativeBuildInputs = [ extra-cmake-modules ]; - - buildInputs = [ - qca-qt5 - kauth - kio - polkit-qt - - util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat) - ]; - - dontWrapQtApps = true; - - preConfigure = '' - substituteInPlace src/util/CMakeLists.txt \ - --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions - substituteInPlace src/backend/corebackend.cpp \ - --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy - ''; - - meta = with lib; { - description = "KDE Partition Manager core library"; - homepage = "https://invent.kde.org/system/kpmcore"; - license = with licenses; [ cc-by-40 cc0 gpl3Plus mit ]; - maintainers = with maintainers; [ peterhoeg oxalica ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch b/nixpkgs/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch deleted file mode 100644 index cb1eb68364dd..000000000000 --- a/nixpkgs/pkgs/development/libraries/kpmcore/nixostrustedprefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp -index a879c8d..3d7863b 100644 ---- a/src/util/externalcommandhelper.cpp -+++ b/src/util/externalcommandhelper.cpp -@@ -387,7 +387,7 @@ QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStr - if (dirname == QStringLiteral("bin") || dirname == QStringLiteral("sbin")) { - prefix.cdUp(); - } -- if (trustedPrefixes.find(prefix.path()) == trustedPrefixes.end()) { // TODO: C++20: replace with contains -+ if (!prefix.path().startsWith(QStringLiteral("/nix/store")) && !prefix.path().startsWith(QStringLiteral("/run/current-system/sw"))) { // TODO: C++20: replace with contains - qInfo() << prefix.path() << "prefix is not one of the trusted command prefixes"; - reply[QStringLiteral("success")] = false; - return reply; diff --git a/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix b/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix index 7b81d8ca7c63..cd43904a123e 100644 --- a/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix +++ b/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix @@ -1,10 +1,12 @@ { lib -, mkDerivation +, stdenv , fetchFromGitLab , extra-cmake-modules +, qtbase +, qtdeclarative }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kquickimageeditor"; version = "0.3.0"; @@ -17,6 +19,9 @@ mkDerivation rec { }; nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase qtdeclarative ]; + cmakeFlags = ["-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}"]; + dontWrapQtApps = true; meta = with lib; { description = "Set of QtQuick components providing basic image editing capabilities"; diff --git a/nixpkgs/pkgs/development/libraries/lame/default.nix b/nixpkgs/pkgs/development/libraries/lame/default.nix index bdc173507c05..576d166f0ca7 100644 --- a/nixpkgs/pkgs/development/libraries/lame/default.nix +++ b/nixpkgs/pkgs/development/libraries/lame/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; + mainProgram = "lame"; }; } diff --git a/nixpkgs/pkgs/development/libraries/lcms2/default.nix b/nixpkgs/pkgs/development/libraries/lcms2/default.nix index e1f6c3d2212c..ab984884073a 100644 --- a/nixpkgs/pkgs/development/libraries/lcms2/default.nix +++ b/nixpkgs/pkgs/development/libraries/lcms2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lcms2"; - version = "2.15"; + version = "2.16"; src = fetchurl { url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; - sha256 = "sha256-sgy8vQ9QNDO+Kk6BRiEG+mEFCjUHTcJKTjVnktlxqzk="; + hash = "sha256-2HPTSti5tM6gEGMfGmIo0gh0deTcXnY+uBrMI9nUWlE="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/libao/default.nix b/nixpkgs/pkgs/development/libraries/libao/default.nix index 4a07ba9da7d8..63cb0401aae4 100644 --- a/nixpkgs/pkgs/development/libraries/libao/default.nix +++ b/nixpkgs/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsa-lib, libcap +{ stdenv, lib, fetchFromGitHub, fetchpatch +, autoreconfHook, pkg-config, libpulseaudio, alsa-lib, libcap , CoreAudio, CoreServices, AudioUnit , usePulseAudio }: @@ -14,6 +15,15 @@ stdenv.mkDerivation rec { sha256 = "0svgk4sc9kdhcsfyvbvgm5vpbg3sfr6z5rliflrw49v3x2i4vxq5"; }; + patches = [ + # add header time.h for nanosecond + (fetchpatch { + name = "nanosecond-header.patch"; + url = "https://github.com/xiph/libao/commit/1f998f5d6d77674dad01b181811638578ad68242.patch"; + hash = "sha256-cvlyhQq1YS4pVya44LfsKD1R6iSOONsHJGRbP5LlanQ="; + }) + ]; + configureFlags = [ "--disable-broken-oss" "--enable-alsa-mmap" diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 826dc544a88f..78aac8754787 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.7.1"; + version = "3.8.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - hash = "sha256-v2SBiDE4zZe3LMrlo/tP9GzmG/PJZ42rKi1svKJR6ZA="; + hash = "sha256-JxMz+XnjmUvk8TlTqdU2HP1Gq3bXfcLkXp5AEv9+7hM="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/development/libraries/libaom/outputs.patch b/nixpkgs/pkgs/development/libraries/libaom/outputs.patch index bbf660aaa5c9..7b34338403f2 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/outputs.patch +++ b/nixpkgs/pkgs/development/libraries/libaom/outputs.patch @@ -43,7 +43,7 @@ index e8fff2e77..b8a73aad4 100644 - "CMAKE_INSTALL_LIBDIR" "CMAKE_PROJECT_NAME" + "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_FULL_INCLUDEDIR" + "CMAKE_INSTALL_FULL_LIBDIR" "CMAKE_PROJECT_NAME" - "CONFIG_MULTITHREAD" "HAVE_PTHREAD_H") + "CONFIG_MULTITHREAD") foreach(arg ${REQUIRED_ARGS}) @@ -35,15 +35,15 @@ else() diff --git a/nixpkgs/pkgs/development/libraries/libavif/default.nix b/nixpkgs/pkgs/development/libraries/libavif/default.nix index 02e069a35290..2cb7920cb5f9 100644 --- a/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "libavif"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ku0UgVBba1tHBzHjx5yf9hRAtbmXf2n4gEdAaGr3qTY="; + hash = "sha256-0MLr9wdIs3c4pOAF4rlC8QNQXlrK3YGXILS9foVKfVM="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix b/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix index 216e05f6709c..439cc45031f9 100644 --- a/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/libayatana-common/default.nix @@ -4,11 +4,11 @@ , gitUpdater , testers , cmake -, cmake-extras , glib , gobject-introspection , gtest , intltool +, lomiri , pkg-config , systemd , vala @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Queries via pkg_get_variable, can't override prefix substituteInPlace data/CMakeLists.txt \ - --replace 'DESTINATION "''${SYSTEMD_USER_UNIT_DIR}"' 'DESTINATION "${placeholder "out"}/lib/systemd/user"' + --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir)' 'set(SYSTEMD_USER_UNIT_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' ''; strictDeps = true; @@ -42,8 +42,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cmake-extras + lomiri.cmake-extras glib + lomiri.lomiri-url-dispatcher systemd ]; @@ -53,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" - "-DENABLE_LOMIRI_FEATURES=OFF" + "-DENABLE_LOMIRI_FEATURES=ON" "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index 2fb83097c02a..d0a9092f6898 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -30,6 +30,10 @@ }: let + gl_rpath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + ]; + rpath = lib.makeLibraryPath [ glib nss @@ -92,7 +96,11 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ $out/share/cef/ cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ cp ../Release/libcef.so $out/lib/ + cp ../Release/libEGL.so $out/lib/ + cp ../Release/libGLESv2.so $out/lib/ patchelf --set-rpath "${rpath}" $out/lib/libcef.so + patchelf --set-rpath "${gl_rpath}" $out/lib/libEGL.so + patchelf --set-rpath "${gl_rpath}" $out/lib/libGLESv2.so cp ../Release/*.bin $out/share/cef/ cp -r ../Resources/* $out/share/cef/ cp -r ../include $out/ diff --git a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix index 8614bc4fee05..64351a85a9ae 100644 --- a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-XtD46tEV6RU1xbQgGA/nP6zWMgnZkOffVPdl8t/hIiA="; + hash = "sha256-XTfe0NqDQWx4ISgEiUbzACH9csaG+IrUvwss07dnz80="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix index de366da98b96..6259fa5b4839 100644 --- a/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook +, cmake , pkg-config , callPackage @@ -14,17 +14,17 @@ }: stdenv.mkDerivation (finalAttrs: rec { - version = "1.0.14"; + version = "1.0.15"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "refs/tags/v${version}"; - hash = "sha256-aZRtF4wYWxi/6ORNu7yVxFFdkvJTvBwPinL5lC0Mlqg="; + hash = "sha256-guiLM4RNe5O0qpeCoQUbs1Z7j0wp8iK9za2+6NIB8yY="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libdex/default.nix b/nixpkgs/pkgs/development/libraries/libdex/default.nix index b5a1ecac0af0..eea5417ee57e 100644 --- a/nixpkgs/pkgs/development/libraries/libdex/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdex/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "libdex"; - version = "0.4.1"; + version = "0.4.3"; outputs = [ "out" "dev" "devdoc" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libdex"; rev = version; - sha256 = "e2Q3KhdMqvMeVVZZKQfVoc3BqbOcUYEnBBG24FJRI1k="; + sha256 = "0GNlgJgAOE3JGwu/6Zsh4sjFapA7nUcGD3lgZZJ0BfQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix index a7ead8f22747..5cb8f2cbad8e 100644 --- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.118"; + version = "2.4.119"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-p3e9hfK1/JxX+IbIIFgwBXgxfK/bx30Kdp1+mpVnq4g="; + hash = "sha256-CknxLwm1tuaOqq/z8Cynz/mqkmk5shLTQxYdPorFYpE="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix index 0f96083100c2..006933a4de03 100644 --- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix @@ -1,8 +1,12 @@ -{ callPackage, zlib }: +{ callPackage +, zlib +, zstd +}: + callPackage ./common.nix rec { - version = "0.4.2"; + version = "0.9.0"; url = "https://www.prevanders.net/libdwarf-${version}.tar.xz"; - hash = "sha512-bSo+vwEENi3Zzs7CcpNWhPl32xGYEO6g7siMn1agQvJgpPbtO7q96Fkv4W+Yy9gbSrKHgAUUDgXI9HXfY4DRwg=="; - buildInputs = [ zlib ]; + hash = "sha512-KC2Q38nacE62SkuhFB8q5mD+6xS78acjdzhmmOMSSSi0SmkU2OiOYUGrCINc5yOtCQqFOtV9vLQ527pXJV+1iQ=="; + buildInputs = [ zlib zstd ]; knownVulnerabilities = []; } diff --git a/nixpkgs/pkgs/development/libraries/libe57format/default.nix b/nixpkgs/pkgs/development/libraries/libe57format/default.nix index fe5558681fff..cbbdd4dcc026 100644 --- a/nixpkgs/pkgs/development/libraries/libe57format/default.nix +++ b/nixpkgs/pkgs/development/libraries/libe57format/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-4vVhKrCxnWO106DSAk+xxo4uk6zC89m9VQAPaDJ8Ed4="; }) ]; + CXXFLAGS = [ + # GCC 13: error: 'int16_t' has not been declared in 'std' + "-include cstdint" + ]; nativeBuildInputs = [ cmake diff --git a/nixpkgs/pkgs/development/libraries/libedit/default.nix b/nixpkgs/pkgs/development/libraries/libedit/default.nix index f0eb267b05b5..d8c7be41f4a1 100644 --- a/nixpkgs/pkgs/development/libraries/libedit/default.nix +++ b/nixpkgs/pkgs/development/libraries/libedit/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { # There is a DR to fix this issue with Clang which is not merged # yet. # https://reviews.llvm.org/D137043 - NIX_CFLAGS_COMPILE = lib.optional - (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) - "-D__STDC_ISO_10646__=201103L"; + env.NIX_CFLAGS_COMPILE = + lib.optionalString (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) + "-D__STDC_ISO_10646__=201103L"; patches = [ ./01-cygwin.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/libei/default.nix b/nixpkgs/pkgs/development/libraries/libei/default.nix index b216cd231c22..3b687fcd8edc 100644 --- a/nixpkgs/pkgs/development/libraries/libei/default.nix +++ b/nixpkgs/pkgs/development/libraries/libei/default.nix @@ -11,7 +11,6 @@ , protobuf , protobufc , python3 -, python3Packages , systemd }: let @@ -42,19 +41,18 @@ stdenv.mkDerivation rec { systemd ]; nativeBuildInputs = [ - attr meson ninja pkg-config - python3 - ] ++ - (with python3Packages; [ - jinja2 - pytest - python-dbusmock - strenum - structlog - ]); + (python3.withPackages(ps: with ps; [ + attrs + jinja2 + pytest + python-dbusmock + strenum + structlog + ])) + ]; postPatch = '' ln -s "${munit}" ./subprojects/munit diff --git a/nixpkgs/pkgs/development/libraries/libelf/default.nix b/nixpkgs/pkgs/development/libraries/libelf/default.nix index 0a1a7175296e..fdfa4fda0def 100644 --- a/nixpkgs/pkgs/development/libraries/libelf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libelf/default.nix @@ -2,11 +2,6 @@ , fetchurl, autoreconfHook, gettext, freebsd, netbsd }: -# Note: this package is used for bootstrapping fetchurl, and thus -# cannot use fetchpatch! All mutable patches (generated by GitHub or -# cgit) that are needed here should be included directly in Nixpkgs as -# files. - stdenv.mkDerivation rec { pname = "libelf"; version = "0.8.13"; @@ -52,18 +47,10 @@ stdenv.mkDerivation rec { (if stdenv.hostPlatform.isFreeBSD then [ freebsd.gencat ] else if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ]) - # Need to regenerate configure script with newer version in order to pass - # "mr_cv_target_elf=yes" and determine integer sizes correctly when - # cross-compiling, but `autoreconfHook` brings in `makeWrapper` which - # doesn't work with the bootstrapTools bash, so can only do this for - # cross builds when `stdenv.shell` is a newer bash. - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform # The provided `configure` script fails on clang 16 because some tests have a `main` # returning an implicit `int`, which clang 16 treats as an error. Running `autoreconf` fixes # the test and allows `configure` to detect clang properly. - # This is done only for clang on Darwin because the Darwin stdenv bootstrap does not use - # libelf, so should be safe because it will always be run with a compatible version of bash. - || (stdenv.cc.isClang && stdenv.isDarwin)) autoreconfHook; + ++ [ autoreconfHook ]; meta = { description = "ELF object file access library"; diff --git a/nixpkgs/pkgs/development/libraries/libewf/default.nix b/nixpkgs/pkgs/development/libraries/libewf/default.nix index 101f8f16a3f4..dffacc7d276c 100644 --- a/nixpkgs/pkgs/development/libraries/libewf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libewf/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl libuuid ] ++ lib.optionals stdenv.isDarwin [ bzip2 ]; + # cannot run test program while cross compiling + configureFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "ac_cv_openssl_xts_duplicate_keys=yes" + ]; + meta = { description = "Library for support of the Expert Witness Compression Format"; homepage = "https://sourceforge.net/projects/libewf/"; diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/1.8.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/1.8.nix index 1cbbafe40319..2f0f3b4fd019 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/1.8.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/1.8.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; knownVulnerabilities = [ - "CVE-2018-12437" # CVE is about LibTomCrypt + "CVE-2021-40528" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 28cee5c7dfd6..3605d48a2fd1 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' ''; + enableParallelBuilding = true; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' @@ -66,6 +68,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; + enableParallelChecking = true; passthru.tests = { inherit gnupg libotr rsyslog; diff --git a/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix b/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix index edfd21a46968..e63d7f8fe656 100644 --- a/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgnome-games-support/default.nix @@ -2,7 +2,6 @@ , fetchurl , pkg-config , glib -, gobject-introspection , gtk3 , libgee , gettext @@ -24,7 +23,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext - gobject-introspection meson ninja pkg-config diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index 000649100313..a229bb1fef08 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , openssl @@ -26,6 +27,16 @@ stdenv.mkDerivation rec { hash = "sha256-mIsB+EaGJlGMOpz3OLrs0nAmhOY1BwMs83saFBaejwc="; }; + patches = [ + # Pull upstream fix for clang-16 and upcoming gcc-14 support: + # https://github.com/libimobiledevice/libimobiledevice/pull/1444 + (fetchpatch { + name = "usleep-decl.patch"; + url = "https://github.com/libimobiledevice/libimobiledevice/commit/db623184c0aa09c27697f5a2e81025db223075d5.patch"; + hash = "sha256-TgdgBkEDXzQDSgJxcZc+pZncfmBVXarhHOByGFs6p0Q="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/nixpkgs/pkgs/development/libraries/libjcat/default.nix index 1a6080b19ded..bbcae6ab19d1 100644 --- a/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.14"; + version = "0.2.0"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-XN7/ZtWCCO7lSspXM4vNowoWN1U0NGQPUTM9KjTEHjY="; + sha256 = "sha256-nLn2s9hX9f6I1Avxzs24ZPQHglJqKSUTpBpwskVyJKw="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libjodycode/default.nix b/nixpkgs/pkgs/development/libraries/libjodycode/default.nix new file mode 100644 index 000000000000..2a99ed5feca3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libjodycode/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitea +}: + +stdenv.mkDerivation rec { + pname = "libjodycode"; + version = "3.1"; + + outputs = [ "out" "man" "dev" ]; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "jbruchon"; + repo = "libjodycode"; + rev = "v${version}"; + hash = "sha256-uhWQh5YwLwYRm34nY5HvcEepqlTSDt9s3PSoD403kQM="; + }; + + env.PREFIX = placeholder "out"; + + meta = with lib; { + description = "Shared code used by several utilities written by Jody Bruchon"; + homepage = "https://github.com/jbruchon/libjodycode"; + changelog = "https://github.com/jbruchon/libjodycode/blob/${src.rev}/CHANGES.txt"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix index aaa481e8fd5d..d161ff362bcb 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libjpeg"; - version = "9e"; + version = "9f"; src = fetchurl { url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-QHfWpqda6wGIT3CJGdJZNMkzBeSffj8225EpMg5vTz0="; + sha256 = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls="; }; configureFlags = lib.optional static "--enable-static --disable-shared"; diff --git a/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 9be574e9eaa0..820f466d8447 100644 --- a/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -117,7 +117,6 @@ stdenv.mkDerivation rec { "-DJPEGXL_FORCE_NEON=ON" ]; - LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; CXXFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-mfp16-format=ieee"; # FIXME x86_64-darwin: diff --git a/nixpkgs/pkgs/development/libraries/libkcapi/default.nix b/nixpkgs/pkgs/development/libraries/libkcapi/default.nix index bee1ac93598c..93405b1f9e3b 100644 --- a/nixpkgs/pkgs/development/libraries/libkcapi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libkcapi/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libkcapi"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "libkcapi"; rev = "v${version}"; - hash = "sha256-G/4G8179Gc8RfQfQImOCsBC8WXKK7jQJfUSXm0hYLJ0="; + hash = "sha256-xOI29cjhUGUeHLaYIrPA5ZwwCE9lBdZG6kaW0lo1uL8="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix index efd914ca7b10..0988bb9259d7 100644 --- a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gtk-doc, gettext +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, gtk-doc, gettext , pkg-config, glib, libxml2, gobject-introspection, gnome-common, unzip }: @@ -23,6 +23,20 @@ stdenv.mkDerivation rec { sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm"; }; + patches = [ + # Pull upstream fix for gcc-13 build compatibility + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://bitbucket.org/tagoh/liblangtag/commits/0b6e9f4616a34146e7443c4e9a7197153645e40b/raw"; + hash = "sha256-69wJDVwDCP5OPHKoRn9WZNrvfCvmlX3SwtRmcpJHn2o="; + }) + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://bitbucket.org/tagoh/liblangtag/commits/1497c4477d0fa0b7df1886951b953dd3cea54427/raw"; + hash = "sha256-k0Uaeg6YLxVze4fgf0kiyuiZJ5wh2Jq3h7cFPQPtwyo="; + }) + ]; + postPatch = '' gtkdocize cp "${core_zip}" data/core.zip diff --git a/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix b/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix index 3e7a2f1a0ba0..14a6cc16c837 100644 --- a/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, neon, libdiscid, libxml2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, neon, libdiscid, libxml2, pkg-config }: stdenv.mkDerivation rec { version = "5.1.0"; @@ -14,6 +14,18 @@ stdenv.mkDerivation rec { rev = "release-${version}"; }; + patches = [ + # Fix build with libxml2 2.12 + (fetchpatch { + url = "https://github.com/metabrainz/libmusicbrainz/commit/9ba00067a15479a52262a5126bcb6889da5884b7.patch"; + hash = "sha256-4VxTohLpjUNnNZGIoRpBjUz71mLP3blg4oFL7itnJnY="; + }) + (fetchpatch { + url = "https://github.com/metabrainz/libmusicbrainz/commit/558c9ba0e6d702d5c877f75be98176f57abf1b02.patch"; + hash = "sha256-hKYY4BJLh/Real3NugLwzc4gPBQ3NB/F63iI/aV8Wh8="; + }) + ]; + dontUseCmakeBuildDir=true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/liboqs/default.nix b/nixpkgs/pkgs/development/libraries/liboqs/default.nix index c2a0216a34e1..4962f9459d79 100644 --- a/nixpkgs/pkgs/development/libraries/liboqs/default.nix +++ b/nixpkgs/pkgs/development/libraries/liboqs/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-h3mXoGRYgPg0wKQ1u6uFP7wlEUMQd5uIBt4Hr7vjNtA="; }; + patches = [ ./fix-openssl-detection.patch ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/liboqs/fix-openssl-detection.patch b/nixpkgs/pkgs/development/libraries/liboqs/fix-openssl-detection.patch new file mode 100644 index 000000000000..33be7188370f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/liboqs/fix-openssl-detection.patch @@ -0,0 +1,36 @@ +From 6bdcf53de74ac2afba42deea63522939ca51f871 Mon Sep 17 00:00:00 2001 +From: Raphael Robatsch <raphael-git@tapesoftware.net> +Date: Mon, 25 Dec 2023 16:15:29 +0000 +Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR. + +CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR +forcibly to "/usr" breaks this. +--- + CMakeLists.txt | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 288bcbe8..9750fae6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake) + include(.CMake/alg_support.cmake) + + if(${OQS_USE_OPENSSL}) +- if(NOT DEFINED OPENSSL_ROOT_DIR) +- if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") +- if(EXISTS "/usr/local/opt/openssl@1.1") +- set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1") +- elseif(EXISTS "/opt/homebrew/opt/openssl@1.1") +- set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1") +- endif() +- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") +- set(OPENSSL_ROOT_DIR "/usr") +- endif() +- endif() + find_package(OpenSSL 1.1.1 REQUIRED) + endif() + +-- +2.42.0 + diff --git a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index 3fe89f891f8c..498f26a7caf0 100644 --- a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -61,6 +61,12 @@ stdenv.mkDerivation rec { src = ./osinfo-db-data-dir.patch; osinfo_db_data_dir = "${osinfo-db}/share"; }) + + # Fix build with libxml 2.12 + (fetchpatch { + url = "https://gitlab.com/libosinfo/libosinfo/-/commit/5bbdd06503456784c5ffa22409e8bab50470d673.patch"; + hash = "sha256-KqgHXI+lD5VYp2wtA58Drp15TgNK1O3xCaYBy4/B9wc="; + }) ]; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libpanel/default.nix b/nixpkgs/pkgs/development/libraries/libpanel/default.nix index c5b325cb8217..a4f8e71eba2e 100644 --- a/nixpkgs/pkgs/development/libraries/libpanel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpanel/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "libpanel"; - version = "1.4.0"; + version = "1.4.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "gPFD2QDoztj/hPqG/jTra0gyPLYQvPtoWOpl2LmPFSw="; + sha256 = "mEENAOc0hX7N8zuaIN17D7ONi20x1Dabr8HGc5Krud4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix b/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix index 2b3bd0bc5797..38e4fe055085 100644 --- a/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/libpeas/2.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, substituteAll , pkg-config , gi-docgen , gobject-introspection @@ -16,15 +17,25 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "2.0.0"; + version = "2.0.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-VAesvAwS95D3DJ0rmCJKzBvjrEScYGA7gZLKAgtJcBE="; + hash = "sha256-ndwdUfOGY9pN9SFjBRt7LOo6JCz67p9afhQPB4TIqnc="; }; + patches = [ + # Make PyGObject’s gi library available. + (substituteAll { + src = ./fix-paths.patch; + pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ + python3.pkgs.pygobject3 + ]; + }) + ]; + depsBuildBuild = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libpeas/default.nix b/nixpkgs/pkgs/development/libraries/libpeas/default.nix index 70d33d86ad19..f0b6023117d9 100644 --- a/nixpkgs/pkgs/development/libraries/libpeas/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpeas/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, substituteAll , meson , ninja , pkg-config @@ -12,6 +13,7 @@ , gobject-introspection , python3 , ncurses +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -25,6 +27,16 @@ stdenv.mkDerivation rec { sha256 = "KXy5wszNjoYXYj0aPoQVtFMLjlqJPjUnu/0e3RMje0w="; }; + patches = [ + # Make PyGObject’s gi library available. + (substituteAll { + src = ./fix-paths.patch; + pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ + python3.pkgs.pygobject3 + ]; + }) + ]; + depsBuildBuild = [ pkg-config ]; @@ -36,6 +48,7 @@ stdenv.mkDerivation rec { gettext gi-docgen gobject-introspection + wrapGAppsHook ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libpeas/fix-paths.patch b/nixpkgs/pkgs/development/libraries/libpeas/fix-paths.patch new file mode 100644 index 000000000000..c54cdd8873f5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libpeas/fix-paths.patch @@ -0,0 +1,14 @@ +diff --git a/loaders/python/peas-plugin-loader-python.c b/loaders/python/peas-plugin-loader-python.c +index 26edbf3..0d65ada 100644 +--- a/loaders/python/peas-plugin-loader-python.c ++++ b/loaders/python/peas-plugin-loader-python.c +@@ -248,6 +248,9 @@ peas_plugin_loader_python_initialize (PeasPluginLoader *loader) + goto python_init_error; + } + ++ /* Add PyGObject to path */ ++ PyRun_SimpleString("import site; import functools; functools.reduce(lambda k, p: site.addsitedir(p, k), [@pythonPaths@], site._init_pathinfo())"); ++ + /* Initialize PyGObject */ + pygobject_init (PYGOBJECT_MAJOR_VERSION, + PYGOBJECT_MINOR_VERSION, diff --git a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix index e74c0b781055..ad7043e064e3 100644 --- a/nixpkgs/pkgs/development/libraries/libpg_query/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "16-5.0.0"; + version = "16-5.1.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - hash = "sha256-nO4ZqjEpQqmIZcsrhayGhjD4HKUBD1tEZg/khmdgK68="; + hash = "sha256-X48wjKdgkAc4wUubQ5ip1zZYiCKzQJyQTgGvO/pOY3I="; }; nativeBuildInputs = [ which ]; diff --git a/nixpkgs/pkgs/development/libraries/libphonenumber/build-reproducibility.patch b/nixpkgs/pkgs/development/libraries/libphonenumber/build-reproducibility.patch index 202370a80fc5..137c9045c77d 100644 --- a/nixpkgs/pkgs/development/libraries/libphonenumber/build-reproducibility.patch +++ b/nixpkgs/pkgs/development/libraries/libphonenumber/build-reproducibility.patch @@ -1,8 +1,6 @@ -diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc -index 205947e831..1e628e2cd2 100644 ---- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc -+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc -@@ -97,7 +97,8 @@ class DirEntry { +--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc.orig 1970-01-01 01:00:01.000000000 +0100 ++++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc 2024-01-16 19:03:45.409089423 +0100 +@@ -94,7 +94,8 @@ DirEntryKinds kind_; }; @@ -12,13 +10,19 @@ index 205947e831..1e628e2cd2 100644 // success. bool ListDirectory(const string& path, vector<DirEntry>* entries) { entries->clear(); -@@ -135,6 +136,9 @@ bool ListDirectory(const string& path, vector<DirEntry>* entries) { +@@ -114,8 +115,14 @@ + // http://pubs.opengroup.org/onlinepubs/9699919799/functions/readdir.html + errno = 0; + entry = readdir(dir); ++ if (errno != 0) { ++ return false; ++ } + if (entry == NULL) { +- return errno == 0; ++ std::sort( ++ entries->begin(), entries->end(), ++ [](const DirEntry& a, const DirEntry& b) { return a.name() < b.name(); }); ++ return true; } - entries->push_back(DirEntry(entry->d_name, kind)); - } -+ std::sort( -+ entries->begin(), entries->end(), -+ [](const DirEntry& a, const DirEntry& b) { return a.name() < b.name(); }); - } - - // Returns true if s ends with suffix. + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) { + continue; diff --git a/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix b/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix index a9b0df3304be..edd337961727 100644 --- a/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix +++ b/nixpkgs/pkgs/development/libraries/libphonenumber/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu, Foundation, buildPackages }: stdenv.mkDerivation rec { - pname = "phonenumber"; + pname = "libphonenumber"; version = "8.12.37"; src = fetchFromGitHub { @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; patches = [ - # Submitted upstream: https://github.com/google/libphonenumber/pull/2921 + # An earlier version of this patch was submitted upstream but did not get + # any interest there - https://github.com/google/libphonenumber/pull/2921 ./build-reproducibility.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/libqaccessibilityclient/default.nix b/nixpkgs/pkgs/development/libraries/libqaccessibilityclient/default.nix index 1977a62f5c09..e05400114d06 100644 --- a/nixpkgs/pkgs/development/libraries/libqaccessibilityclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqaccessibilityclient/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { pname = "libqaccessibilityclient"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { url = "mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-${version}.tar.xz"; - sha256 = "sha256-HHaLT0MU/K4qB8t958sq4FIrXwK0Fzrz7ti/sqTYNCk="; + hash = "sha256-cEdyVDo7AFuUBhpT6vn51klE5oGLBMWcD7ClA8gaxKA="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ qtbase ]; + cmakeFlags = ["-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}"]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/nixpkgs/pkgs/development/libraries/libquotient/default.nix index e154ab8eafe2..b461a3c07864 100644 --- a/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, olm, openssl, qtbase, qtmultimedia, qtkeychain }: -stdenv.mkDerivation rec { +let + isQt6 = lib.versions.major qtbase.version == "6"; +in stdenv.mkDerivation rec { pname = "libquotient"; version = "0.8.1.2"; @@ -19,6 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQuotient_ENABLE_E2EE=ON" + (lib.cmakeBool "BUILD_WITH_QT6" isQt6) ]; # https://github.com/quotient-im/libQuotient/issues/551 diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 9a127fcd92ad..fe35759da63a 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -44,6 +44,12 @@ stdenv.mkDerivation rec { patches = [ ./py_pybind11_no_external_download.patch ./install-presets.patch + # https://github.com/IntelRealSense/librealsense/pull/11917 + (fetchpatch { + name = "fix-gcc13-missing-cstdint.patch"; + url = "https://github.com/IntelRealSense/librealsense/commit/b59b13671658910fc453a4a6bbd61f13ba6e83cc.patch"; + hash = "sha256-zaW8HG8rfsApI5S/3x+x9Fx8xhyTIPNn/fJVFtkmlEA="; + }) ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libremidi/default.nix b/nixpkgs/pkgs/development/libraries/libremidi/default.nix index d88ebeea3fb5..753bcef433fd 100644 --- a/nixpkgs/pkgs/development/libraries/libremidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libremidi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A modern C++ MIDI real-time & file I/O library"; homepage = "https://github.com/jcelerier/libremidi"; - maintainers = [ lib.maintainers.paveloom ]; + maintainers = [ ]; license = lib.licenses.bsd2; platforms = lib.platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix index 613f7d3a2b34..740d84072d1e 100644 --- a/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -87,6 +87,15 @@ let platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice fpletz ]; inherit knownVulnerabilities; + + # OpenBSD believes that PowerPC should be always-big-endian; + # this assumption seems to have propagated into recent + # releases of libressl. Since libressl is aliased to many + # other packages (e.g. netcat) it's important to fail early + # here, otherwise it's very difficult to figure out why + # libressl is getting dragged into a failing build. + badPlatforms = with lib.systems.inspect.patterns; + [ (lib.recursiveUpdate isPower64 isLittleEndian) ]; }; }; diff --git a/nixpkgs/pkgs/development/libraries/librist/darwin.patch b/nixpkgs/pkgs/development/libraries/librist/darwin.patch index f9571fd434f7..6a5cc8459a36 100644 --- a/nixpkgs/pkgs/development/libraries/librist/darwin.patch +++ b/nixpkgs/pkgs/development/libraries/librist/darwin.patch @@ -1,3 +1,5 @@ +diff --git a/tools/srp_shared.c b/tools/srp_shared.c +index f782126..23e82a5 100644 --- a/tools/srp_shared.c +++ b/tools/srp_shared.c @@ -173,7 +173,11 @@ void user_verifier_lookup(char * username, @@ -5,9 +7,9 @@ return; +#if defined(__APPLE__) -+ *generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; ++ *generation = ((uint64_t)buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; +#else - *generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; + *generation = ((uint64_t)buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; +#endif #endif diff --git a/nixpkgs/pkgs/development/libraries/librist/default.nix b/nixpkgs/pkgs/development/libraries/librist/default.nix index c88353090703..3f56ff324876 100644 --- a/nixpkgs/pkgs/development/libraries/librist/default.nix +++ b/nixpkgs/pkgs/development/libraries/librist/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "librist"; - version = "0.2.8"; + version = "0.2.10"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "rist"; repo = "librist"; rev = "v${version}"; - hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ="; + hash = "sha256-8N4wQXxjNZuNGx/c7WVAV5QS48Bff5G3t11UkihT+K0="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/nixpkgs/pkgs/development/libraries/librsvg/default.nix index e8658558f69a..415f097f3318 100644 --- a/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.57.0"; + version = "2.57.1"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-M1/i4MLL8be/BmhlEiSiPhNUUfCxeTzYE2Sb4r/6dOg="; + hash = "sha256-B0Zxo+1vvNZ8ripA5TkQf08JfKikqxqJTAXiUk/zQO8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-P8W4z/MwSpP0xqrxoVZPAip7ymdIUL2+uP88Q2Y3hVU="; + hash = "sha256-zICI7sps5KYe8/yWXbCJv529KxGLjoyDOmpCgVAIsTs="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; diff --git a/nixpkgs/pkgs/development/libraries/libsass/default.nix b/nixpkgs/pkgs/development/libraries/libsass/default.nix index 92f3853b5f71..57e58adb8c7e 100644 --- a/nixpkgs/pkgs/development/libraries/libsass/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsass/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook , testers + +# for passthru.tests +, gtk3 +, gtk4 +, sassc }: stdenv.mkDerivation (finalAttrs: { @@ -18,13 +27,24 @@ stdenv.mkDerivation (finalAttrs: { ''; }; + patches = [ + (fetchpatch { + name = "CVE-2022-26592.CVE-2022-43357.CVE-2022-43358.patch"; + url = "https://github.com/sass/libsass/pull/3184/commits/5bb0ea0c4b2ebebe542933f788ffacba459a717a.patch"; + hash = "sha256-DR6pKFWL70uJt//drzq34LeTzT8rUqgUTpgfUHpD2s4="; + }) + ]; + preConfigure = '' export LIBSASS_VERSION=${finalAttrs.version} ''; nativeBuildInputs = [ autoreconfHook ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru.tests = { + inherit gtk3 gtk4 sassc; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; meta = with lib; { description = "A C/C++ implementation of a Sass compiler"; diff --git a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index 954242d81fb4..e5a8f42940e0 100644 --- a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "sha256-2CkCQAQFzwBoV07z3B/l9ZJiB1Q7oa5vjnoVdjUdy9s="; + hash = "sha256-JIosik2bmFiqa69ScSw0r+/PnJ6Ut23OAsHJqiX7M3U="; }; outputs = [ "out" "lib" "dev" "man" "pythonsrc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 2818e27ae4cf..733fcafaf290 100644 --- a/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.21.1"; + version = "0.21.2"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Z09RMjpfdOTLfjJ32mi1r93TM+yiW8n9LYIKkpcvkLE="; + hash = "sha256-5KNBSWoIFeZMjTuPq6sz17rn796rd7hDZpcx1bGB3O4="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index fbfdc0b7ff0d..ba1b003442ff 100644 --- a/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , makeFontsConf , nix-update-script , testers @@ -19,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco="; + hash = "sha256-6Gbujz20EHQ7s9GaPpEPju+WqePjpduJqb5hcrswTm8="; }; outputs = [ @@ -35,26 +34,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Pull autoconf-2.72 compatibility fix: - # https://github.com/libsidplayfp/libsidplayfp/pull/103 - # Remove when version > 2.5.1 - (fetchpatch { - name = "0001-libsidplayfp-autoconf-2.72-compat.patch"; - url = "https://github.com/libsidplayfp/libsidplayfp/commit/2b1b41beb5099d5697e3f8416d78f27634732a9e.patch"; - hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8="; - }) - - # Fix --disable-tests logic - # https://github.com/libsidplayfp/libsidplayfp/pull/108 - # Remove when version > 2.5.1 - (fetchpatch { - name = "0002-libsidplayfp-Fix-autoconf-logic-for-tests-option.patch"; - url = "https://github.com/libsidplayfp/libsidplayfp/commit/39dd2893b6186c4932d17b529bb62627b742b742.patch"; - hash = "sha256-ErdfPvu8R81XxdHu2TaV87OpLFlRhJai51QcYUIkUZ4="; - }) - ]; - postPatch = '' patchShebangs . ''; diff --git a/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/nixpkgs/pkgs/development/libraries/libsodium/default.nix index 5ecd27f60078..4570b10db39c 100644 --- a/nixpkgs/pkgs/development/libraries/libsodium/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsodium/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch"; hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY="; }) - ] ++ lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; + ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libsodium/mingw-no-fortify.patch b/nixpkgs/pkgs/development/libraries/libsodium/mingw-no-fortify.patch deleted file mode 100644 index e13a801f8db7..000000000000 --- a/nixpkgs/pkgs/development/libraries/libsodium/mingw-no-fortify.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur libsodium-1.0.18-orig/configure.ac libsodium-1.0.18/configure.ac ---- libsodium-1.0.18-orig/configure.ac 2019-05-30 16:20:24.000000000 -0400 -+++ libsodium-1.0.18/configure.ac 2021-08-11 08:09:54.653907245 -0400 -@@ -217,11 +217,6 @@ - - AC_CHECK_DEFINE([__wasi__], [WASI="yes"], []) - --AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [ -- AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2], -- [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"]) --]) -- - AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], - [CFLAGS="$CFLAGS -fvisibility=hidden"]) - diff --git a/nixpkgs/pkgs/development/libraries/libssh/default.nix b/nixpkgs/pkgs/development/libraries/libssh/default.nix index 00cb7e042c97..15f8fab50889 100644 --- a/nixpkgs/pkgs/development/libraries/libssh/default.nix +++ b/nixpkgs/pkgs/development/libraries/libssh/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.10.5"; + version = "0.10.6"; src = fetchurl { - url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tg4v9/Nnue7itWNNOmMwPd/t4OahjfyojESodw5+QjQ="; + url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/libssh-${version}.tar.xz"; + hash = "sha256-GGHUmPW28XQbarxz5ghHhJHtz5ydS2Yw7vbnRZbencE="; }; # Do not split 'dev' output until lib/cmake/libssh/libssh-config.cmake diff --git a/nixpkgs/pkgs/development/libraries/libssh2/CVE-2023-48795.patch b/nixpkgs/pkgs/development/libraries/libssh2/CVE-2023-48795.patch new file mode 100644 index 000000000000..c89e4a137b72 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libssh2/CVE-2023-48795.patch @@ -0,0 +1,459 @@ +From d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a Mon Sep 17 00:00:00 2001 +From: Michael Buckley <michael@buckleyisms.com> +Date: Thu, 30 Nov 2023 15:08:02 -0800 +Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" + +Refs: +https://terrapin-attack.com/ +https://seclists.org/oss-sec/2023/q4/292 +https://osv.dev/list?ecosystem=&q=CVE-2023-48795 +https://github.com/advisories/GHSA-45x7-px36-x8w8 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-48795 + +Fixes #1290 +Closes #1291 +--- + src/kex.c | 63 +++++++++++++++++++++++------------ + src/libssh2_priv.h | 18 +++++++--- + src/packet.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- + src/packet.h | 2 +- + src/session.c | 3 ++ + src/transport.c | 12 ++++++- + 6 files changed, 149 insertions(+), 32 deletions(-) + +diff --git a/src/kex.c b/src/kex.c +index 8e7b7f0af3..a7b301e157 100644 +--- a/src/kex.c ++++ b/src/kex.c +@@ -3032,6 +3032,13 @@ kex_method_extension_negotiation = { + 0, + }; + ++static const LIBSSH2_KEX_METHOD ++kex_method_strict_client_extension = { ++ "kex-strict-c-v00@openssh.com", ++ NULL, ++ 0, ++}; ++ + static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { + #if LIBSSH2_ED25519 + &kex_method_ssh_curve25519_sha256, +@@ -3050,6 +3057,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { + &kex_method_diffie_helman_group1_sha1, + &kex_method_diffie_helman_group_exchange_sha1, + &kex_method_extension_negotiation, ++ &kex_method_strict_client_extension, + NULL + }; + +@@ -3302,13 +3310,13 @@ static int kexinit(LIBSSH2_SESSION * session) + return 0; + } + +-/* kex_agree_instr ++/* _libssh2_kex_agree_instr + * Kex specific variant of strstr() + * Needle must be preceded by BOL or ',', and followed by ',' or EOL + */ +-static unsigned char * +-kex_agree_instr(unsigned char *haystack, size_t haystack_len, +- const unsigned char *needle, size_t needle_len) ++unsigned char * ++_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len, ++ const unsigned char *needle, size_t needle_len) + { + unsigned char *s; + unsigned char *end_haystack; +@@ -3393,7 +3401,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, + while(s && *s) { + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); +- if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) { + const LIBSSH2_HOSTKEY_METHOD *method = + (const LIBSSH2_HOSTKEY_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3427,9 +3435,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, + } + + while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { +- s = kex_agree_instr(hostkey, hostkey_len, +- (unsigned char *) (*hostkeyp)->name, +- strlen((*hostkeyp)->name)); ++ s = _libssh2_kex_agree_instr(hostkey, hostkey_len, ++ (unsigned char *) (*hostkeyp)->name, ++ strlen((*hostkeyp)->name)); + if(s) { + /* So far so good, but does it suit our purposes? (Encrypting vs + Signing) */ +@@ -3463,6 +3471,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + { + const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; + unsigned char *s; ++ const unsigned char *strict = ++ (unsigned char *)"kex-strict-s-v00@openssh.com"; ++ ++ if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) { ++ session->kex_strict = 1; ++ } + + if(session->kex_prefs) { + s = (unsigned char *) session->kex_prefs; +@@ -3470,7 +3484,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + while(s && *s) { + unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); +- q = kex_agree_instr(kex, kex_len, s, method_len); ++ q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len); + if(q) { + const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3504,9 +3518,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, + } + + while(*kexp && (*kexp)->name) { +- s = kex_agree_instr(kex, kex_len, +- (unsigned char *) (*kexp)->name, +- strlen((*kexp)->name)); ++ s = _libssh2_kex_agree_instr(kex, kex_len, ++ (unsigned char *) (*kexp)->name, ++ strlen((*kexp)->name)); + if(s) { + /* We've agreed on a key exchange method, + * Can we agree on a hostkey that works with this kex? +@@ -3550,7 +3564,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(crypt, crypt_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) { + const LIBSSH2_CRYPT_METHOD *method = + (const LIBSSH2_CRYPT_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3572,9 +3586,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, + } + + while(*cryptp && (*cryptp)->name) { +- s = kex_agree_instr(crypt, crypt_len, +- (unsigned char *) (*cryptp)->name, +- strlen((*cryptp)->name)); ++ s = _libssh2_kex_agree_instr(crypt, crypt_len, ++ (unsigned char *) (*cryptp)->name, ++ strlen((*cryptp)->name)); + if(s) { + endpoint->crypt = *cryptp; + return 0; +@@ -3614,7 +3628,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(mac, mac_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) { + const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) + kex_get_method_by_name((char *) s, method_len, + (const LIBSSH2_COMMON_METHOD **) +@@ -3635,8 +3649,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, + } + + while(*macp && (*macp)->name) { +- s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name, +- strlen((*macp)->name)); ++ s = _libssh2_kex_agree_instr(mac, mac_len, ++ (unsigned char *) (*macp)->name, ++ strlen((*macp)->name)); + if(s) { + endpoint->mac = *macp; + return 0; +@@ -3667,7 +3682,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, + unsigned char *p = (unsigned char *) strchr((char *) s, ','); + size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); + +- if(kex_agree_instr(comp, comp_len, s, method_len)) { ++ if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) { + const LIBSSH2_COMP_METHOD *method = + (const LIBSSH2_COMP_METHOD *) + kex_get_method_by_name((char *) s, method_len, +@@ -3689,8 +3704,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, + } + + while(*compp && (*compp)->name) { +- s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name, +- strlen((*compp)->name)); ++ s = _libssh2_kex_agree_instr(comp, comp_len, ++ (unsigned char *) (*compp)->name, ++ strlen((*compp)->name)); + if(s) { + endpoint->comp = *compp; + return 0; +@@ -3871,6 +3887,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->local.kexinit = key_state->oldlocal; + session->local.kexinit_len = key_state->oldlocal_len; + key_state->state = libssh2_NB_state_idle; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + return -1; +@@ -3896,6 +3913,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->local.kexinit = key_state->oldlocal; + session->local.kexinit_len = key_state->oldlocal_len; + key_state->state = libssh2_NB_state_idle; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + return -1; +@@ -3944,6 +3962,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + session->remote.kexinit = NULL; + } + ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + +diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h +index 7660366954..18d9ab2130 100644 +--- a/src/libssh2_priv.h ++++ b/src/libssh2_priv.h +@@ -736,6 +736,9 @@ struct _LIBSSH2_SESSION + /* key signing algorithm preferences -- NULL yields server order */ + char *sign_algo_prefs; + ++ /* Whether to use the OpenSSH Strict KEX extension */ ++ int kex_strict; ++ + /* (remote as source of data -- packet_read ) */ + libssh2_endpoint_data remote; + +@@ -908,6 +911,7 @@ struct _LIBSSH2_SESSION + int fullpacket_macstate; + size_t fullpacket_payload_len; + int fullpacket_packet_type; ++ uint32_t fullpacket_required_type; + + /* State variables used in libssh2_sftp_init() */ + libssh2_nonblocking_states sftpInit_state; +@@ -948,10 +952,11 @@ struct _LIBSSH2_SESSION + }; + + /* session.state bits */ +-#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000001 +-#define LIBSSH2_STATE_NEWKEYS 0x00000002 +-#define LIBSSH2_STATE_AUTHENTICATED 0x00000004 +-#define LIBSSH2_STATE_KEX_ACTIVE 0x00000008 ++#define LIBSSH2_STATE_INITIAL_KEX 0x00000001 ++#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000002 ++#define LIBSSH2_STATE_NEWKEYS 0x00000004 ++#define LIBSSH2_STATE_AUTHENTICATED 0x00000008 ++#define LIBSSH2_STATE_KEX_ACTIVE 0x00000010 + + /* session.flag helpers */ + #ifdef MSG_NOSIGNAL +@@ -1182,6 +1187,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, + int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, + key_exchange_state_t * state); + ++unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack, ++ size_t haystack_len, ++ const unsigned char *needle, ++ size_t needle_len); ++ + /* Let crypt.c/hostkey.c expose their method structs */ + const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); + const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); +diff --git a/src/packet.c b/src/packet.c +index eccb8c56a8..6da14e9fa1 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -624,14 +624,13 @@ packet_authagent_open(LIBSSH2_SESSION * session, + * layer when it has received a packet. + * + * The input pointer 'data' is pointing to allocated data that this function +- * is asked to deal with so on failure OR success, it must be freed fine. +- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN. ++ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN. + * + * This function will always be called with 'datalen' greater than zero. + */ + int + _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +- size_t datalen, int macstate) ++ size_t datalen, int macstate, uint32_t seq) + { + int rc = 0; + unsigned char *message = NULL; +@@ -676,6 +675,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + break; + } + ++ if(session->state & LIBSSH2_STATE_INITIAL_KEX) { ++ if(msg == SSH_MSG_KEXINIT) { ++ if(!session->kex_strict) { ++ if(datalen < 17) { ++ LIBSSH2_FREE(session, data); ++ session->packAdd_state = libssh2_NB_state_idle; ++ return _libssh2_error(session, ++ LIBSSH2_ERROR_BUFFER_TOO_SMALL, ++ "Data too short extracting kex"); ++ } ++ else { ++ const unsigned char *strict = ++ (unsigned char *)"kex-strict-s-v00@openssh.com"; ++ struct string_buf buf; ++ unsigned char *algs = NULL; ++ size_t algs_len = 0; ++ ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 17; /* advance past type and cookie */ ++ ++ if(_libssh2_get_string(&buf, &algs, &algs_len)) { ++ LIBSSH2_FREE(session, data); ++ session->packAdd_state = libssh2_NB_state_idle; ++ return _libssh2_error(session, ++ LIBSSH2_ERROR_BUFFER_TOO_SMALL, ++ "Algs too short"); ++ } ++ ++ if(algs_len == 0 || ++ _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) { ++ session->kex_strict = 1; ++ } ++ } ++ } ++ ++ if(session->kex_strict && seq) { ++ LIBSSH2_FREE(session, data); ++ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; ++ session->packAdd_state = libssh2_NB_state_idle; ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "KEXINIT was not the first packet"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "KEXINIT was not the first packet"); ++ } ++ } ++ ++ if(session->kex_strict && session->fullpacket_required_type && ++ session->fullpacket_required_type != msg) { ++ LIBSSH2_FREE(session, data); ++ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; ++ session->packAdd_state = libssh2_NB_state_idle; ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "unexpected packet type"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "unexpected packet type"); ++ } ++ } ++ + if(session->packAdd_state == libssh2_NB_state_allocated) { + /* A couple exceptions to the packet adding rule: */ + switch(msg) { +@@ -1364,6 +1427,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, + + return 0; + } ++ else if(session->kex_strict && ++ (session->state & LIBSSH2_STATE_INITIAL_KEX)) { ++ libssh2_session_disconnect(session, "strict KEX violation: " ++ "unexpected packet type"); ++ ++ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, ++ "strict KEX violation: " ++ "unexpected packet type"); ++ } + packet = _libssh2_list_next(&packet->node); + } + return -1; +@@ -1425,7 +1497,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, + } + + while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { +- int ret = _libssh2_transport_read(session); ++ int ret; ++ session->fullpacket_required_type = packet_type; ++ ret = _libssh2_transport_read(session); ++ session->fullpacket_required_type = 0; + if(ret == LIBSSH2_ERROR_EAGAIN) + return ret; + else if(ret < 0) { +diff --git a/src/packet.h b/src/packet.h +index 1d90b8af12..955351e5f6 100644 +--- a/src/packet.h ++++ b/src/packet.h +@@ -72,6 +72,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, + int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, + unsigned long data_len); + int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, +- size_t datalen, int macstate); ++ size_t datalen, int macstate, uint32_t seq); + + #endif /* LIBSSH2_PACKET_H */ +diff --git a/src/session.c b/src/session.c +index 35e7929fe7..9d89ade8ec 100644 +--- a/src/session.c ++++ b/src/session.c +@@ -469,6 +469,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), + session->abstract = abstract; + session->api_timeout = 0; /* timeout-free API by default */ + session->api_block_mode = 1; /* blocking API by default */ ++ session->state = LIBSSH2_STATE_INITIAL_KEX; ++ session->fullpacket_required_type = 0; + session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; + session->flag.quote_paths = 1; /* default behavior is to quote paths + for the scp subsystem */ +@@ -1223,6 +1225,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, + const char *desc, const char *lang) + { + int rc; ++ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; + session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; + BLOCK_ADJUST(rc, session, + session_disconnect(session, reason, desc, lang)); +diff --git a/src/transport.c b/src/transport.c +index 21be9d2b80..a8bb588a4b 100644 +--- a/src/transport.c ++++ b/src/transport.c +@@ -186,6 +186,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + struct transportpacket *p = &session->packet; + int rc; + int compressed; ++ uint32_t seq = session->remote.seqno; + + if(session->fullpacket_state == libssh2_NB_state_idle) { + session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; +@@ -317,7 +318,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + if(session->fullpacket_state == libssh2_NB_state_created) { + rc = _libssh2_packet_add(session, p->payload, + session->fullpacket_payload_len, +- session->fullpacket_macstate); ++ session->fullpacket_macstate, seq); + if(rc == LIBSSH2_ERROR_EAGAIN) + return rc; + if(rc) { +@@ -328,6 +329,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) + + session->fullpacket_state = libssh2_NB_state_idle; + ++ if(session->kex_strict && ++ session->fullpacket_packet_type == SSH_MSG_NEWKEYS) { ++ session->remote.seqno = 0; ++ } ++ + return session->fullpacket_packet_type; + } + +@@ -1093,6 +1099,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, + + session->local.seqno++; + ++ if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) { ++ session->local.seqno = 0; ++ } ++ + ret = LIBSSH2_SEND(session, p->outbuf, total_length, + LIBSSH2_SOCKET_SEND_FLAGS(session)); + if(ret < 0) diff --git a/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/nixpkgs/pkgs/development/libraries/libssh2/default.nix index 091885a1f084..f7a51da9fa67 100644 --- a/nixpkgs/pkgs/development/libraries/libssh2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libssh2/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-NzYWHkHiaTMk3rOMJs/cPv5iCdY0ukJY2xzs/2pa1GE="; }; + patches = [ + # fetchpatch cannot be used due to infinite recursion + # https://github.com/libssh2/libssh2/commit/d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a + ./CVE-2023-48795.patch + ]; + outputs = [ "out" "dev" "devdoc" ]; propagatedBuildInputs = [ openssl ]; # see Libs: in libssh2.pc diff --git a/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix b/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix index 3525d057b97a..4ec9fea5a0e6 100644 --- a/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsystemtap/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { pname = "libsystemtap"; - version = "4.6"; + version = "5.0"; src = fetchgit { url = "git://sourceware.org/git/systemtap.git"; - rev = "release-4.6"; - hash = "sha256-z7OUy0VGxK39aYCWFfvJnWk34Je0R+51kK5pGh7TzXM="; + rev = "release-5.0"; + hash = "sha256-dIBpySBTFn01CNtYwbXEramUlcYHPF6O/Ffr1BxdAH0="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/libtins/default.nix b/nixpkgs/pkgs/development/libraries/libtins/default.nix index b96c02a35bfd..b27ad6634797 100644 --- a/nixpkgs/pkgs/development/libraries/libtins/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtins/default.nix @@ -1,4 +1,4 @@ -{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }: +{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }: stdenv.mkDerivation rec { pname = "libtins"; @@ -11,6 +11,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw="; }; + patches = [ + # Pull gcc-13 fixes: + # https://github.com/mfontanini/libtins/pull/496 + # TODO: remove when upgrade to the next version. + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch"; + hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M="; + }) + ]; + postPatch = '' rm -rf googletest cp -r ${gtest.src} googletest diff --git a/nixpkgs/pkgs/development/libraries/libubox/default.nix b/nixpkgs/pkgs/development/libraries/libubox/default.nix index f54e5c5a5afa..2bcc5d0498c4 100644 --- a/nixpkgs/pkgs/development/libraries/libubox/default.nix +++ b/nixpkgs/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2023-11-03"; + version = "unstable-2023-11-28"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "f7d1569113110ea8df071d2ea64fd17aaf5b42c9"; - hash = "sha256-W0+QXI0gJ4WwrlRMPAJOChvilZ4zlAf4kXrfgBAkQAE="; + rev = "e80dc00ee90c29ef56ae28f414b0e5bb361206e7"; + hash = "sha256-R4Yz4C63LQTNBKyNyiLMQHfc5KJBPFldP1trmtEBb9U="; }; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; diff --git a/nixpkgs/pkgs/development/libraries/libunicode/default.nix b/nixpkgs/pkgs/development/libraries/libunicode/default.nix index 4241f5bc7676..725dacebcc25 100644 --- a/nixpkgs/pkgs/development/libraries/libunicode/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunicode/default.nix @@ -10,15 +10,18 @@ let }; in stdenv.mkDerivation (final: { pname = "libunicode"; - version = "0.3.0-unstable-2023-03-05"; + version = "0.4.0"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "libunicode"; - rev = "65e0c6ddf9648b94aa9bc7dda0718401efa9ef8e"; - hash = "sha256-F4CVU5MImkM571mD4iFxqTnNbk2GXKTGksqO4LH2uEk="; + rev = "v${final.version}"; + hash = "sha256-Us3T4fnGsArdsVB7IUhwdex43C+H1+lfL8yK9enhf2c="; }; + # Fix: set_target_properties Can not find target to add properties to: Catch2, et al. + patches = [ ./remove-target-properties.diff ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ catch2 fmt ]; diff --git a/nixpkgs/pkgs/development/libraries/libunicode/remove-target-properties.diff b/nixpkgs/pkgs/development/libraries/libunicode/remove-target-properties.diff new file mode 100644 index 000000000000..4bf665cf3e7c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libunicode/remove-target-properties.diff @@ -0,0 +1,19 @@ +diff --git a/src/libunicode/CMakeLists.txt b/src/libunicode/CMakeLists.txt +index 6c5ac20..9fa13a3 100644 +--- a/src/libunicode/CMakeLists.txt ++++ b/src/libunicode/CMakeLists.txt +@@ -223,10 +223,10 @@ if(LIBUNICODE_TESTING) + # supress conversion warnings for Catch2 + # https://github.com/catchorg/Catch2/issues/2583 + # https://github.com/SFML/SFML/blob/e45628e2ebc5843baa3739781276fa85a54d4653/test/CMakeLists.txt#L18-L22 +- set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF) +- set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF) +- get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) +- target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) ++ # set_target_properties(Catch2 PROPERTIES COMPILE_OPTIONS "" EXPORT_COMPILE_COMMANDS OFF) ++ # set_target_properties(Catch2WithMain PROPERTIES EXPORT_COMPILE_COMMANDS OFF) ++ # get_target_property(CATCH2_INCLUDE_DIRS Catch2 INTERFACE_INCLUDE_DIRECTORIES) ++ # target_include_directories(Catch2 SYSTEM INTERFACE ${CATCH2_INCLUDE_DIRS}) + + target_link_libraries(unicode_test unicode Catch2::Catch2WithMain fmt::fmt-header-only) + add_test(unicode_test unicode_test) diff --git a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index bb855ac767ee..b01a9a788bad 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -20,23 +19,15 @@ stdenv.mkDerivation rec { pname = "libvirt-glib"; - version = "4.0.0"; + version = "5.0.0"; outputs = [ "out" "dev" ] ++ lib.optional withDocs "devdoc"; src = fetchurl { url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; - sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; + sha256 = "m/7DRjgkFqNXXYcpm8ZBsqRkqlGf2bEofjGKpDovO4s="; }; - patches = [ - # Fix build with GLib 2.70 - (fetchpatch { - url = "https://gitlab.com/libvirt/libvirt-glib/-/commit/9a34c4ea55e0246c34896e48b8ecd637bc559ac7.patch"; - sha256 = "UU70uTi55EzPMuLYVKRzpVcd3WogeAtWAWEC2hWlR7k="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -69,9 +60,6 @@ stdenv.mkDerivation rec { (lib.mesonEnable "introspection" withIntrospection) ]; - # https://gitlab.com/libvirt/libvirt-glib/-/issues/4 - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=pointer-sign" ]; - meta = with lib; { description = "Library for working with virtual machines"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index 79b2e2ec2951..0c71611e4772 100644 --- a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -1,26 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, nasm, xxd }: - -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +, ffmpeg-full +, libaom +, meson +, nasm +, ninja +, testers +, xxd +}: + +stdenv.mkDerivation (finalAttrs: { pname = "libvmaf"; - version = "2.3.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; - rev = "v${version}"; - sha256 = "sha256-TkMy2tEdG1FPPWfH/wPnVbs5kocqe4Y0jU4yvbiRZ9k="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-6mwU2so1YM2pyWkJbDHVl443GgWtQazbBv3gTMBq5NA="; }; - sourceRoot = "${src.name}/libvmaf"; - - patches = [ - # Backport fix for non-Linux, non-Darwin platforms. - (fetchpatch { - url = "https://github.com/Netflix/vmaf/commit/f47640f9ffee9494571bd7c9622e353660c93fc4.patch"; - stripLen = 1; - sha256 = "rsTKuqp8VJG5DBDpixPke3LrdfjKzUO945i+iL0n7CY="; - }) - ]; + sourceRoot = "${finalAttrs.src.name}/libvmaf"; nativeBuildInputs = [ meson ninja nasm xxd ]; @@ -29,14 +30,24 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; doCheck = false; + passthru.tests = { + inherit libaom ffmpeg-full; + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "libvmaf" ]; + }; + }; + meta = with lib; { description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; homepage = "https://github.com/Netflix/vmaf"; - changelog = "https://github.com/Netflix/vmaf/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Netflix/vmaf/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; mainProgram = "vmaf"; platforms = platforms.unix; }; - -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index 2fbb29347d42..ed5413464e1d 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -6,14 +6,16 @@ , glib , pkg-config , udev +, libevdev , libgudev +, libxml2 , python3 , valgrind }: stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.8.0"; + version = "2.9.0"; outputs = [ "out" "dev" ]; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - hash = "sha256-VjFZBlOIG1L4dXPJ8DWxrbfVqdQC+X7zVXFryo43FFc="; + hash = "sha256-oM3dd22hQaAXdNoO2Q2JvO2lJCkmfw8f0NWxYcVT3lA="; }; postPatch = '' @@ -38,6 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib udev + libevdev libgudev ]; @@ -50,13 +53,18 @@ stdenv.mkDerivation rec { "-Dtests=${if doCheck then "enabled" else "disabled"}" ]; + checkInputs = [ + libxml2 + ]; + nativeCheckInputs = [ valgrind - ] ++ (with python3.pkgs; [ - libevdev - pytest - pyudev - ]); + (python3.withPackages (ps: with ps; [ + ps.libevdev + pytest + pyudev + ])) + ]; meta = with lib; { platforms = platforms.linux; @@ -64,6 +72,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/linuxwacom/libwacom/blob/${src.rev}/NEWS"; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; maintainers = teams.freedesktop.members; - license = licenses.mit; + license = licenses.hpnd; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 3f8e27789b8c..d06c45e81990 100644 --- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchFromGitLab , zlib , pkg-config , autoreconfHook @@ -34,16 +35,19 @@ in let libxml = stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.11.5"; + version = "2.12.3-unstable-2023-12-14"; outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; outputMan = "bin"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - sha256 = "NyeweMNg7Gn6hp3hS9b3XX7o02mHsHHmko1HIKKN86Y="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libxml2"; + rev = "f006355eda722cae204606b9f95ba51f5ce9189b"; + hash = "sha256-3WE90KDZq4Uaawuulc3t2+R8duCqgjEGUDN4HSXxohY="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/lirc/default.nix b/nixpkgs/pkgs/development/libraries/lirc/default.nix index 8d5a7d9aebd2..80c9d1f1d810 100644 --- a/nixpkgs/pkgs/development/libraries/lirc/default.nix +++ b/nixpkgs/pkgs/development/libraries/lirc/default.nix @@ -6,6 +6,7 @@ , pkg-config , help2man , python3 +, linuxHeaders , alsa-lib , libxslt @@ -60,9 +61,6 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - # use empty inc file instead of a from linux kernel generated one - touch lib/lirc/input_map.inc - export PKGCONFIG="$PKG_CONFIG" ''; @@ -72,7 +70,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib systemd libusb-compat-0_1 libftdi1 libICE libSM libX11 ]; - DEVINPUT_HEADER = "include/linux/input-event-codes.h"; + DEVINPUT_HEADER = "${linuxHeaders}/include/linux/input-event-codes.h"; configureFlags = [ "--sysconfdir=/etc" diff --git a/nixpkgs/pkgs/development/libraries/log4cxx/default.nix b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix index 898d2a5d9ea4..d557d5d07e4e 100644 --- a/nixpkgs/pkgs/development/libraries/log4cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "log4cxx"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "mirror://apache/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; - hash = "sha256-H8fYJpdTQYS8D3VzSNlp0khSuUj2PWsXKD/R7inCwoo="; + hash = "sha256-CfR0iqVnXvXAdwvtv14ASIZokzxak1pDrFuFviQ2xIo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/martyr/default.nix b/nixpkgs/pkgs/development/libraries/martyr/default.nix deleted file mode 100644 index 3221f2950c17..000000000000 --- a/nixpkgs/pkgs/development/libraries/martyr/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{lib, stdenv, fetchurl, ant, jdk}: - -stdenv.mkDerivation rec { - pname = "martyr"; - version = "0.3.9"; - src = fetchurl { - url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz"; - sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; - }; - - buildInputs = [ ant jdk ]; - - buildPhase = "ant"; - - installPhase = '' - mkdir -p "$out/share/java" - cp -v *.jar "$out/share/java" - ''; - - meta = { - description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; - homepage = "https://martyr.sourceforge.net/"; - license = lib.licenses.lgpl21; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/mesa/backports/0001-dri-added-build-dependencies-for-systems-using-non-s.patch b/nixpkgs/pkgs/development/libraries/mesa/backports/0001-dri-added-build-dependencies-for-systems-using-non-s.patch new file mode 100644 index 000000000000..c0b239c92598 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/backports/0001-dri-added-build-dependencies-for-systems-using-non-s.patch @@ -0,0 +1,56 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "duncan.hopkins" <duncan.hopkins@foundry.com> +Date: Tue, 17 Oct 2023 09:34:31 +0100 +Subject: [PATCH] dri: added build dependencies for systems using non-standard + prefixed X11 libs. + +To get MacOS to build, some extra dependencies need to be added to a couple of build targets. +This mainly shows up when not installing the dependencies in the default prefix locations. +On MacOS, this happens when using a custom build of brew to install the dependencies to 'odd' locations. + +Reviewed-by: Adam Jackson <ajax@redhat.com> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25992> +--- + src/gallium/targets/dri/meson.build | 2 +- + src/glx/meson.build | 2 +- + src/loader/meson.build | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build +index 66619bba0db..6d3ef197e74 100644 +--- a/src/gallium/targets/dri/meson.build ++++ b/src/gallium/targets/dri/meson.build +@@ -49,7 +49,7 @@ libgallium_dri = shared_library( + link_depends : gallium_dri_link_depends, + link_with : [ + libdri, libmesa, libgalliumvl, +- libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri, ++ libgallium, libglapi, libloader, libpipe_loader_static, libws_null, libwsw, libswdri, + libswkmsdri, + ], + dependencies : [ +diff --git a/src/glx/meson.build b/src/glx/meson.build +index 7ec3e3e0d88..1a5e9833956 100644 +--- a/src/glx/meson.build ++++ b/src/glx/meson.build +@@ -136,7 +136,7 @@ libglx = static_library( + ], + dependencies : [ + idep_mesautil, idep_xmlconfig, +- dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd, dep_xxf86vm, dep_xshmfence ++ dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_xext, dep_glvnd, dep_xxf86vm, dep_xshmfence + ], + ) + +diff --git a/src/loader/meson.build b/src/loader/meson.build +index 35f9991ba2f..043cc852112 100644 +--- a/src/loader/meson.build ++++ b/src/loader/meson.build +@@ -47,6 +47,6 @@ libloader = static_library( + c_args : loader_c_args, + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_util], +- dependencies : [dep_libdrm, dep_thread, dep_xcb_xrandr], ++ dependencies : [dep_libdrm, dep_thread, dep_xcb, dep_xcb_xrandr], + build_by_default : false, + ) diff --git a/nixpkgs/pkgs/development/libraries/mesa/backports/0002-util-Update-util-libdrm.h-stubs-to-allow-loader.c-to.patch b/nixpkgs/pkgs/development/libraries/mesa/backports/0002-util-Update-util-libdrm.h-stubs-to-allow-loader.c-to.patch new file mode 100644 index 000000000000..5a48ace8fbbc --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/backports/0002-util-Update-util-libdrm.h-stubs-to-allow-loader.c-to.patch @@ -0,0 +1,103 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "duncan.hopkins" <duncan.hopkins@foundry.com> +Date: Tue, 17 Oct 2023 14:36:39 +0100 +Subject: [PATCH] util: Update util/libdrm.h stubs to allow loader.c to compile + on MacOS. + +MacOS does not have the libdrm libraries so is missing xf86drm.h. +util/libdrm.h already has a collection of stubs for systems that do not support the libraries. + +A compile on MacOS will fail with the source that uses newer drm functions and structures. +Update adds in missing items that MacOS code needs to compile and run. +New code is copied from the public repository: https://gitlab.freedesktop.org/mesa/drm/-/blob/main/xf86drm.h + +Reviewed-by: Adam Jackson <ajax@redhat.com> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25992> +--- + src/util/libdrm.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 57 insertions(+) + +diff --git a/src/util/libdrm.h b/src/util/libdrm.h +index cc153cf88ab..e3af494b8d1 100644 +--- a/src/util/libdrm.h ++++ b/src/util/libdrm.h +@@ -44,22 +44,79 @@ + #define DRM_BUS_PLATFORM 2 + #define DRM_BUS_HOST1X 3 + ++typedef struct _drmPciDeviceInfo { ++ uint16_t vendor_id; ++ uint16_t device_id; ++ uint16_t subvendor_id; ++ uint16_t subdevice_id; ++ uint8_t revision_id; ++} drmPciDeviceInfo, *drmPciDeviceInfoPtr; ++ ++#define DRM_PLATFORM_DEVICE_NAME_LEN 512 ++ ++typedef struct _drmPlatformBusInfo { ++ char fullname[DRM_PLATFORM_DEVICE_NAME_LEN]; ++} drmPlatformBusInfo, *drmPlatformBusInfoPtr; ++ ++typedef struct _drmPlatformDeviceInfo { ++ char **compatible; /* NULL terminated list of compatible strings */ ++} drmPlatformDeviceInfo, *drmPlatformDeviceInfoPtr; ++ ++#define DRM_HOST1X_DEVICE_NAME_LEN 512 ++ ++typedef struct _drmHost1xBusInfo { ++ char fullname[DRM_HOST1X_DEVICE_NAME_LEN]; ++} drmHost1xBusInfo, *drmHost1xBusInfoPtr; ++ ++typedef struct _drmPciBusInfo { ++ uint16_t domain; ++ uint8_t bus; ++ uint8_t dev; ++ uint8_t func; ++} drmPciBusInfo, *drmPciBusInfoPtr; ++ + typedef struct _drmDevice { + char **nodes; /* DRM_NODE_MAX sized array */ + int available_nodes; /* DRM_NODE_* bitmask */ + int bustype; ++ union { ++ drmPciBusInfoPtr pci; ++ drmPlatformBusInfoPtr platform; ++ drmHost1xBusInfoPtr host1x; ++ } businfo; ++ union { ++ drmPciDeviceInfoPtr pci; ++ } deviceinfo; + /* ... */ + } drmDevice, *drmDevicePtr; + ++static inline int ++drmGetDevice2(int fd, uint32_t flags, drmDevicePtr *device) ++{ ++ return -ENOENT; ++} ++ + static inline int + drmGetDevices2(uint32_t flags, drmDevicePtr devices[], int max_devices) + { + return -ENOENT; + } + ++static inline int ++drmGetDeviceFromDevId(dev_t dev_id, uint32_t flags, drmDevicePtr *device) ++{ ++ return -ENOENT; ++} ++ ++static inline void ++drmFreeDevice(drmDevicePtr *device) {} ++ + static inline void + drmFreeDevices(drmDevicePtr devices[], int count) {} + ++static inline char* ++drmGetDeviceNameFromFd2(int fd) { return NULL;} ++ + typedef struct _drmVersion { + int version_major; /**< Major version */ + int version_minor; /**< Minor version */ diff --git a/nixpkgs/pkgs/development/libraries/mesa/backports/0003-glx-fix-automatic-zink-fallback-loading-between-hw-a.patch b/nixpkgs/pkgs/development/libraries/mesa/backports/0003-glx-fix-automatic-zink-fallback-loading-between-hw-a.patch new file mode 100644 index 000000000000..c7bde6411d8e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/backports/0003-glx-fix-automatic-zink-fallback-loading-between-hw-a.patch @@ -0,0 +1,53 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "duncan.hopkins" <duncan.hopkins@foundry.com> +Date: Wed, 1 Nov 2023 11:31:13 +0000 +Subject: [PATCH] glx: fix automatic zink fallback loading between hw and sw + drivers on MacOS + +The combination of defines used when compile the code on MacOS is hiding variables. +Patch allows basic MacOS build to compile and run. + +Reviewed-by: Adam Jackson <ajax@redhat.com> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25992> +--- + src/glx/glxext.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/glx/glxext.c b/src/glx/glxext.c +index 7712e54c1d6..454f2c36a77 100644 +--- a/src/glx/glxext.c ++++ b/src/glx/glxext.c +@@ -878,12 +878,16 @@ __glXInitialize(Display * dpy) + + dpyPriv->glXDrawHash = __glxHashCreate(); + ++ Bool zink = False; ++ Bool try_zink = False; ++ + #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) + Bool glx_direct = !debug_get_bool_option("LIBGL_ALWAYS_INDIRECT", false); + Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false); + const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE"); +- Bool zink = env && !strcmp(env, "zink"); +- Bool try_zink = False; ++ ++ zink = env && !strcmp(env, "zink"); ++ try_zink = False; + + dpyPriv->drawHash = __glxHashCreate(); + +@@ -928,12 +932,14 @@ __glXInitialize(Display * dpy) + + if (!AllocAndFetchScreenConfigs(dpy, dpyPriv, zink | try_zink)) { + Bool fail = True; ++#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) + if (try_zink) { + free(dpyPriv->screens); + dpyPriv->driswDisplay->destroyDisplay(dpyPriv->driswDisplay); + dpyPriv->driswDisplay = driswCreateDisplay(dpy, false); + fail = !AllocAndFetchScreenConfigs(dpy, dpyPriv, False); + } ++#endif + if (fail) { + free(dpyPriv); + return NULL; diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index b4b70fcab4f5..cb9d19c30c84 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , meson, pkg-config, ninja , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages_16, libffi, libomxil-bellagio, libva-minimal +, llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau , libglvnd, libunwind, lm_sensors , vulkan-loader, glslang @@ -43,7 +43,7 @@ ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ # QEMU virtualized GPU (aka VirGL) # Requires ATOMIC_INT_LOCK_FREE == 2. - "virtio-experimental" + "virtio" ] ++ lib.optionals stdenv.isAarch64 [ "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) @@ -65,6 +65,7 @@ , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , enablePatentEncumberedCodecs ? true , jdupes +, rust-bindgen , rustc , spirv-llvm-translator , zstd @@ -84,8 +85,8 @@ */ let - version = "23.1.9"; - hash = "sha256-KVuifCgUbtCSFOjOea+hZZ7fnRQt7MPJH4BFUtZPdRA="; + version = "23.3.3"; + hash = "sha256-UYMHwAV/o87otY33i+Qx1N9ar6ftxg0JJ4stegqA87Q="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -93,19 +94,6 @@ let withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; - llvmPackages = llvmPackages_16; - # Align all the Mesa versions used. Required to prevent explosions when - # two different LLVMs are loaded in the same process. - # FIXME: these should really go into some sort of versioned LLVM package set - rust-bindgen' = buildPackages.rust-bindgen.override { - rust-bindgen-unwrapped = buildPackages.rust-bindgen.unwrapped.override { - clang = buildPackages.llvmPackages_15.clang; - }; - }; - spirv-llvm-translator' = spirv-llvm-translator.override { - inherit (llvmPackages) llvm; - }; - haveWayland = lib.elem "wayland" eglPlatforms; haveZink = lib.elem "zink" galliumDrivers; haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers); @@ -133,29 +121,14 @@ self = stdenv.mkDerivation { ./opencl.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch - ] ++ lib.optionals stdenv.isDarwin [ - # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - (fetchpatch { - url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/44734d1fe98ef47019fe2c56d867d1645c526e4e.diff"; - hash = "sha256-ipaISEY5xcnGvrwFxNY80JVlYWddfiHofkYEBuPkyDY="; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/d2a46afbfc44121aa491a2b4d1a3249d26fc6a11.diff"; - hash = "sha256-i00s9oUhZXXf/A4cHwWN6uRDP70cHjz+kgVpiDM/eMw="; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/17cde1ee87cc0cbb896ca81949b8f192d5496271.diff"; - hash = "sha256-ao2pWQwMBskOjWJsjWqwFYAeqpTWAyJbEtSryDO+xyo="; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/robclark/mesa/-/commit/4489d737d5c12eb0a3441ed0b303f9f1100a7166.diff"; - hash = "sha256-WxqwEngd79NHLedQOWMjjroaN0gr6Upd96uteSvr4Yw="; - }) - # fixes a linking error - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/c8b64452c076c1768beb23280de25faf2bcbe2c8.diff"; - hash = "sha256-mqivdzyoLtkfkAb+r57gjPwg8d7whgFAahiUhGVOOvo="; - }) + + # Backports to fix build + # FIXME: remove when applied upstream + + # Fix build on macOS + ./backports/0001-dri-added-build-dependencies-for-systems-using-non-s.patch + ./backports/0002-util-Update-util-libdrm.h-stubs-to-allow-loader.c-to.patch + ./backports/0003-glx-fix-automatic-zink-fallback-loading-between-hw-a.patch ]; postPatch = '' @@ -257,7 +230,7 @@ self = stdenv.mkDerivation { python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] - ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator' ] + ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator ] ++ lib.optional withValgrind valgrind-light ++ lib.optional haveZink vulkan-loader ++ lib.optional haveDozen directx-headers; @@ -270,7 +243,7 @@ self = stdenv.mkDerivation { intltool bison flex file python3Packages.python python3Packages.mako python3Packages.ply jdupes glslang - ] ++ lib.optionals enableOpenCL [ rust-bindgen' rustc ] + ] ++ lib.optionals enableOpenCL [ rust-bindgen rustc ] ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ diff --git a/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index fe51c79d7a06..05f5ec7b6a03 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,17 +1,8 @@ -Author: David McFarland <corngood@gmail.com> -Date: Mon Aug 6 15:52:11 2018 -0300 - - [PATCH] disk_cache: include dri driver path in cache key - - This fixes invalid cache hits on NixOS where all shared library - timestamps in /nix/store are zero. - diff --git a/meson_options.txt b/meson_options.txt -index b8f753e2e1a..70d9071c8be 100644 +index 591ed957c85..6cb550593e3 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -452,7 +452,14 @@ option( - value : true, +@@ -519,6 +519,13 @@ option( description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -26,10 +17,10 @@ index b8f753e2e1a..70d9071c8be 100644 type : 'string', value : '', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index 8dbe0938d11..498fe42de70 100644 +index 1d23b92af7e..fbb4b04f3cf 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -194,8 +194,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -218,8 +218,10 @@ disk_cache_type_create(const char *gpu_name, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -40,7 +31,7 @@ index 8dbe0938d11..498fe42de70 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -216,6 +218,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -240,6 +242,7 @@ disk_cache_type_create(const char *gpu_name, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -49,13 +40,13 @@ index 8dbe0938d11..498fe42de70 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index cd44e49bfb4..f17115515a5 100644 +index eb88f235c47..eae5c54cc10 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -268,7 +268,12 @@ _libmesa_util = static_library( - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], +@@ -286,7 +286,12 @@ _libmesa_util = static_library( + include_directories : [inc_util, include_directories('format')], dependencies : deps_for_libmesa_util, - link_with: [libmesa_format, libmesa_util_sse41], + link_with: [libmesa_util_sse41], - c_args : [c_msvc_compat_args], + c_args : [ + c_msvc_compat_args, diff --git a/nixpkgs/pkgs/development/libraries/mesa/opencl.patch b/nixpkgs/pkgs/development/libraries/mesa/opencl.patch index fb4da5cf7a0a..cd27f0a2e86f 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/opencl.patch +++ b/nixpkgs/pkgs/development/libraries/mesa/opencl.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 172c64a7c70..05961e56926 100644 +index fbb0b29322d..b4825056449 100644 --- a/meson.build +++ b/meson.build -@@ -1900,7 +1900,7 @@ endif +@@ -1805,7 +1805,7 @@ endif dep_clang = null_dep if with_clc @@ -12,12 +12,12 @@ index 172c64a7c70..05961e56926 100644 dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) diff --git a/meson_options.txt b/meson_options.txt -index 6f307018815..ab84eb1006c 100644 +index e885ba61a8a..591ed957c85 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -18,6 +18,12 @@ - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - # SOFTWARE. +@@ -23,6 +23,12 @@ option( + description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY', + ) +option( + 'clang-libdir', @@ -26,10 +26,10 @@ index 6f307018815..ab84eb1006c 100644 + description : 'Locations to search for clang libraries.' +) option( - 'platforms', - type : 'array', + 'android-stub', + type : 'boolean', diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index db3586bd7fb..4d914206d21 100644 +index 7c14135898e..74dc6850603 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') @@ -48,19 +48,19 @@ index db3586bd7fb..4d914206d21 100644 output : 'mesa.icd', - install : true, + install : false, + install_tag : 'runtime', install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) - diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build -index a968dee52db..69475cf3133 100644 +index b2963fe6dfa..99d6d801b94 100644 --- a/src/gallium/targets/rusticl/meson.build +++ b/src/gallium/targets/rusticl/meson.build -@@ -58,7 +58,7 @@ configure_file( +@@ -76,7 +76,7 @@ configure_file( configuration : _config, input : 'rusticl.icd.in', output : 'rusticl.icd', - install : true, + install : false, + install_tag : 'runtime', install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) - diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index 22a38921ec49..abe368f2ea62 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -30,8 +30,7 @@ , enablePython ? false , python3 , swig -, enableQt ? false -, libsForQt5 +, qt ? null , enableSDL1 ? stdenv.isLinux , SDL , enableSDL2 ? true @@ -60,8 +59,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enablePython [ python3 swig - ] ++ lib.optionals enableQt [ - libsForQt5.wrapQtAppsHook + ] ++ lib.optionals (qt != null) [ + qt.wrapQtAppsHook ]; buildInputs = [ @@ -87,9 +86,10 @@ stdenv.mkDerivation rec { glib ladspa-sdk ladspaPlugins - ] ++ lib.optionals enableQt [ - libsForQt5.qtbase - libsForQt5.qtsvg + ] ++ lib.optionals (qt != null) [ + qt.qtbase + qt.qtsvg + (qt.qt5compat or null) ] ++ lib.optionals enableSDL1 [ SDL ] ++ lib.optionals enableSDL2 [ @@ -104,13 +104,15 @@ stdenv.mkDerivation rec { "-DMOD_OPENCV=ON" ] ++ lib.optionals enablePython [ "-DSWIG_PYTHON=ON" + ] ++ lib.optionals (qt != null) [ + "-DMOD_QT${lib.versions.major qt.qtbase.version}=ON" ]; preFixup = '' wrapProgram $out/bin/melt \ --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 \ ${lib.optionalString enableJackrack "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"} \ - ${lib.optionalString enableQt "\${qtWrapperArgs[@]}"} + ${lib.optionalString (qt != null) "\${qtWrapperArgs[@]}"} ''; diff --git a/nixpkgs/pkgs/development/libraries/mm-common/default.nix b/nixpkgs/pkgs/development/libraries/mm-common/default.nix index a8afd6e038f8..cbc0f86e31b1 100644 --- a/nixpkgs/pkgs/development/libraries/mm-common/default.nix +++ b/nixpkgs/pkgs/development/libraries/mm-common/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; + sha256 = "tVxGA3282rxc7js4nqEcw5EK22jr6IPpR3hHqmYIYuc="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix index 622ee233f9c4..f53a3268b739 100644 --- a/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -3,10 +3,19 @@ # either libfabric or ucx work for ch4backend on linux. On darwin, neither of # these libraries currently build so this argument is ignored on Darwin. , ch4backend -# Process manager to build -, withPm ? "hydra:gforker" +# Process managers to build (`--with-pm`), +# cf. https://github.com/pmodels/mpich/blob/b80a6d7c24defe7cdf6c57c52430f8075a0a41d6/README.vin#L562-L586 +, withPm ? [ "hydra" "gforker" ] +, pmix +# PMIX support is likely incompatible with process managers (`--with-pm`) +# https://github.com/NixOS/nixpkgs/pull/274804#discussion_r1432601476 +, pmixSupport ? false } : +let + withPmStr = if withPm != [ ] then builtins.concatStringsSep ":" withPm else "no"; +in + assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { @@ -22,11 +31,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" - "--enable-sharedlib" - "--with-pm=${withPm}" + "--with-pm=${withPmStr}" ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [ "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 "FCFLAGS=-fallow-argument-mismatch" + ] ++ lib.optionals pmixSupport [ + "--with-pmix=${lib.getDev pmix}" ]; enableParallelBuilding = true; @@ -45,6 +55,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # As far as we know, --with-pmix silently disables all of `--with-pm` + broken = pmixSupport && withPm != [ ]; + description = "Implementation of the Message Passing Interface (MPI) standard"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/ndi/default.nix b/nixpkgs/pkgs/development/libraries/ndi/default.nix index 9cd0d186302b..06eb1b815069 100644 --- a/nixpkgs/pkgs/development/libraries/ndi/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndi/default.nix @@ -2,6 +2,12 @@ let versionJSON = lib.importJSON ./version.json; + ndiPlatform = + if stdenv.isAarch64 then "aarch64-rpi4-linux-gnueabi" + else if stdenv.isAarch32 then "arm-rpi2-linux-gnueabihf" + else if stdenv.isx86_64 then "x86_64-linux-gnu" + else if stdenv.isi686 then "i686-linux-gnu" + else throw "unsupported platform for NDI SDK"; in stdenv.mkDerivation rec { pname = "ndi"; @@ -35,12 +41,13 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - mv bin/x86_64-linux-gnu $out/bin + mv bin/${ndiPlatform} $out/bin for i in $out/bin/*; do + if [ -L "$i" ]; then continue; fi patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" done patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" $out/bin/ndi-record - mv lib/x86_64-linux-gnu $out/lib + mv lib/${ndiPlatform} $out/lib for i in $out/lib/*; do if [ -L "$i" ]; then continue; fi patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i" @@ -48,7 +55,6 @@ stdenv.mkDerivation rec { mv include examples $out/ mkdir -p $out/share/doc/${pname}-${version} mv licenses $out/share/doc/${pname}-${version}/licenses - mv logos $out/share/doc/${pname}-${version}/logos mv documentation/* $out/share/doc/${pname}-${version}/ ''; @@ -61,9 +67,9 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.py; meta = with lib; { - homepage = "https://ndi.tv/sdk/"; + homepage = "https://ndi.video/ndi-sdk/"; description = "NDI Software Developer Kit"; - platforms = ["x86_64-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "armv7l-linux"]; hydraPlatforms = []; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; diff --git a/nixpkgs/pkgs/development/libraries/ndi/version.json b/nixpkgs/pkgs/development/libraries/ndi/version.json index d751aa79e431..686abdb2c2b7 100644 --- a/nixpkgs/pkgs/development/libraries/ndi/version.json +++ b/nixpkgs/pkgs/development/libraries/ndi/version.json @@ -1 +1 @@ -{"hash": "sha256:70e04c2e7a629a9854de2727e0f978175b7a4ec6cf4cd9799a22390862f6fa27", "version": "5.5.2"} +{"hash": "sha256:4ff4b92f2c5f42d234aa7d142e2de7e9b045c72b46ad5149a459d48efd9218de", "version": "5.6.0"} diff --git a/nixpkgs/pkgs/development/libraries/nng/default.nix b/nixpkgs/pkgs/development/libraries/nng/default.nix index 26f5553a58e8..643866329722 100644 --- a/nixpkgs/pkgs/development/libraries/nng/default.nix +++ b/nixpkgs/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-QnT27Xej8bu2wj2v1uwAAJt4DrQlgMsGOvj8ZLpx57A="; + hash = "sha256-6JFmoCELDkvDvTNy2ET4igFCc/J9wraN6Cl1lq9So1Q="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/nixpkgs/pkgs/development/libraries/nss/esr.nix b/nixpkgs/pkgs/development/libraries/nss/esr.nix index 55e09511aab1..63308f385036 100644 --- a/nixpkgs/pkgs/development/libraries/nss/esr.nix +++ b/nixpkgs/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.90"; - hash = "sha256-ZEG6ZcEymQ8Yw02ziT2LFWuvwZ1rRuT93rRHGYM22yQ="; + version = "3.90.1"; + hash = "sha256-5Fx0p2WP/LbGIqfhm6+zEab71UZPWBubCUGBEKQIsX8="; } diff --git a/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix index 1ad0076eeb20..dcbb34e33cdb 100644 --- a/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix +++ b/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "nv-codec-headers"; - version = "12.0.16.0"; + version = "12.1.14.0"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; rev = "n${version}"; - sha256 = "sha256-8YZU9pb0kzat0JBVEotaZUkNicQvLNIrIyPU9KTTjwg="; + sha256 = "sha256-WJYuFmMGSW+B32LwE7oXv/IeTln6TNEeXSkquHh85Go="; }; makeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/opencollada/default.nix b/nixpkgs/pkgs/development/libraries/opencollada/default.nix index d05822174339..340b1299e832 100644 --- a/nixpkgs/pkgs/development/libraries/opencollada/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencollada/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2, pcre +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, pkg-config, libxml2, pcre , darwin}: stdenv.mkDerivation rec { @@ -13,12 +13,20 @@ stdenv.mkDerivation rec { sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w"; }; + patches = [ + # fix build with gcc 13 + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b"; + hash = "sha256-uimeLGHgXaFi61mmoaloJ5vo83c8EIQmtHEMngC2Nq4="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]); propagatedBuildInputs = [ libxml2 pcre ]; - patchPhase = '' + postPatch = '' patch -p1 < ${./pcre.patch} '' + lib.optionalString stdenv.isDarwin '' substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ diff --git a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 9b5018ef4182..21f50a6fe8a3 100644 --- a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -5,7 +5,6 @@ , cmake , expat , yaml-cpp -, ilmbase , pystring , imath , minizip-ng @@ -60,7 +59,6 @@ stdenv.mkDerivation rec { buildInputs = [ expat yaml-cpp - ilmbase pystring imath minizip-ng diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index e3f458d0d733..377ebb3acdb5 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -10,7 +10,7 @@ , enablePNG ? true, libpng , enableTIFF ? true, libtiff , enableWebP ? true, libwebp -, enableEXR ? !stdenv.isDarwin, openexr, ilmbase +, enableEXR ? !stdenv.isDarwin, openexr_3 , enableEigen ? true, eigen , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true @@ -194,7 +194,7 @@ stdenv.mkDerivation { ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp - ++ lib.optionals enableEXR [ openexr ilmbase ] + ++ lib.optionals enableEXR [ openexr_3 ] ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -219,8 +219,6 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config unzip ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; - # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; diff --git a/nixpkgs/pkgs/development/libraries/opendht/default.nix b/nixpkgs/pkgs/development/libraries/opendht/default.nix index e972fa3fb14f..7209c2d2e253 100644 --- a/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -7,7 +7,7 @@ , asio , nettle , gnutls -, msgpack +, msgpack-cxx , readline , libargon2 , jsoncpp @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { fmt nettle gnutls - msgpack + msgpack-cxx readline libargon2 ] ++ lib.optionals enableProxyServerAndClient [ diff --git a/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix index f45bda41b863..62f45de2bebf 100644 --- a/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix +++ b/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, doxygen, +{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, pkg-config, doxygen, libX11, libXinerama, libXrandr, libGLU, libGL, - glib, ilmbase, libxml2, pcre, zlib, + glib, libxml2, pcre, zlib, AGL, Accelerate, Carbon, Cocoa, Foundation, boost, jpegSupport ? true, libjpeg, - exrSupport ? false, openexr, + exrSupport ? false, openexr_3, gifSupport ? true, giflib, pngSupport ? true, libpng, tiffSupport ? true, libtiff, @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!stdenv.isDarwin) [ libX11 libXinerama libXrandr libGLU libGL ] ++ [ - glib ilmbase libxml2 pcre zlib + glib libxml2 pcre zlib ] ++ lib.optional jpegSupport libjpeg - ++ lib.optional exrSupport openexr + ++ lib.optional exrSupport openexr_3 ++ lib.optional gifSupport giflib ++ lib.optional pngSupport libpng ++ lib.optional tiffSupport libtiff @@ -74,6 +74,11 @@ stdenv.mkDerivation rec { url = "https://github.com/openscenegraph/OpenSceneGraph/commit/bc2daf9b3239c42d7e51ecd7947d31a92a7dc82b.patch"; hash = "sha256-VR8YKOV/YihB5eEGZOGaIfJNrig1EPS/PJmpKsK284c="; }) + # OpenEXR 3 support: https://github.com/openscenegraph/OpenSceneGraph/issues/1075 + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-games/openscenegraph/files/openscenegraph-3.6.5-openexr3.patch?id=0f642d8f09b589166f0e0c0fc84df7673990bf3f"; + hash = "sha256-fdNbkg6Vp7DeDBTe5Zso8qJ5v9uPSXHpQ5XlGkvputk="; + }) ]; cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index a8e178c7e6d3..c7234c3da81e 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -93,7 +93,7 @@ let else if stdenv.hostPlatform.isBSD then if stdenv.hostPlatform.isx86_64 then "./Configure BSD-x86_64" else if stdenv.hostPlatform.isx86_32 - then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" + then "./Configure BSD-x86" + lib.optionalString stdenv.hostPlatform.isElf "-elf" else "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isMinGW then "./Configure mingw${lib.optionalString diff --git a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 1e01ed4a607a..6127b83813c7 100644 --- a/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -39,7 +39,9 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 gettext - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ lib.optionals + (!stdenv.buildPlatform.canExecute stdenv.hostPlatform + && !stdenv.hostPlatform.isMinGW) [ mesonEmulatorHook ]; diff --git a/nixpkgs/pkgs/development/libraries/pdal/default.nix b/nixpkgs/pkgs/development/libraries/pdal/default.nix index 1c11e4d449e1..edb2c866bdc1 100644 --- a/nixpkgs/pkgs/development/libraries/pdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -1,43 +1,57 @@ -{ lib, stdenv +{ lib +, stdenv +, callPackage , fetchFromGitHub , fetchpatch +, testers + +, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format + , cmake -, pkg-config -, openscenegraph , curl , gdal , hdf5-cpp , LASzip -, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format , libe57format , libgeotiff , libtiff , libxml2 +, openscenegraph +, pkg-config , postgresql +, proj , tiledb , xercesc , zlib , zstd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.5.6"; + version = "2.6.2"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; - rev = version; - sha256 = "sha256-JKwa89c05EfZ/FxOkj8lYmw0o2EgSqafRDIV2mTpZ5E="; + rev = finalAttrs.version; + sha256 = "sha256-bYTSmrel8MLza+OxO+aOSsnkahjjqRRqUiVwAk23Gxk="; }; + patches = [ + # Fix running tests + # https://github.com/PDAL/PDAL/issues/4280 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/PDAL/PDAL/pull/4291.patch"; + sha256 = "sha256-jFS+trwMRBfm+MpT0CcuD/hdYmfyuQj2zyoe06B6G9U="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - openscenegraph curl gdal hdf5-cpp @@ -45,7 +59,9 @@ stdenv.mkDerivation rec { libgeotiff libtiff libxml2 + openscenegraph postgresql + proj tiledb xercesc zlib @@ -59,6 +75,9 @@ stdenv.mkDerivation rec { "-DBUILD_PLUGIN_HDF=ON" "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" "-DBUILD_PLUGIN_TILEDB=ON" + "-DWITH_COMPLETION=ON" + "-DWITH_TESTS=ON" + "-DBUILD_PGPOINTCLOUD_TESTS=OFF" # Plugins can probably not be made work easily: "-DBUILD_PLUGIN_CPD=OFF" @@ -75,11 +94,53 @@ stdenv.mkDerivation rec { "-DBUILD_PLUGIN_RIVLIB=OFF" ]; + doCheck = true; + + disabledTests = [ + # Tests failing due to TileDB library implementation, disabled also + # by upstream CI. + # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 + "pdal_io_tiledb_writer_test" + "pdal_io_tiledb_reader_test" + "pdal_io_tiledb_time_writer_test" + "pdal_io_tiledb_time_reader_test" + "pdal_io_tiledb_bit_fields_test" + "pdal_io_tiledb_utils_test" + "pdal_io_e57_read_test" + "pdal_io_e57_write_test" + "pdal_io_stac_reader_test" + + # Segfault + "pdal_io_hdf_reader_test" + + # Failure + "pdal_app_plugin_test" + ]; + + checkPhase = '' + runHook preCheck + # tests are flaky and they seem to fail less often when they don't run in + # parallel + ctest -j 1 --output-on-failure -E '^${lib.concatStringsSep "|" finalAttrs.disabledTests}$' + runHook postCheck + ''; + + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "pdal --version"; + version = "pdal ${finalAttrs.finalPackage.version}"; + }; + pdal = callPackage ./tests.nix { pdal = finalAttrs.finalPackage; }; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = with lib; { description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data"; homepage = "https://pdal.io"; license = licenses.bsd3; maintainers = teams.geospatial.members; platforms = platforms.all; + pkgConfigModules = [ "pdal" ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/pdal/tests.nix b/nixpkgs/pkgs/development/libraries/pdal/tests.nix new file mode 100644 index 000000000000..1f71626856b3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/pdal/tests.nix @@ -0,0 +1,10 @@ +{ runCommand, pdal }: + +let + inherit (pdal) pname; +in +runCommand "${pname}-tests" { meta.timeout = 60; } + '' + ${pdal}/bin/pdal --drivers + touch $out + '' diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 3c4e8008639c..9a42e693da28 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.052"; + version = "1.053"; src = fetchurl { url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-veY8KMvfmSvt6k3e38PNUsn+wkGnZ8xFXdStEOghDDk="; + sha256 = "sha256-sSokjgsUOTTJnjt8jdgyZRIvbGwJUzwqA99E9e/x5vo="; }; buildInputs = [ fastjet ]; diff --git a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index 569f8d80e542..c5849f93c5e3 100644 --- a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.2.3"; + version = "7.3.0"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - hash = "sha256-VZmJk3mwGwnjMaJCbXjTm39uwSbbJUPp00Cu/mqlD4Q="; + hash = "sha256-JiSBnS3/EFupUuobXPEutvSSbUlRd0pBkHaZ4vVnaGw="; }; nativeBuildInputs = [ autoconf automake libtool gfortran ]; diff --git a/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix index d749744d51ed..9f2798ce51b6 100644 --- a/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.10.0"; + version = "1.12.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MZSIZ8mgRhPm3g0jrfy8Ws7N3vCzn5hrNF7GwZcnNv4="; + hash = "sha256-FIO/0nnLkTyDV5tdccWPmVh2T5ukMDs2R+EAfLcNT54="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/development/libraries/polkit/default.nix b/nixpkgs/pkgs/development/libraries/polkit/default.nix index 80badcdd4dbd..dabba056b487 100644 --- a/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -9,7 +9,6 @@ , mesonEmulatorHook , ninja , perl -, rsync , python3 , fetchpatch , gettext @@ -72,7 +71,6 @@ stdenv.mkDerivation rec { meson ninja perl - rsync # man pages libxslt @@ -131,7 +129,7 @@ stdenv.mkDerivation rec { # at install time but Meson does not support this # so we need to convince it to install all files to a temporary # location using DESTDIR and then move it to proper one in postInstall. - DESTDIR = "${placeholder "out"}/dest"; + env.DESTDIR = "dest"; inherit doCheck; @@ -165,19 +163,15 @@ stdenv.mkDerivation rec { postInstall = '' # Move stuff from DESTDIR to proper location. - # We use rsync to merge the directories. - rsync --archive "${DESTDIR}/etc" "$out" - rm --recursive "${DESTDIR}/etc" - rsync --archive "${DESTDIR}${system}"/* "$out" - rm --recursive "${DESTDIR}${system}"/* - rmdir --parents --ignore-fail-on-non-empty "${DESTDIR}${system}" + # We need to be careful with the ordering to merge without conflicts. for o in $(getAllOutputNames); do - rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" - rm --recursive "${DESTDIR}/''${!o}" + mv "$DESTDIR/''${!o}" "''${!o}" done - # Ensure the DESTDIR is removed. - destdirContainer="$(dirname "${DESTDIR}")" - pushd "$destdirContainer"; rmdir --parents "''${DESTDIR##$destdirContainer/}${builtins.storeDir}"; popd + mv "$DESTDIR/etc" "$out" + mv "$DESTDIR${system}/share"/* "$out/share" + # Ensure we did not forget to install anything. + rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}" "$DESTDIR${system}/share" + ! test -e "$DESTDIR" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/precice/default.nix b/nixpkgs/pkgs/development/libraries/precice/default.nix index 28b5c3fa85e1..885945599e93 100644 --- a/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-D_GNU_SOURCE" ]); + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.isDarwin [ "-D_GNU_SOURCE" ] + # libxml2-2.12 changed const qualifiers + ++ [ "-fpermissive" ] + ); nativeBuildInputs = [ cmake gcc ]; buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ]; diff --git a/nixpkgs/pkgs/development/libraries/proj/7.nix b/nixpkgs/pkgs/development/libraries/proj/7.nix index 4e1ade0bd56b..cfd115638802 100644 --- a/nixpkgs/pkgs/development/libraries/proj/7.nix +++ b/nixpkgs/pkgs/development/libraries/proj/7.nix @@ -46,6 +46,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" ]; + CXXFLAGS = [ + # GCC 13: error: 'int64_t' in namespace 'std' does not name a type + "-include cstdint" + ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix index fedb1b003d96..326f219cddda 100644 --- a/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -15,14 +15,14 @@ , cacert }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "proj"; version = "9.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; - rev = version; + rev = finalAttrs.version; hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ="; }; @@ -45,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: rec { "-DNLOHMANN_JSON_ORIGIN=external" "-DEXE_SQLITE3=${buildPackages.sqlite}/bin/sqlite3" ]; + CXXFLAGS = [ + # GCC 13: error: 'int64_t' in namespace 'std' does not name a type + "-include cstdint" + ]; preCheck = let @@ -64,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: rec { }; meta = with lib; { - changelog = "https://github.com/OSGeo/PROJ/blob/${src.rev}/NEWS"; + changelog = "https://github.com/OSGeo/PROJ/blob/${finalAttrs.src.rev}/NEWS"; description = "Cartographic Projections Library"; homepage = "https://proj.org/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix deleted file mode 100644 index 336a9e63ca63..000000000000 --- a/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: - -stdenv.mkDerivation rec { - pname = "qca-qt5"; - version = "2.3.6"; - - src = fetchurl { - url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-7lnVMdS4L7FoX02NdMLKoHd/UBgA90JuqjchCaQwUkk="; - }; - - buildInputs = [ openssl qtbase ]; - nativeBuildInputs = [ cmake pkg-config ]; - - dontWrapQtApps = true; - - # tells CMake to use this CA bundle file if it is accessible - preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; - - # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) - cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; - - meta = with lib; { - description = "Qt 5 Cryptographic Architecture"; - homepage = "http://delta.affinix.com/qca"; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21Plus; - platforms = with platforms; unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/qca/default.nix b/nixpkgs/pkgs/development/libraries/qca/default.nix new file mode 100644 index 000000000000..6e2afe6f0deb --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qca/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase, qt5compat ? null }: + +let + isQt6 = lib.versions.major qtbase.version == "6"; +in stdenv.mkDerivation rec { + pname = "qca"; + version = "2.3.7"; + + src = fetchurl { + url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz"; + sha256 = "sha256-/uI0O1RofVvj4w+zPOKW7lCseuXiPXq3JfY//fevP0M="; + }; + + buildInputs = [ openssl qtbase qt5compat ]; + nativeBuildInputs = [ cmake pkg-config ]; + + dontWrapQtApps = true; + + # tells CMake to use this CA bundle file if it is accessible + preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; + + cmakeFlags = [ + (lib.cmakeBool "QT6" isQt6) + # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) + "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" + ]; + + meta = with lib; { + description = "Qt Cryptographic Architecture"; + homepage = "https://invent.kde.org/libraries/qca"; + maintainers = with maintainers; [ ttuegel ]; + license = licenses.lgpl21Plus; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix index 8c98fdbdd6f1..863d5f25d286 100644 --- a/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix +++ b/nixpkgs/pkgs/development/libraries/qmltermwidget/default.nix @@ -38,6 +38,14 @@ stdenv.mkDerivation { hash = "sha256-1GjC2mdfP3NpePDWZaT8zvIq3vwWIZs+iQ9o01iQtD4="; }) + # A fix to the above series of patches, to fix a crash in lomiri-terminal-app + # Remove (and update the above fetchpatch) when https://github.com/gber/qmltermwidget/pull/1 merged + (fetchpatch { + name = "0002-qmltermwidget-Mark-ColorSchemeManager-singleton-as-C++-owned.patch"; + url = "https://github.com/gber/qmltermwidget/commit/f3050bda066575eebdcff70fc1c3a393799e1d6d.patch"; + hash = "sha256-O8fEpVLYMze6q4ps7RDGbNukRmZZBjLwqmvRqpp+H+Y="; + }) + # Some files are copied twice to the output which makes the build fails ./do-not-copy-artifacts-twice.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 817129349718..55ff3497baba 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,202 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "c1f8fa2578d99e07f5e581f26bd532695b9534f9", - "sha256": "19wsf9capc8i5157hfp8g735scpcms329ylp0fg86j9qalg7ccwg" + "rev": "e1b1a0d2970fd384bd52c734a72536d8452ad070", + "sha256": "14q7xf6n8giz5v1s23ndibiv4d6g0ds4v88bx5v984319qxyvpqh" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "2ed4be9e852d2533b982493a26bf061b245dc106", - "sha256": "0v6fwykibl4d20sdh10inaavpzwp5ijpyw8k31078shw3hsgkqxf" + "rev": "4fc1cba4c415d84a5879da29f7c459b70fbc15e9", + "sha256": "0mrw7rr6fnjkjxx882ga253kzn4di1agikyq6h9ixwfn2j242qlq" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "3d30862e761afd5fe8451857bb531b6fb8f63dc3", - "sha256": "0sq4dgk88n96wja1wp6j5swxhz8wksf1v4sibywvg7v431nfy82p" + "rev": "12d064b16117c6f3418b494c927ef72cf1927929", + "sha256": "1rcpldpzwbmyww50rh58avmhgj93ks40bwm0bqz7dgwakm4n76lj" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "ea7a183732c17005f08ca14fd70cdd305c90396d", - "sha256": "0lblir4zcnxc2ix9frcsygkhfs5qx7xibpflapmi6d978jjfxjmx" + "rev": "8907dedc858cc344d770a2e826d6acc516429540", + "sha256": "185fmglzb3blfpk6vjd716xr4cx4grxpbqji5idddl4887w18s91" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826", - "sha256": "1igna3qdwpaf67lhj0m743cj127hyg73ynjhadhjk3gz34h12r09" + "rev": "393a84ad5b16a9ec93d8a44bebf1ae86e881bc06", + "sha256": "1ki307wkm3wxf3jc508zgdr5p7fb297hf0rdg5x1hyv7qb03bvxx" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "e33b82889625b6a72e0be91c5023a30d53136a80", - "sha256": "17yxmj1xd2q0a2in6aygp88bsg1vivklmzjwi97llbmvcxxvzhfn" + "rev": "70020cb64f71dcf2fd65a8a167cb785d2127e159", + "sha256": "10kajc98avdz8a7f5ifrrrzwrkdlbsdmiamh7blsnfcix1063ihq" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "d7af24d26b9fbb83bf57b2b7245d280eb78e8b22", - "sha256": "1h85cn4qabva8fcr69b35cmy9c7vbk2fz8licw5ca42bq141k4kw" + "rev": "c887477198cae44585fe9db371db0ddf4c3b205e", + "sha256": "0fkw096w81lzdj7zgc6xfy719lh10x3f7mqm832mjq86h8f3gyc5" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "1b0e366092bcfae0392592c3b7891f0e47af1018", - "sha256": "0fif6gbin3clvy7rfvrs5qdjqvi3ql9yciiwdbm7z0by2kzz1qsg" + "rev": "792a55bb701d233116c3731c7a53ffdb8c67e407", + "sha256": "1d87mkl3dj3ysham1rrfxw07jvc5jqh8g2w8psv5858i29aclyqn" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "c8af0c56f1765302f8bdf874dfacb11c4e0bf4e3", - "sha256": "161wm1pq732nnbx8jbmiv1g1ziqzjwy48dpasy3zgj4i83qyvdas" + "rev": "8a3dfe33cb4f1e81b609f41716a3f0610a50db72", + "sha256": "18x3gn6wv8vm5wfa6hjfzbkxcpclnwi4s3mbbc3hj9yar53hznqp" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "4b52913503e3713200265cd6bc19b301792dbf96", - "sha256": "1n5pafxarhb4rsvr18al4hyc6xmm5nhjkknrnhdldy9vz7w50bgs" + "rev": "8ed95136b3c265b01db6cc33869228f41878e173", + "sha256": "1m774ah9c1didj60rph6p4gibyqgynmdqngqkq1bv1p7m2jkq1ss" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "cce7d784237cd2dd4af1abe2757d048e34e02685", - "sha256": "1yvxpkfxd44z9z44mfv77lfsbgjlmxz1rilblpp8h276zc5w6l5z" + "rev": "e33716bd6bb8926688fef20cb568e11618d08a35", + "sha256": "1klm5rhx6lpc0knhc15lz6sj07znv2d601gbi360wfqkvbi3g78p" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd", - "sha256": "0gz1par4gkcwwbxh0g1n1lrzyjjmi53gqfmbb222gkf5k8kf0r2i" + "rev": "142040e8a652e708ff6e004361f6bcfe85fefdf9", + "sha256": "1vc1ahanm40bh8qj3x2x4d4niihsrjai298alxfcxinfrsmw9m32" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "48a17e88fc1df5b6ae82a9787466226c830bcbf2", - "sha256": "0gn4zsf01xr0g8divixk2zpq97dnqs1cdc3q577ijczd2rcs6z4f" + "rev": "5b27b8921f1f2de93573df903c47aee634209f80", + "sha256": "1w8hq3mdlrdkkykhza4dx0f21j6k697xqqvpm2g2xyk2izadq2m0" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "909b79f4810b8ac62baa3544837793cfb132593b", - "sha256": "1bh5418nshzlgc3xf8yg1c0n70xcazr3ya9fdfn1xs3yhxdxcd8h" + "rev": "db33cc9a4c0bad1006dbc9ed46d71b80ee284df3", + "sha256": "1wjzhk6zn0vh9fjldpi5gi7qlpgfc2gcznh3a7icpbx7n9cc9qh5" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "cc717d0093d796e6bafb65892e6825f146c1d3cd", - "sha256": "1cdal8yfjwgl30fh2s5s45hy1mw70n8bfdsbx8q6j4g062dr16zd" + "rev": "4cb89b861dbdbe8733c62bcdadc0a8d6617528a5", + "sha256": "1pygs8l1nk7mgqcgv7ilwx87i9i8jxwxn2h8fcqqvgn96c5sd9kg" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "f587b18db4abd68cb6d4d77fbcec1b94c38d2a51", - "sha256": "16b3yaq7i0cs9sw8q5f98g9kzphy3kwy0nw6hzznnzpkmg0pgkv1" + "rev": "36603a39aa590c12cbe2b192b56b29edd09a7a6b", + "sha256": "1i6hfddkwf0x74kxz5vrjkc3r507m6icr59p8b6n1bms5y5731j6" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "1e3f2196bd45a5ee272b08b1d82cef29aaa89b61", - "sha256": "1jshzvsa2nnckakiybh6q7f0wdl5p04b6mymxvjzzphr0q32qn75" + "rev": "3fccc9b8fdaff1252fb4a9c516868d0bbbd4384d", + "sha256": "0h0i6r5w2vdmm9nxyk8vzdim739fja4ddf42s9pa25r1vs6i9rdw" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "736144c5827385000e391e9a55a0f0162b7e8112", - "sha256": "1djvj4glxc360my597g81aqjmrhk46447x5s2jj81yiflppvkbny" + "rev": "f563e7f2d1668a3d216e9d396e050df25fd15532", + "sha256": "1kbzf8nadia31sfc4r53p3p733i85w23yznwp2fc2117z81vd9p7" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "f3c3c2041f4800a7fc1904771f5c6af036167dc9", - "sha256": "1xsxhx20spj50jmsqd5f2qa7kmr9rn08c22zkckhrgic73188dpg" + "rev": "d4f5966ba085a1146a04f2ea8449bbf14833a593", + "sha256": "05617q59ldzavm79bf3vgz2sc4paa6d4s0q7adqzpnib6pryr2xj" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "dcc90558d9c0cba41eec7df290943994289b0e87", - "sha256": "0xccglsr1c519lyfg58hj6aa34zfyxc4zff360kd84yxmp8r4y9i" + "rev": "1ca962198a703f591efc7c8f7540fc4120746a00", + "sha256": "1r4z0lfcs1mhdmxgd7saw49p5y2009a0vxn043v0z2w47yrqprb6" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "a2d56960dd76c94a5115b5415be5ee174d377718", - "sha256": "03wikwwf329wzml59hw0mqqzqjqfp95k8bvifi21zgrnjfl8rsrr" + "rev": "134ca5dbef9d137a9c46faa79b0225bc650d9283", + "sha256": "09r6a0vdpyxzrhx6h49v9nyky3xzgm0z1wd320qi3zh7baxxrzm4" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "b1b4b882dabaa036c3fb73c4a879ba8efbb02ded", - "sha256": "07zaziin88y5cq9xy4dsfw2y7njs92qq00mg42350g1s6zqrlbv2" + "rev": "58f4f22662023efe6f223d5ef4a6d0be3708182b", + "sha256": "15braxxp4ldvfqxz7a1xywskycmkwv88cypgaxfipkis9jvaykdi" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "bdc316aca82769b43cb7821c10d80a1ca02b846e", - "sha256": "136izb42sdy42lr5amh343f97s59fwf3mv44dg5n8jwg0mg7s67b" + "rev": "f64e34be9ac4b7e92c63e47235c04471a1d40c93", + "sha256": "1hjg1vimipszcdk89ivq1iym05m9yz2li6chyg52n1wqjm628gx1" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "e8727aabe55526956295407d27317ec15e12b283", - "sha256": "1gyas1prkvnmxlvb90s9qzpy1frk8c4b7n0wnjn0vkfp0cmv3w52" + "rev": "3f56c6b4bd1e3883581340243b4a7289807fffc9", + "sha256": "15yhdp77p4i1as53cssx038hwmqjh2zgh35hrad4mhk4g6za85na" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "a41492b23cde20d1e00427d31e4637d06aea3638", - "sha256": "1p9w444bzgixw6a8qarznnr15ayn22k2limsi5mzqanf3j3bd3ml" + "rev": "3011b16d63cadbb473b6aa3a535b9f0e33170c09", + "sha256": "06d5x03bzbal4npbdl8y74fdizl9phz76q29f798196hjyb0kz05" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "c41785c9f36560722b917d373ee97eed8cc4089a", - "sha256": "05nvzh9lbkbsghpdb3q26nbxgdq5007xak8zxwd3cz9mhqy8xnyc" + "rev": "c64de6ad9f646aaa66fca0500d21cde802a7bb17", + "sha256": "09jp80yrql450bz7c2rfjyyfy0zd59kmrc0lww5ws0lyp95n116y" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "3380465d5d4977326616c5e57789a81681be650e", - "sha256": "06dzraplqhidkngl3sjb3sppqpvc8v8ahrjz06dnsh1dwj8hizh7" + "rev": "c3a7debff7a4c6ddaedb795290180dd99d7ac4be", + "sha256": "1aslr9msddnrkxrlzplbzpfydjkiw1haa67mcsmr2phxkfh05329" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "3b163bfd46d96bc9ee848dcee49e9cabe6699287", - "sha256": "03d4qvxfzwcfgbjdrpq0hvnhbz8bj6diphwiywdp16kvfmp13g9f" + "rev": "c41437acf07c2c4703351b07925fce3ce0e6b75d", + "sha256": "1ihv2k4swbhd4kiaprrjgq8kmx3vrg64y2dqkvg6nd26dfwhxr0f" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "7d6e373c7db9c05ef586db0eb50c87cd894229ad", - "sha256": "1aw9xxfjhm14raj7nivrr1ljnqcmibbbjyrx4bawp58mqbq4as4x" + "rev": "5b1b4a99d6bc98c42a11b7a3f6c9f0b0f9e56f34", + "sha256": "0ji4kaphlqmlpcvcvlqklhzmdlwv712cvsdxnv41fdab6b49yghw" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "38ae810be3fb4984f75b55a16d3413e35d701af1", - "sha256": "0hc65pidlp6lnb3srr2hg3dnas3hdj9cxkp7azcndj3wi36mclwf" + "rev": "bd0ceb7de5d0c918ae596150e95b069dca8b9150", + "sha256": "100qhcdcnnx0l3sl9zl5p3l7707h7vdbjjk7dmy7ap1r0218m5zy" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "56065158ffc4cd0fd78f9edf4b21b77b969f8dbb", - "sha256": "1lyh8hryi6hgw50gz9l6qxjfb72k4a7cg10vw18iffi7yv262g0z" + "rev": "f7745c117041e7adf9705e1de8d71086c160dd9f", + "sha256": "0nx8qdg3m4wf8pynh4pr1j0m0p1y5pws7fnx5mpqccvwgj4bwrdj" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "817378aa10176fd26eed36542bc657e48d9dd42e", - "sha256": "0ihgm8y19zlkp3677rp9hnzm56y74djsnpr78yk0mrbcbxv1hpwb" + "rev": "8b885af5ad3c2f2ff500c060a41e312ea7276e50", + "sha256": "0mh4bva1msczgwl2x3b960rml5rmxnvvzi1wk94cc51888vyajiv" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "4de268cbaf6ff3b633429577f06d3d746a3b202a", - "sha256": "1ris6yxd4igrjvjv7bnxkdr402lk1k0djalkbk5s4z8l4qpavn3y" + "rev": "c84d171fa84065fb3b4b6b3d33e7707676d87e47", + "sha256": "0vxqp5577xig4m0x9pmc04svjy58pi5f0wvc1b4sk61jhj8vib23" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "f84887c1aee4ab04af375e639ae965c9ea2186a5", - "sha256": "0pn4ly4lyf0db9pfb80q45zssifjg3466hnw7ryxnm4331izvbja" + "rev": "6d2f0c3a36d9b2cdcd759a464c608365a0afda98", + "sha256": "1aqhvniysjc14xqcwvqhylcd4lpsl5vsym0spfahxs55s9jsvbyl" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "ddcff45e8f2ca9f229017b3ded62327d2fb50af2", - "sha256": "1ybc94jidzqhrkm0v2daqq0nm34ydqpcgd8q4qhz9abi0ccj17s4" + "rev": "8f879e6bcf941a612c568fbfe2b49ddb1bb409cd", + "sha256": "02glac0m95naxl5c6n22xclxhp7fjl1whf6sf3388h41wwdhv11c" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00", - "sha256": "0pc14sd1dzrw599kdjg1309l9hf9ylp0pnyv7i6s2pyfqqq0x85r" + "rev": "9a7b9972a54137d5f2e0d49559fe58d07c90662e", + "sha256": "1hcf18cls9kmq4xjxzjm2viqs80pxr4ykrzx0vg1bd83bc509vqp" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "f078642eb9a440f6aa88f2beaf10f445de1e29bb", - "sha256": "0qak3y3qaxs6lf34y8rcp922sqd08nvag0lvl7znxm8d5b7qmnn6" + "rev": "53fa44709992faae54e4f5c8a128cea7b6f0cbd5", + "sha256": "12w6znmy2hijcnwqqva8abydcryh6jcp8lhx0kz0m3cvhwpq1fbx" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "1bf19cc6a7972d8543485786418b6631459d3469", - "sha256": "09a6xacb0zsp44w5zz15lkh6sypy7y1xg7m1fkxj2n26wbdc2p52" + "rev": "ee931eba5d129284d5c33157cd7d0b9232fbee7b", + "sha256": "17fyfkm8qfl9jmlq3ppnqwdx47230bk2laikfbq2188vn42yxnqv" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "5fb2e067a38d3583684310130f5d8aad064f512f", - "sha256": "1whfsdmyihnzzy3ijh5wcbsw9ppg3s5nx2insw5yrx36iz0y054d" + "rev": "aaa54153970d1d63a44b873cad5f62ffa71ef9b8", + "sha256": "0q34pi4mqqi4vzk57f59xsk303jgpk1fkxvnvm9r08jkckxxbisw" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2", - "sha256": "0613zb8lzd1i2g5kbn7h39warx7hn1z5qi28zk8l88ivpn84dx4q" + "rev": "6e0917d518e07f737cc663b8d632c8021634fd3b", + "sha256": "062riy66z3v1fxrdnbdhafqdv67xqz12pscidj4fhhp9fzi92a45" } } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix index 130fcd332ba4..5ac474afeda3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.11"; + version = "5.15.12"; mk = name: args: { @@ -70,24 +70,24 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) }; qtscript = rec { - version = "5.15.15"; + version = "5.15.16"; src = fetchFromGitHub { owner = "qt"; repo = "qtscript"; rev = "v${version}-lts"; - hash = "sha256-o2YG1m3LuG9Kq9Bqi1wRa6ceHsivK+hJR7w08NE/kBo="; + hash = "sha256-4Jqsmk5EBQ2Biv69yYCNx7l7AWFikRMBfl0fbZcsSaA="; }; }; qtwebengine = rec { - version = "5.15.15"; + version = "5.15.16"; src = fetchFromGitHub { owner = "qt"; repo = "qtwebengine"; rev = "v${version}-lts"; - hash = "sha256-AmW3u8D9Y8lXZu0aiuxYXNPzZ5GCXeBQGfAcgFuXAh4="; + hash = "sha256-Arg/tfJcx9+CSV1VXBieHNoCSwmWNTnyBdgSkthOdfA="; fetchSubmodules = true; }; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 4adcf8ab0a3b..affb512a22f2 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -131,6 +131,10 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ../patches/qtwebengine-locales-path.patch + + # Cherry-pick libxml 2.12 build fix + # FIXME: remove for 6.7 + ../patches/qtwebengine-libxml-2.12.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch new file mode 100644 index 000000000000..1fc7d837f8f3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch @@ -0,0 +1,22 @@ +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h +@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable { + + void reset(); + +- static void ParseErrorFunc(void* user_data, xmlError*); ++ static void ParseErrorFunc(void* user_data, const xmlError*); + static void GenericErrorFunc(void* user_data, const char* msg, ...); + + // Only for libXSLT callbacks +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc +@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { + // It would be nice to do something with this error message. + } + +-void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { ++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { + FrameConsole* console = static_cast<FrameConsole*>(user_data); + if (!console) + return; diff --git a/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix b/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix index 0841c0d457fd..432023a2ac65 100644 --- a/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix @@ -40,6 +40,7 @@ in stdenv.mkDerivation (finalAttrs: { qtutilities ]; cmakeFlags = [ + "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}" # Current freetype used by NixOS users doesn't support the `.woff2` font # format, so we use ttf. See # https://github.com/NixOS/nixpkgs/pull/174875#discussion_r883423881 diff --git a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix index 1f9ffb373082..564eb31a7139 100644 --- a/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtkeychain/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qtkeychain"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = version; - sha256 = "sha256-LclYOuIYn+jYCvg69uHFlV3VcZ2KWdr8lFyCSBIB7Kw="; + sha256 = "sha256-aRBhg4RwK2jUQWW/OmzNSMUScaFUPdbWbApD37CXPoI="; }; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index cbbd79eb504f..797e9fb891b6 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ + "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/nixpkgs/pkgs/development/libraries/quictls/default.nix b/nixpkgs/pkgs/development/libraries/quictls/default.nix index ab53b5cc9b6b..110ecb4907e1 100644 --- a/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64 then "./Configure BSD-x86_64" else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32 - then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" + then "./Configure BSD-x86" + lib.optionalString stdenv.hostPlatform.isElf "-elf" else if stdenv.hostPlatform.isBSD then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isMinGW diff --git a/nixpkgs/pkgs/development/libraries/readline/8.2.nix b/nixpkgs/pkgs/development/libraries/readline/8.2.nix index 1c53da3cdfa4..72e3370576e7 100644 --- a/nixpkgs/pkgs/development/libraries/readline/8.2.nix +++ b/nixpkgs/pkgs/development/libraries/readline/8.2.nix @@ -1,4 +1,10 @@ -{ fetchurl, stdenv, lib, ncurses +{ lib, stdenv +, fetchpatch, fetchurl +, ncurses, termcap +, curses-library ? + if stdenv.hostPlatform.isWindows + then termcap + else ncurses }: stdenv.mkDerivation rec { @@ -13,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" "info" ]; strictDeps = true; - propagatedBuildInputs = [ ncurses ]; + propagatedBuildInputs = [ curses-library ]; patchFlags = [ "-p0" ]; @@ -27,11 +33,38 @@ stdenv.mkDerivation rec { in import ./readline-8.2-patches.nix patch); - patches = - [ ./link-against-ncurses.patch - ./no-arch_only-8.2.patch - ] - ++ upstreamPatches; + patches = lib.optionals (curses-library.pname == "ncurses") [ + ./link-against-ncurses.patch + ] ++ [ + ./no-arch_only-8.2.patch + ] + ++ upstreamPatches + ++ lib.optionals stdenv.hostPlatform.isWindows [ + (fetchpatch { + name = "0001-sigwinch.patch"; + url = "https://github.com/msys2/MINGW-packages/raw/90e7536e3b9c3af55c336d929cfcc32468b2f135/mingw-w64-readline/0001-sigwinch.patch"; + stripLen = 1; + hash = "sha256-sFK6EJrSNl0KLWqFv5zBXaQRuiQoYIZVoZfa8BZqfKA="; + }) + (fetchpatch { + name = "0002-event-hook.patch"; + url = "https://github.com/msys2/MINGW-packages/raw/3476319d2751a676b911f3de9e1ec675081c03b8/mingw-w64-readline/0002-event-hook.patch"; + stripLen = 1; + hash = "sha256-F8ytYuIjBtH83ZCJdf622qjwSw+wZEVyu53E/mPsoAo="; + }) + (fetchpatch { + name = "0003-fd_set.patch"; + url = "https://github.com/msys2/MINGW-packages/raw/35830ab27e5ed35c2a8d486961ab607109f5af50/mingw-w64-readline/0003-fd_set.patch"; + stripLen = 1; + hash = "sha256-UiaXZRPjKecpSaflBMCphI2kqOlcz1JkymlCrtpMng4="; + }) + (fetchpatch { + name = "0004-locale.patch"; + url = "https://github.com/msys2/MINGW-packages/raw/f768c4b74708bb397a77e3374cc1e9e6ef647f20/mingw-w64-readline/0004-locale.patch"; + stripLen = 1; + hash = "sha256-dk4343KP4EWXdRRCs8GRQlBgJFgu1rd79RfjwFD/nJc="; + }) + ]; meta = with lib; { description = "Library for interactive line editing"; @@ -57,7 +90,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; branch = "8.2"; }; } diff --git a/nixpkgs/pkgs/development/libraries/reproc/default.nix b/nixpkgs/pkgs/development/libraries/reproc/default.nix index 680455d4cb5a..ae920f4cb0d2 100644 --- a/nixpkgs/pkgs/development/libraries/reproc/default.nix +++ b/nixpkgs/pkgs/development/libraries/reproc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake +{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { @@ -12,6 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-LWzBeKhE7cSiZsK8xWzoTdrOcPiU/zEkmi40WiFytic="; }; + patches = [ + (fetchpatch{ + name = "reproc-gcc-13-2.patch"; + url = "https://github.com/DaanDeMeyer/reproc/commit/0b23d88894ccedde04537fa23ea55cb2f8365342.patch"; + sha256 = "sha256-QyC0UcKAWCKSvSvyZTLI2eF/TuuqbGGH6cOQrS2DiCE="; + }) + (fetchpatch{ + name = "reproc-gcc-13-1.patch"; + url = "https://github.com/DaanDeMeyer/reproc/commit/9f399675b821e175f85ac3ee6e3fd2e6056573eb.patch"; + sha256 = "sha256-h/gnDFPWPpUFkys10YXjjEPibgRT1atHSVwbO0kId+U="; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/rure/Cargo.lock b/nixpkgs/pkgs/development/libraries/rure/Cargo.lock index 4b6af3249d38..1dd2aeb38b4e 100644 --- a/nixpkgs/pkgs/development/libraries/rure/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/rure/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "memchr" diff --git a/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix b/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix new file mode 100644 index 000000000000..63f1ed88ae6c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchgit +, fetchpatch +, cargo +, pkg-config +, rustPlatform +, aemu +, gfxstream +, libdrm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rutabaga_gfx"; + version = "0.1.2"; + + src = fetchgit { + url = "https://chromium.googlesource.com/crosvm/crosvm"; + rev = "v${finalAttrs.version}-rutabaga-release"; + fetchSubmodules = true; + hash = "sha256-0RJDKzeU7U6hc6CLKks8QcRs3fxN+/LYUbB0t6W790M="; + }; + + patches = [ + # Make gfxstream optional + # https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4860836 + (fetchpatch { + url = "https://chromium.googlesource.com/crosvm/crosvm/+/c3ad0e43eb12cbf737a6049e0134d483e337363f%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-Ji1bK7jnRlg0OpDfCLcTHfPSiz3zYcdgsWL4n3EoIYI="; + }) + ]; + + nativeBuildInputs = [ cargo pkg-config rustPlatform.cargoSetupHook ]; + buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform gfxstream) ([ + aemu + gfxstream + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ + libdrm + ]); + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + hash = "sha256-wuF3Isrp+u5J8jPQoPsIOWYGNKLSNa2pLfvladAWkLs="; + }; + + # make install always rebuilds + dontBuild = true; + + makeFlags = [ "prefix=$(out)" ]; + + preInstall = '' + cd rutabaga_gfx/ffi + ''; + + meta = with lib; { + homepage = "https://crosvm.dev/book/appendix/rutabaga_gfx.html"; + description = "cross-platform abstraction for GPU and display virtualization"; + license = licenses.bsd3; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.darwin ++ platforms.linux; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 73092a803d66..6c6fa1d6be95 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.56"; + version = "1.4.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-VS/85qu0Dc3HSeD0DYm2f4ur+ZRPhb1Srf7BeK7Pdfk="; + hash = "sha256-Kq4jl/ss+Xf5/zv18QWuIyXZDyz8mk3av4mdRoQrvJY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix index 52c9b4de20a5..d791a7d4e3d6 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix @@ -27,11 +27,18 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack mctc-lib mstore multicharge ]; - postInstall = '' - substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}/" "" + outputs = [ "out" "dev" ]; + + # Fix the Pkg-Config files for doubled store paths + postPatch = '' + substituteInPlace config/template.pc \ + --replace "\''${prefix}/" "" ''; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + doCheck = true; preCheck = '' export OMP_NUM_THREADS=2 diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix index aeb7c8bb6f56..a3726ea5e5dd 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix @@ -22,11 +22,18 @@ stdenv.mkDerivation rec { buildInputs = [ json-fortran ]; - postInstall = '' - substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}/" "" + outputs = [ "out" "dev" ]; + + # Fix the Pkg-Config files for doubled store paths + postPatch = '' + substituteInPlace config/template.pc \ + --replace "\''${prefix}/" "" ''; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix index 86e03df16b0e..948d11435461 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix @@ -21,11 +21,18 @@ stdenv.mkDerivation rec { buildInputs = [ mctc-lib ]; - postInstall = '' - substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}/" "" + outputs = [ "out" "dev" ]; + + # Fix the Pkg-Config files for doubled store paths + postPatch = '' + substituteInPlace config/template.pc \ + --replace "\''${prefix}/" "" ''; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + meta = with lib; { description = "Molecular structure store for testing"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix index f61f11225f1b..b90f073a4f2e 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix @@ -26,11 +26,18 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack mctc-lib mstore ]; - postInstall = '' - substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}/" "" + outputs = [ "out" "dev" ]; + + # Fix the Pkg-Config files for doubled store paths + postPatch = '' + substituteInPlace config/template.pc \ + --replace "\''${prefix}/" "" ''; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + doCheck = true; preCheck = '' export OMP_NUM_THREADS=2 diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix index 94a88bbf819a..9b37f14f1403 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "openmm"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-uNAqjklgBWM2v2z6qu17ZMFO4gn3fsnYPxyGO++UtTw="; + hash = "sha256-pYWBniV1J+UZBOPPjuUxVevONHaclo+GvGBEpr7Zmxg="; }; # "This test is stochastic and may occassionally fail". It does. diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index 1f5e4b250a91..ae5e30d73608 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -26,10 +26,16 @@ stdenv.mkDerivation rec { buildInputs = [ mctc-lib mstore toml-f blas ]; - postInstall = '' - substituteInPlace $out/lib/pkgconfig/s-dftd3.pc \ - --replace "''${prefix}/" "" + outputs = [ "out" "dev" ]; + + # Fix the Pkg-Config files for doubled store paths + postPatch = '' + substituteInPlace config/template.pc \ + --replace "\''${prefix}/" "" ''; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; doCheck = true; preCheck = '' diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix index 7cc64937dc13..bea5793addbf 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { }) ]; + # Fix the Pkg-Config files for doubled store paths + postPatch = '' + substituteInPlace config/template.pc \ + --replace "\''${prefix}/" "" + ''; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ @@ -48,16 +54,17 @@ stdenv.mkDerivation rec { simple-dftd3 ]; + outputs = [ "out" "dev" ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + doCheck = true; preCheck = '' export OMP_NUM_THREADS=2 ''; - postInstall = '' - substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}" "" - ''; - meta = with lib; { description = "Light-weight tight-binding framework"; license = with licenses; [ gpl3Plus lgpl3Plus ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 1aaab46e1d1d..b27b42bf3ae8 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -159,7 +159,7 @@ stdenv.mkDerivation { description = "Matrix Algebra on GPU and Multicore Architectures"; license = licenses.bsd3; homepage = "http://icl.cs.utk.edu/magma/index.html"; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ connorbaker ]; # Cf. https://bitbucket.org/icl/magma/src/fcfe5aa61c1a4c664b36a73ebabbdbab82765e9f/CMakeLists.txt#lines-20 diff --git a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix index 728dff9aa3e5..df645809a445 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix @@ -7,11 +7,11 @@ }: let - suitesparseVersion = "7.4.0"; + suitesparseVersion = "7.5.1"; in stdenv.mkDerivation { pname = "mongoose"; - version = "3.3.0"; + version = "3.3.1"; outputs = [ "bin" "out" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${suitesparseVersion}"; - hash = "sha256-oR/lISsa+0NGueJJyutswxOEQVl8MmSVgb/q3GMUCn4="; + hash = "sha256-6eC26rag9kZ1E4qJ5KY/dLXGld+EHP2OUpyikjXQhQk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix index abc2ff9a3701..45ea5900e286 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart.dev cudaPackages.cuda_cudart.lib + cudaPackages.cuda_cccl.dev cudaPackages.libcublas.dev cudaPackages.libcublas.lib ]; diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index ec44d80d04a8..7c1f7c0d3b40 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = [ maintainers.raskin ]; mainProgram = "gr2fonttest"; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index ec4cc458c4b5..eb4d975a6e01 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.43.2"; + version = "3.44.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA="; + hash = "sha256-HGcZoUi8Qc8PK7vjkm184/XKCdh48SRvzCB2exdbtAc="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index 6028c638a7ec..dd092dd0f043 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.43.2"; + version = "3.44.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-62ZRUj9XpccPJC/Ba8QWuB7QLVkmOb+34JnyAeL5otM="; + hash = "sha256-cxh0c/63RQk1fo+my5/WcVOy0BDQCusv3bbO6xirryc="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/srt/default.nix b/nixpkgs/pkgs/development/libraries/srt/default.nix index d25aab35da22..5ba8039ccff8 100644 --- a/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { # (setting it to an absolute path causes include files to go to $out/$out/include, # because the absolute path is interpreted with root at $out). "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" # TODO Remove this when https://github.com/Haivision/srt/issues/538 is fixed and available to nixpkgs # Workaround for the fact that srt incorrectly disables GNUInstallDirs when LIBDIR is specified, # see https://github.com/NixOS/nixpkgs/pull/54463#discussion_r249878330 diff --git a/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix b/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix index a3144de6366a..55bb9849d919 100644 --- a/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix +++ b/nixpkgs/pkgs/development/libraries/tbb/2020_3.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , fetchFromGitHub , fixDarwinDylibNames @@ -20,30 +21,30 @@ stdenv.mkDerivation rec { patches = [ # Fixes build with Musl. - (fetchurl { + (fetchpatch { url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; - sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs="; + hash = "sha256-Oo5FSBPPBaOziWEBOlRmTmbulExMsAmQWBR5faOj1a0="; }) # Fixes build with Musl. - (fetchurl { + (fetchpatch { url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; - sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; + hash = "sha256-xp8J/il855VTFIKCN/bFtf+vif6HzcVl4t4/L9nW/xk="; }) # Fixes build with upcoming gcc-13: # https://github.com/oneapi-src/oneTBB/pull/833 - (fetchurl { + (fetchpatch { name = "gcc-13.patch"; url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; - sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; + hash = "sha256-LWgf7Rm6Zp4TJdvMqnAkoAebbVS+WV2kB+4iY6jRka4="; }) # Fixes build for aarch64-darwin - (fetchurl { + (fetchpatch { name = "aarch64-darwin.patch"; url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; - sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk="; + hash = "sha256-+sNU8yEsVVmQYOCKmlNiyJfKmB/U0GKAmrydwkfrDFQ="; }) ]; diff --git a/nixpkgs/pkgs/development/libraries/tbb/default.nix b/nixpkgs/pkgs/development/libraries/tbb/default.nix index b6cc969b9f78..5523ae429c26 100644 --- a/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -34,6 +34,16 @@ stdenv.mkDerivation rec { url = "https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/866.patch"; hash = "sha256-e44Yv84Hfl5xoxWWTnLJLSGeNA1RBbah4/L43gPLS+c="; }) + + # Fix build with GCC 13 + (fetchpatch { + url = "https://github.com/oneapi-src/oneTBB/commit/154cc73ca4d359621202399cc0c3c91058e56e79.patch"; + hash = "sha256-BVQQXgBg8T19DGw2gmFkm3KKOuzzJJNOTf/iNIcnHag="; + }) + (fetchpatch { + url = "https://github.com/oneapi-src/oneTBB/commit/e131071769ee3df51b56b053ba6bfa06ae9eff25.patch"; + hash = "sha256-IfV/DDb0luxE1l6TofAbQIeJEVxCxZfZqcONGwQEndY="; + }) ]; # Fix build with modern gcc diff --git a/nixpkgs/pkgs/development/libraries/termcolor/default.nix b/nixpkgs/pkgs/development/libraries/termcolor/default.nix index fbae29f4ca58..f29776226dc2 100644 --- a/nixpkgs/pkgs/development/libraries/termcolor/default.nix +++ b/nixpkgs/pkgs/development/libraries/termcolor/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DTERMCOLOR_TESTS=ON" ]; + CXXFLAGS = [ + # GCC 13: error: 'uint8_t' has not been declared + "-include cstdint" + ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix b/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix deleted file mode 100644 index 5e63893bb232..000000000000 --- a/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "tinyxml-2"; - version = "10.0.0"; - - src = fetchFromGitHub { - repo = "tinyxml2"; - owner = "leethomason"; - rev = version; - sha256 = "sha256-9xrpPFMxkAecg3hMHzzThuy0iDt970Iqhxs57Od+g2g="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly - # (setting it to an absolute path causes include files to go to $out/$out/include, - # because the absolute path is interpreted with root at $out). - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - - meta = { - description = "A simple, small, efficient, C++ XML parser"; - homepage = "https://www.grinninglizard.com/tinyxml2/index.html"; - platforms = lib.platforms.unix; - license = lib.licenses.zlib; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/toml-f/default.nix b/nixpkgs/pkgs/development/libraries/toml-f/default.nix index ed6fc26ee205..28fb3dadce48 100644 --- a/nixpkgs/pkgs/development/libraries/toml-f/default.nix +++ b/nixpkgs/pkgs/development/libraries/toml-f/default.nix @@ -21,11 +21,18 @@ stdenv.mkDerivation rec { buildInputs = [ test-drive ]; - postInstall = '' - substituteInPlace $out/lib/pkgconfig/${pname}.pc \ - --replace "''${prefix}/" "" + outputs = [ "out" "dev" ]; + + # Fix the Pkg-Config files for doubled store paths + postPatch = '' + substituteInPlace config/template.pc \ + --replace "\''${prefix}/" "" ''; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/ubus/default.nix b/nixpkgs/pkgs/development/libraries/ubus/default.nix index bdfe4aa58552..4419b4e67a66 100644 --- a/nixpkgs/pkgs/development/libraries/ubus/default.nix +++ b/nixpkgs/pkgs/development/libraries/ubus/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2023-11-14"; + version = "unstable-2023-11-28"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "b3e8c4ef07ebb6f0f34a5c1f0dc1539068363619"; - hash = "sha256-H/QrLMhdEC1LnSxHpp/90OdKbfHRqLVWUnzyQlsVO8c="; + rev = "f84eb5998c6ea2d34989ca2d3254e56c66139313"; + hash = "sha256-5pIovqIeJczWAA9KQPKFnTnGRrIZVdSNdxBR8AEFtO4="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; diff --git a/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix b/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix index e9f67a74f9a3..6a6407eb32ff 100644 --- a/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { }) ]; + # Fix 'Version:' setting in .pc file. TODO: remove once upstreamed: + # https://github.com/unittest-cpp/unittest-cpp/pull/188 + cmakeFlags = [ "-DPACKAGE_VERSION=${version}" ]; + nativeBuildInputs = [ cmake ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix index 6e9655efe442..638685434463 100644 --- a/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ustream-ssl/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { pname = "ustream-ssl"; - version = "unstable-2023-02-25"; + version = "unstable-2023-11-11"; src = fetchgit { url = "https://git.openwrt.org/project/ustream-ssl.git"; - rev = "498f6e268d4d2b0ad33b430f4ba1abe397d31496"; - hash = "sha256-qwF3pzJ/nUTaJ8NZtgLyXnSozekY3dovxK3ZWHPGORM="; + rev = "263b9a97cf7e1e2467319c23832b705fc01190b5"; + hash = "sha256-RLHU6swNbS3DL3QbKnwU4BbD0EFGKCrHHp0hbnoSssw="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/valhalla/default.nix b/nixpkgs/pkgs/development/libraries/valhalla/default.nix index 8ad3bb9c356c..3a699cd0823d 100644 --- a/nixpkgs/pkgs/development/libraries/valhalla/default.nix +++ b/nixpkgs/pkgs/development/libraries/valhalla/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://valhalla.readthedocs.io/"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; + pkgConfigModules = [ "libvalhalla" ]; platforms = platforms.linux; }; }) diff --git a/nixpkgs/pkgs/development/libraries/vrpn/default.nix b/nixpkgs/pkgs/development/libraries/vrpn/default.nix index f9eed6b2f747..e233269fafd1 100644 --- a/nixpkgs/pkgs/development/libraries/vrpn/default.nix +++ b/nixpkgs/pkgs/development/libraries/vrpn/default.nix @@ -1,22 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, libGLU, libGL }: +{ lib +, stdenv +, fetchFromGitHub +, unzip +, cmake +, darwin +, libGLU +, libGL +}: stdenv.mkDerivation rec { - name = "${pname}-${date}"; - pname = "vrpn"; - date = "2016-08-27"; + pname = "vrpn"; + version = "07.35"; src = fetchFromGitHub { - owner = "vrpn"; - repo = "vrpn"; - rev = "9fa0ab3676a43527301c9efd3637f80220eb9462"; - sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; + owner = "vrpn"; + repo = "vrpn"; + rev = "version_${version}"; + hash = "sha256-vvlwhm5XHWD4Nh1hwY427pe36RQaqTDJiEtkCxHeCig="; }; - nativeBuildInputs = [ cmake unzip ]; - buildInputs = [ libGLU libGL ]; + nativeBuildInputs = [ + cmake + unzip + ]; - doCheck = false; # FIXME: test failure - checkTarget = "test"; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.GLUT + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.OpenGL + ] ++ lib.optionals stdenv.isLinux [ + libGLU + libGL + ]; meta = with lib; { description = "Virtual Reality Peripheral Network"; @@ -27,9 +43,9 @@ stdenv.mkDerivation rec { set of physical devices (tracker, etc.) used in a virtual-reality (VR) system. ''; - homepage = "https://github.com/vrpn/vrpn"; - license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License - platforms = platforms.linux; + homepage = "https://github.com/vrpn/vrpn"; + license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License + platforms = platforms.darwin ++ platforms.linux; maintainers = with maintainers; [ ludo ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/nixpkgs/pkgs/development/libraries/vtk/generic.nix index 02309b275bdc..73fc650844db 100644 --- a/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -55,6 +55,18 @@ in stdenv.mkDerivation { patches = map fetchpatch patchesToFetch; + # GCC 13: error: 'int64_t' in namespace 'std' does not name a type + postPatch = '' + sed '1i#include <cstdint>' \ + -i ThirdParty/libproj/vtklibproj/src/proj_json_streaming_writer.hpp \ + -i IO/Image/vtkSEPReader.h + '' + + optionalString stdenv.isDarwin '' + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c + ''; + dontWrapQtApps = true; # Shared libraries don't work, because of rpath troubles with the current @@ -87,12 +99,6 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; }; - postPatch = optionalString stdenv.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c - ''; - postInstall = optionalString enablePython '' substitute \ ${./vtk.egg-info} \ diff --git a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix index c0b48ea17c6f..551712f89f5f 100644 --- a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake , makeFontsConf , pkg-config @@ -24,6 +25,18 @@ stdenv.mkDerivation rec { hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg="; }; + patches = [ + # Pull fixes for gcc-13 compatibility: + # https://github.com/NilsBrause/waylandpp/pull/71 + # Without the change `kodi` fails to find `uint32_t` in `waylandpp` + # headers. + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/NilsBrause/waylandpp/commit/3c441910aa25f57df2a4db55f75f5d99cea86620.patch"; + hash = "sha256-bxHMP09zCwUKD0M63C1FqQySAN9hr+7t/DyFDRwdtCo="; + }) + ]; + cmakeFlags = [ "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 8b4abf7d5d12..e9265de54c61 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -17,6 +17,7 @@ , xorg , libpng , ffmpeg_4 +, ffmpeg , hwdata , seatd , vulkan-loader @@ -57,7 +58,6 @@ let ++ extraNativeBuildInputs; buildInputs = [ - ffmpeg_4 libGL libcap libinput @@ -116,6 +116,9 @@ rec { wlroots_0_15 = generic { version = "0.15.1"; hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_16 = generic { @@ -125,23 +128,20 @@ rec { substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_17 = generic { - version = "0.17.0"; - hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c="; + version = "0.17.1"; + hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI="; extraBuildInputs = [ + ffmpeg hwdata libliftoff libdisplay-info ]; - patches = [ - (fetchpatch { - name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch"; - hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8="; - }) - ]; }; wlroots = wlroots_0_17; diff --git a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix index 87234d208da3..0a747c1e86a4 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { substituteInPlace wlr-protocols.pc.in \ --replace '=''${pc_sysrootdir}' "=" \ --replace '=@prefix@' "=$out" - - substituteInPlace Makefile \ - --replace 'wlr-output-power-management-v1.xml' 'wlr-output-power-management-unstable-v1.xml' ''; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix index 90fe559c3cf4..a011cf9c2000 100644 --- a/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + '' + # Darwin uses `llvm-strip`, which results in a crash at runtime in assembly-based routines when `-x` is specified. + + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace '$(if $(STRIP), $(STRIP) -x $@)' '$(if $(STRIP), $(STRIP) -S $@)' ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index 73c3b1b57173..243ec53a3234 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -25,6 +25,8 @@ let buildInputs = [ libuuid zlib ]; nativeBuildInputs = [ autoreconfHook ]; + enableParallelBuilding = true; + doCheck = true; env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git diff --git a/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix b/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix index 8940ec270f93..fccf2427c393 100644 --- a/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix +++ b/nixpkgs/pkgs/development/libraries/xeus-zmq/default.nix @@ -13,13 +13,13 @@ clangStdenv.mkDerivation rec { pname = "xeus-zmq"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = "xeus-zmq"; rev = "${version}"; - hash = "sha256-sfGXo6CPJu5TJrkecLLoaQxrGaJbeQG+QiCkltAwuI8="; + hash = "sha256-xavomnqQh5aMrBEyeuwoxrTjsw8wRof3+qxKOsrXqiQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 2a44ffc44382..0af51a40dfb1 100644 --- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -14,7 +14,7 @@ , rPackages }@inputs: -assert ncclSupport -> cudaSupport; +assert ncclSupport -> (cudaSupport && !cudaPackages.nccl.meta.unsupported); # Disable regular tests when building the R package # because 1) the R package runs its own tests and # 2) the R package creates a different binary shared diff --git a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 92b662ac4484..2cf0cc3ef8df 100644 --- a/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool +{ stdenv, fetchurl, fetchpatch, libxml2, gnutls, libxslt, pkg-config, libgcrypt, libtool , openssl, nss, lib, runCommandCC, writeText }: lib.fix (self: @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { patches = [ ./lt_dladdsearchdir.patch + + # Fix build with libxml2 2.12 + (fetchpatch { + url = "https://github.com/lsh123/xmlsec/commit/ffb327376f5bb69e8dfe7f805529e45a40118c2b.patch"; + hash = "sha256-o8CLemOiGIHJsYfVQtNzJNVyk03fdmCbvgA8c3OYxo4="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./remove_bsd_base64_decode_flag.patch ]; postPatch = '' substituteAllInPlace src/dl.c diff --git a/nixpkgs/pkgs/development/libraries/xsimd/default.nix b/nixpkgs/pkgs/development/libraries/xsimd/default.nix index 3a9a90fbe2bc..87da2c546b86 100644 --- a/nixpkgs/pkgs/development/libraries/xsimd/default.nix +++ b/nixpkgs/pkgs/development/libraries/xsimd/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "xsimd"; - version = "11.2.0"; + version = "12.1.1"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; rev = finalAttrs.version; - sha256 = "sha256-CzgfxXGZXoJ56dX+mDPsHZC31YudrZXpX2tovh/Vjr0="; + hash = "sha256-ofUFieeRtpnzNv3Ad5oYwKWb2XcqQHoj601TIhydJyI="; }; patches = [ # Ideally, Accelerate/Accelerate.h should be used for this implementation, diff --git a/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix index 6eaf9f84c6e8..c4d2aa2c5334 100644 --- a/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-EIAeRpmPFodbqQfMOFuGq7cZOnfR9xg8KN+5xa7e9J8="; + hash = "sha256-Auu7DS4qNm9/8t/nCjEJBaXfPPxA18oZr2qqybVY4Es="; }; outputs = [ "out" "dev" "bin" ]; |