diff options
Diffstat (limited to 'pkgs/development/libraries')
759 files changed, 7079 insertions, 10227 deletions
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 9d9233aad20..672facdc230 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchFromGitHub +, fetchurl , cmake , boost , gmp @@ -8,13 +8,11 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.5.2"; + version = "5.5.3"; - src = fetchFromGitHub { - owner = "CGAL"; - repo = "releases"; - rev = "CGAL-${version}"; - sha256 = "sha256-olMPT/8Q0bf+rooJoNc0k8NrO//O7z0yqBoP8KX39yQ="; + src = fetchurl { + url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; + hash = "sha256-CgT2YmkyVjKLBbq/q7XjpbfbL1pY1S48Ug350IKN3XM="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index 680e86dd64e..0ad16067397 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, flex, cmake }: stdenv.mkDerivation { pname = "NSPlist"; @@ -11,7 +11,12 @@ stdenv.mkDerivation { sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; }; - nativeBuildInputs = [ cmake ]; + 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 ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7b741b803de..dea308d59a2 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -9,7 +9,7 @@ , libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , alsa-lib -, x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid +, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid , libX11 , xorgproto , libICE @@ -49,20 +49,22 @@ , audiofile , libiconv , withStatic ? false +# passthru.tests +, testers }: # NOTE: When editing this expression see if the same change applies to # SDL expression too -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.28.3"; + version = "2.28.4"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; - rev = "release-${version}"; - hash = "sha256-/kQ2IyvAfmZ+zIUt1WuEIeX0nYPGXDlAQk2qDsQnFFs="; + rev = "release-${finalAttrs.version}"; + hash = "sha256-1+1m0s3pBCTu924J/4aIu4IHk/N88x2djWDEsDpAJn4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -96,7 +98,7 @@ stdenv.mkDerivation rec { ++ lib.optionals x11Support [ libX11 ]; propagatedBuildInputs = lib.optionals x11Support [ xorgproto ] - ++ dlopenPropagatedBuildInputs; + ++ finalAttrs.dlopenPropagatedBuildInputs; dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ] ++ lib.optional dbusSupport dbus @@ -109,7 +111,7 @@ stdenv.mkDerivation rec { ++ lib.optionals drmSupport [ libdrm mesa ]; buildInputs = [ libiconv ] - ++ dlopenBuildInputs + ++ finalAttrs.dlopenBuildInputs ++ lib.optional ibusSupport ibus ++ lib.optionals waylandSupport [ wayland-protocols ] ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; @@ -120,7 +122,7 @@ stdenv.mkDerivation rec { "--disable-oss" ] ++ lib.optional (!x11Support) "--without-x" ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" - ++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles" + ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles" ++ lib.optional stdenv.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, @@ -156,7 +158,7 @@ stdenv.mkDerivation rec { # list the symbols used in this way. postFixup = let - rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + rpath = lib.makeLibraryPath (finalAttrs.dlopenPropagatedBuildInputs ++ finalAttrs.dlopenBuildInputs); in lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' for lib in $out/lib/*.so* ; do @@ -171,6 +173,9 @@ stdenv.mkDerivation rec { passthru = { inherit openglSupport; updateScript = nix-update-script { extraArgs = ["--version-regex" "release-(.*)"]; }; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -180,5 +185,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; + pkgConfigModules = [ "sdl2" ]; }; -} +}) diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 3d599c39c05..83b57b42c7c 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2 }: +{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_gfx"; version = "1.0.4"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/${pname}/${pname}-${version}.tar.gz"; + url = "http://www.ferzkopp.net/Software/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; }; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { configureFlags = [(if stdenv.hostPlatform.isx86 then "--enable-mmx" else "--disable-mmx")] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "SDL graphics drawing primitives and support functions"; @@ -42,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ cpages ]; platforms = platforms.unix; + pkgConfigModules = [ "SDL2_gfx" ]; }; -} +}) diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index d2dd8d53929..e46b9d9c537 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL }: +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "SDL2_ttf"; version = "2.20.2"; src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; @@ -18,10 +18,15 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) libGL ++ lib.optional stdenv.isDarwin darwin.libobjc; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; platforms = platforms.unix; license = licenses.zlib; homepage = "https://github.com/libsdl-org/SDL_ttf"; + pkgConfigModules = [ "SDL2_ttf" ]; }; -} +}) diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index 919963bb0c9..3f3521de60a 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "SDL_compat"; - version = "1.2.64"; + version = "1.2.68"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl12-compat"; rev = "release-" + version; - hash = "sha256-Ctl7RElRWaB4IpBZD5Sm0rYOcv5zaIag78VTKoFlbVs="; + hash = "sha256-f2dl3L7/qoYNl4sjik1npcW/W09zsEumiV9jHuKnUmM="; }; nativeBuildInputs = [ cmake pkg-config ] diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 91e9f0a3edf..12b50cd476b 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , SDL, libogg, libvorbis, smpeg, libmikmod , fluidsynth, pkg-config , enableNativeMidi ? false @@ -13,6 +13,44 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; + patches = [ + # Fixes implicit declaration of `Mix_QuitFluidSynth`, which causes build failures with clang. + # https://github.com/libsdl-org/SDL_mixer/issues/287 + (fetchpatch { + name = "fluidsynth-fix-implicit-declaration.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/05b12a3c22c0746c29dc5478f5b7fbd8a51a1303.patch"; + hash = "sha256-MDuViLD1w1tAVLoX2yFeJ865v21S2roi0x7Yi7GYRVU="; + }) + # Backport of 2.0 fixes for incompatible function pointer conversions, fixing builds with clang. + (fetchpatch { + name = "fluidsynth-fix-function-pointer-conversions.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/0c504159d212b710a47cb25c669b21730fc78edd.patch"; + hash = "sha256-FSj7JLE2MbGVYCspoq3trXP5Ho+lAtnro2IUOHkto/U"; + }) + # Backport of MikMod fixes, which includes incompatible function pointer conversions. + (fetchpatch { + name = "mikmod-fixes.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/a3e5ff8142cf3530cddcb27b58f871f387796ab6.patch"; + hash = "sha256-dqD8hxx6U2HaelUx0WsGPiWuso++LjwasaAeTTGqdbk"; + }) + # More incompatible function pointer conversion fixes (this time in Vorbis-decoding code). + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9.patch"; + hash = "sha256-rZI3bFb/KxnduTkA/9CISccKHUgrX22KXg69sl/uXvU="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion-header-part.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d.patch"; + hash = "sha256-7HrSHYFYVgpamP7Q9znrFZMZ72jvz5wYpJEPqWev/I4="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-signature.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379.patch"; + hash = "sha256-sGbtF+Tcjf+6a28nJgawefeeKXnhcwu7G55e94oS9AU="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index f358a59ad62..f90be3a751e 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "Xaw3d"; - version = "1.6.3"; + version = "1.6.5"; src = fetchurl { - url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.bz2"; - sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; + url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; + sha256 = "sha256-NIHuS2dTuI4YhW6iZcuE8rAznujDu+yWaxVrOLWEGDM="; }; dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; diff --git a/pkgs/development/libraries/aalib/clang.patch b/pkgs/development/libraries/aalib/clang.patch new file mode 100644 index 00000000000..5f8fa80f387 --- /dev/null +++ b/pkgs/development/libraries/aalib/clang.patch @@ -0,0 +1,74 @@ +diff -ur a/configure b/configure +--- a/configure 2001-04-26 10:44:54.000000000 -0400 ++++ b/configure 2023-10-21 23:19:52.941161475 -0400 +@@ -1005,7 +1005,7 @@ + #line 1006 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +diff -ur a/src/aafire.c b/src/aafire.c +--- a/src/aafire.c 2001-04-26 11:30:03.000000000 -0400 ++++ b/src/aafire.c 2023-10-21 23:46:54.478750904 -0400 +@@ -1,3 +1,4 @@ ++#include <stdlib.h> + #include <stdio.h> + #include "aalib.h" + +diff -ur a/src/aainfo.c b/src/aainfo.c +--- a/src/aainfo.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aainfo.c 2023-10-21 23:31:54.141133353 -0400 +@@ -1,4 +1,4 @@ +- ++#include <stdlib.h> + #include "aalib.h" + #include "aaint.h" + int main(int argc, char **argv) +diff -ur a/src/aakbdreg.c b/src/aakbdreg.c +--- a/src/aakbdreg.c 2023-10-21 23:19:00.787207960 -0400 ++++ b/src/aakbdreg.c 2023-10-21 23:23:49.667253541 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aamoureg.c b/src/aamoureg.c +--- a/src/aamoureg.c 2023-10-21 23:19:00.787725591 -0400 ++++ b/src/aamoureg.c 2023-10-21 23:26:51.821477807 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aaregist.c b/src/aaregist.c +--- a/src/aaregist.c 2023-10-21 23:19:00.788130179 -0400 ++++ b/src/aaregist.c 2023-10-21 23:19:38.929729034 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aasavefont.c b/src/aasavefont.c +--- a/src/aasavefont.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aasavefont.c 2023-10-21 23:51:09.216521714 -0400 +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <stdio.h> + #include "aalib.h" + int main(int argc, char **argv) + { +diff -ur a/src/aatest.c b/src/aatest.c +--- a/src/aatest.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aatest.c 2023-10-21 23:43:16.758422704 -0400 +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <string.h> + #include "aalib.h" + int main(int argc, char **argv) + { diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch index 44559d06210..94b548b35c1 100644 --- a/pkgs/development/libraries/aalib/darwin.patch +++ b/pkgs/development/libraries/aalib/darwin.patch @@ -18,9 +18,9 @@ index def65fe..f4f8efb 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aalib.c b/src/aalib.c index 11fecc8..e3063b4 100644 --- a/src/aalib.c @@ -40,9 +40,9 @@ index 0380828..bb55fe3 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aarec.c b/src/aarec.c index 70f4ebc..ee43e8a 100644 --- a/src/aarec.c @@ -61,9 +61,9 @@ index 54abec0..765155e 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aax.c b/src/aax.c index adcbd82..36e3294 100644 --- a/src/aax.c diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index af0fa617401..903364ea27f 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags - patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang + ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 712f89e383f..59294496f80 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch"; sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc="; }) + ] ++ lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix index d40ca0bd4ab..0c1a173eca4 100644 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix index 7ca25f41404..a605be3c05e 100644 --- a/pkgs/development/libraries/abseil-cpp/202206.nix +++ b/pkgs/development/libraries/abseil-cpp/202206.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix index da5f1fc029e..4676264c26d 100644 --- a/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/pkgs/development/libraries/abseil-cpp/202301.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DABSL_BUILD_TEST_HELPERS=ON" "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" diff --git a/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch b/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch new file mode 100644 index 00000000000..61b57456b3f --- /dev/null +++ b/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch @@ -0,0 +1,12 @@ +diff -ur a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt +--- a/absl/time/CMakeLists.txt 1969-12-31 19:00:01.000000000 -0500 ++++ b/absl/time/CMakeLists.txt 2023-10-30 21:50:32.639061785 -0400 +@@ -55,7 +55,7 @@ + ) + + if(APPLE) +- find_library(CoreFoundation CoreFoundation) ++ set(CoreFoundation "-framework CoreFoundation") + endif() + + absl_cc_library( diff --git a/pkgs/development/libraries/ada/xmlada/default.nix b/pkgs/development/libraries/ada/xmlada/default.nix index e80371e092e..77e8094277a 100644 --- a/pkgs/development/libraries/ada/xmlada/default.nix +++ b/pkgs/development/libraries/ada/xmlada/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "xmlada"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { name = "xmlada-${version}-src"; owner = "AdaCore"; repo = "xmlada"; rev = "v${version}"; - sha256 = "sha256-covcSwlQQjRKTv0DdMEgahXXlch0TeKnvSyOsGO9+e0="; + sha256 = "sha256-vvM7bdf3dAa3zKgxbGeAGlBT6fvafzmleimJHyRdlvc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/agda/1lab/default.nix b/pkgs/development/libraries/agda/1lab/default.nix index 81afbe4886c..b782dfbe064 100644 --- a/pkgs/development/libraries/agda/1lab/default.nix +++ b/pkgs/development/libraries/agda/1lab/default.nix @@ -2,14 +2,13 @@ mkDerivation rec { pname = "1lab"; - version = "unstable-2023-03-07"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "plt-amy"; repo = pname; - # Last commit that compiles with Agda 2.6.3 - rev = "c6ee57a2da327def241324b4775ec2c67cdab2af"; - hash = "sha256-zDqFaDZxAdFxYM6l2zc7ZTi4XwMThw1AQwHfvhOxzdg="; + rev = "c6e0c3c714486fd6c89ace31443428ba48871685"; + hash = "sha256-PC75NtT0e99HVyFedox+6xz/CY2zP2g4Vzqruj5Bjhc="; }; # We don't need anything in support; avoid installing LICENSE.agda diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index ff520fb85ef..2b26a956296 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.7.1a"; + version = "0.1.7.2"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "sha256-VlxRDxXg+unzYlACUU58JQUHXxtg0fI5dEQvlBRxJtU="; + sha256 = "sha256-lQzAfPqkdb0pG5seYVODPngSLrJxhbH1jf0K6qqoj3c="; }; postPatch = '' diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 573b13d3b4f..fcc100e7a7b 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "unstable-2022-01-14"; + version = "unstable-2023-10-04"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; - rev = "3d143d6d0a3f75966602480665623e87233ff93e"; - hash = "sha256-ILhXDq788vrceMp5mCiQUMrJxeLPtS4yGtvMHMYxzg8="; + rev = "ff3b13253612caf0784a06e2d7d0f30be16c32e4"; + hash = "sha256-A05uDv3fJqKncea9AL6eQa0XAskLZwAIUl1OAOVeP8I="; }; preConfigure = '' diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 1ecf4b843c7..50ca17a10a2 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cubical"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { repo = pname; owner = "agda"; rev = "v${version}"; - hash = "sha256-47GOfZYwvE9TbGzdy/xSYZagTbjs/oeDpwjYUvI7z3k="; + hash = "sha256-2quAZ/j7kQaFkh9W5Bj1y7YQj9BT7FwHqVWyj8T4AH8="; }; # The cubical library has several `Everything.agda` files, which are diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 083741d58e9..8d039701d97 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -26,5 +26,6 @@ mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ ryanorendorff ]; + broken = true; }; } diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 76f69f54d71..10fd1034ebe 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - hash = "sha256-vvbyfC5+Yyx18IDikSbAAcTHHtU6krlz45Fd2YlwsBg="; + hash = "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg="; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 4efa425ee28..afd0ad458bf 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-wJVx0rwK0Qk07jlP0DyEAZUrAD+47qcVXSnTh5ngZG8="; + sha256 = "sha256-MND1GtnIGUtRrtyUX1eR9UoGGtuTPtVEIIET3QQ6blA="; }; # note: out is unused (but required for outputDoc anyway) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index f317ae2833a..b6fb92ae62d 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -5,18 +5,18 @@ mkDerivation rec { pname = "alkimia"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lXrcY8C+VN1DPjJoo3MjvlRW5auE7OJ/c6FhapLbhtU="; + sha256 = "sha256-z4Ru6HucxjD1jgvdIzNCloELo7zBdR/i9HIhYYl+4zo="; }; nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; # qtwebengine is not a mandatory dependency, but it adds some features # we might need for alkimia's dependents. See: - # https://github.com/KDE/alkimia/blob/v8.1.1/CMakeLists.txt#L124 + # https://github.com/KDE/alkimia/blob/v8.1.2/CMakeLists.txt#L124 buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ]; propagatedBuildInputs = [ mpir ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index b3346be1bb7..487b0dfde0d 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,10 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc -, libXxf86vm, openal, libGLU, libGL, libjpeg, flac -, libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs +{ lib +, alsa-lib +, cmake +, enet +, fetchFromGitHub +, fetchpatch +, flac +, freetype +, gtk3 +, libGL +, libGLU +, libjpeg +, libopus +, libpng +, libpthreadstubs +, libpulseaudio +, libtheora +, libvorbis +, libwebp +, libX11 +, libXcursor , libXdmcp +, libXext +, libXfixes +, libXi +, libXpm +, libXt +, libXxf86dga +, libXxf86misc +, libXxf86vm +, openal +, pcre +, physfs +, pkg-config +, stdenv +, texinfo +, xorgproto +, zlib }: stdenv.mkDerivation rec { @@ -18,15 +49,45 @@ stdenv.mkDerivation rec { sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ - texinfo zlib libpng libvorbis openal libGLU libGL - libjpeg flac enet libtheora freetype physfs libopus - gtk3 pcre + enet + flac + freetype + gtk3 + libGL + libGLU + libjpeg + libopus + libpng + libtheora + libvorbis + libwebp + openal + pcre + physfs + texinfo + zlib ] ++ lib.optionals stdenv.isLinux [ - libXext xorgproto libX11 libXpm libXt libXcursor alsa-lib - libXxf86dga libXxf86misc libXxf86vm libXi libXfixes - libXdmcp libpulseaudio libpthreadstubs + alsa-lib + libpthreadstubs + libpulseaudio + libX11 + libXcursor + libXdmcp + libXext + libXfixes + libXi + libXpm + libXt + libXxf86dga + libXxf86misc + libXxf86vm + xorgproto ]; postPatch = '' diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index efebd3034cd..41466a9d773 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q3.1"; + version = "2023.Q4.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "W+igZbdQG1L62oGJa2Rz0n8YkTsZFqSm7w8VFfPu8k0="; + sha256 = "5fSz8sksH3K9k0nIx9DUmGGUfIo4Fc4NMettaVqRsY8="; }; buildInputs = [ diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 178b9cf15ec..609d29ed690 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.18.2"; + version = "5.18.3"; src = fetchurl { - sha256 = "sha256-zT3z7C95HUf0NRvA5dX5iAwiCkUaMYIO2/g5li7IQwo="; + sha256 = "sha256-lDOBqm00BwfebELq2/e0G3/fk99gQVbZctUMTaeDVE8="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/applet-window-appmenu/default.nix b/pkgs/development/libraries/applet-window-appmenu/default.nix new file mode 100644 index 00000000000..09185bfb3c2 --- /dev/null +++ b/pkgs/development/libraries/applet-window-appmenu/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, kcoreaddons +, kdeclarative +, kdecoration +, plasma-framework +, plasma-workspace +, libSM +, qtx11extras +, kwindowsystem +, libdbusmenu +, wrapQtAppsHook +}: + +stdenv.mkDerivation { + pname = "applet-window-appmenu"; + version = "unstable-2022-06-27"; + + src = fetchFromGitHub { + owner = "psifidotos"; + repo = "applet-window-appmenu"; + rev = "1de99c93b0004b80898081a1acfd1e0be807326a"; + hash = "sha256-PLlZ2qgdge8o1mZOiPOXSmTQv1r34IUmWTmYFGEzNTI="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + wrapQtAppsHook + ]; + + buildInputs = [ + kcoreaddons + kdeclarative + kdecoration + kwindowsystem + plasma-framework + plasma-workspace + libSM + qtx11extras + libdbusmenu + ]; + + meta = with lib; { + description = "Plasma 5 applet in order to show window menu in your panels"; + homepage = "https://github.com/psifidotos/applet-window-appmenu"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ greydot ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/apr-util/clang-bdb.patch b/pkgs/development/libraries/apr-util/clang-bdb.patch new file mode 100644 index 00000000000..02e9c8378c6 --- /dev/null +++ b/pkgs/development/libraries/apr-util/clang-bdb.patch @@ -0,0 +1,12 @@ +diff -ur a/build/dbm.m4 b/build/dbm.m4 +--- a/build/dbm.m4 2013-11-23 13:00:53.000000000 -0500 ++++ b/build/dbm.m4 2023-10-22 20:16:37.764571446 -0400 +@@ -235,7 +235,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <$apu_try_berkeley_db_header> +-main () ++int main () + { + int major, minor, patch; + diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index b44b410d30e..a1cbbc5e664 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -19,15 +19,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU="; }; - patches = [ ./fix-libxcrypt-build.patch ] - ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; + patches = [ + ./fix-libxcrypt-build.patch + # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors. + ./clang-bdb.patch + ] ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook; + nativeBuildInputs = [ makeWrapper autoreconfHook ]; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ lib.optional (!stdenv.isCygwin) "--with-crypto" diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index a7acff5fa3d..8baf539b26e 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.28"; + version = "0.8.30"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-EgKZcylg3Nx320BdeEz8PVadwo2pE6a3h0vt7YT4LVA="; + sha256 = "sha256-1OxvLpzEKxIXiLJIUr+hCx+sxnH9Z5dBM5Lug1acCok="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/argagg/0001-catch.diff b/pkgs/development/libraries/argagg/0001-catch.diff deleted file mode 100644 index f99649d5681..00000000000 --- a/pkgs/development/libraries/argagg/0001-catch.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old/test/doctest.h 2019-03-05 18:04:06.143740733 +0300 -+++ new/test/doctest.h 2019-03-05 18:04:43.577284916 +0300 -@@ -1307,7 +1307,7 @@ - __FILE__, __LINE__, #expr, #as); \ - try { \ - expr; \ -- } catch(as) { \ -+ } catch(as e) { \ - _DOCTEST_RB.m_threw = true; \ - _DOCTEST_RB.m_threw_as = true; \ - } catch(...) { _DOCTEST_RB.m_threw = true; } \ -@@ -1332,7 +1332,7 @@ - #define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS) - - #define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS) --#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS) -+#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, const ex &, DT_CHECK_THROWS_AS) - #define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS) - - #define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW) diff --git a/pkgs/development/libraries/argagg/default.nix b/pkgs/development/libraries/argagg/default.nix deleted file mode 100644 index 7ff9eaac1e3..00000000000 --- a/pkgs/development/libraries/argagg/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "argagg"; - version = "0.4.6"; - - src = fetchFromGitHub { - owner = "vietjtnguyen"; - repo = pname; - rev = version; - hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o="; - }; - - patches = [ - # Fix compilation of macro catch statement - ./0001-catch.diff - ]; - - nativeBuildInputs = [ - cmake - ]; - - meta = with lib; { - homepage = "https://github.com/vietjtnguyen/argagg"; - description = "Argument Aggregator"; - longDescription = '' - argagg is yet another C++ command line argument/option parser. It was - written as a simple and idiomatic alternative to other frameworks like - getopt, Boost program options, TCLAP, and others. The goal is to achieve - the majority of argument parsing needs in a simple manner with an easy to - use API. It operates as a single pass over all arguments, recognizing - flags prefixed by - (short) or -- (long) and aggregating them into easy to - access structures with lots of convenience functions. It defers processing - types until you access them, so the result structures end up just being - pointers into the original command line argument C-strings. - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; all; - badPlatforms = [ "aarch64-darwin" ]; - }; -} diff --git a/pkgs/development/libraries/argparse/default.nix b/pkgs/development/libraries/argparse/default.nix index a52dc730f73..16a4f3b7a21 100644 --- a/pkgs/development/libraries/argparse/default.nix +++ b/pkgs/development/libraries/argparse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "argparse"; - version = "2.9"; + version = "3.0"; src = fetchFromGitHub { owner = "p-ranav"; repo = "argparse"; rev = "v${version}"; - sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E="; + sha256 = "sha256-0fgMy7Q9BiQ/C1tmhuNpQgad8yzaLYxh5f6Ps38f2mk="; }; postPatch = '' diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix deleted file mode 100644 index 9752b960039..00000000000 --- a/pkgs/development/libraries/argtable/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation rec { - pname = "argtable"; - version = "3.2.1"; - srcVersion = "v${version}.52f24e5"; - - src = fetchFromGitHub { - owner = "argtable"; - repo = "argtable3"; - rev = srcVersion; - hash = "sha256-HFsk91uJXQ0wpvAQxP4/yZwRQx9kLH7KgB3Y/+zcZC0="; - }; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - - postPatch = '' - patchShebangs tools/build - ''; - - meta = with lib; { - homepage = "https://github.com/argtable/argtable3"; - description = "A single-file, ANSI C command-line parsing library"; - longDescription = '' - Argtable is an open source ANSI C library that parses GNU-style - command-line options. It simplifies command-line parsing by defining a - declarative-style API that you can use to specify what your command-line - syntax looks like. Argtable will automatically generate consistent error - handling logic and textual descriptions of the command line syntax, which - are essential but tedious to implement for a robust CLI program. - ''; - license = with licenses; bsd3; - maintainers = with maintainers; [ AndersonTorres artuuge ]; - platforms = with platforms; all; - }; -} -# TODO: a NixOS test suite -# TODO: multiple outputs -# TODO: documentation -# TODO: build both shared and static libs diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index d5ee431e2ba..76bf38cce16 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.6.0"; + version = "12.6.5"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-tBAqOEeRrxbZ5fuzBvEf41ar+8oKfXynq7yaipRmECo="; + hash = "sha256-9vHJh/m8K1LpcYg1zEFqUlz1im1XWoUdIZwMarW4xWM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch b/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch deleted file mode 100644 index 32c0a4cab58..00000000000 --- a/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindprotobufAlt.cmake -similarity index 60% -rename from cmake_modules/FindProtobufAlt.cmake -rename to cmake_modules/FindprotobufAlt.cmake -index 15fe1b4f2..19bdd6291 100644 ---- a/cmake_modules/FindProtobufAlt.cmake -+++ b/cmake_modules/FindprotobufAlt.cmake -@@ -16,24 +16,24 @@ - # under the License. - - if(ARROW_PROTOBUF_USE_SHARED) -- set(Protobuf_USE_STATIC_LIBS OFF) -+ set(protobuf_USE_STATIC_LIBS OFF) - else() -- set(Protobuf_USE_STATIC_LIBS ON) -+ set(protobuf_USE_STATIC_LIBS ON) - endif() - - set(find_package_args) --if(ProtobufAlt_FIND_VERSION) -- list(APPEND find_package_args ${ProtobufAlt_FIND_VERSION}) -+if(protobufAlt_FIND_VERSION) -+ list(APPEND find_package_args ${protobufAlt_FIND_VERSION}) - endif() --if(ProtobufAlt_FIND_QUIETLY) -+if(protobufAlt_FIND_QUIETLY) - list(APPEND find_package_args QUIET) - endif() --find_package(Protobuf ${find_package_args}) --set(ProtobufAlt_FOUND ${Protobuf_FOUND}) --if(ProtobufAlt_FOUND) -- set(ProtobufAlt_VERSION ${Protobuf_VERSION}) -- set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR}) -- set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR}) -- set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH}) -- set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK}) -+find_package(protobuf ${find_package_args} CONFIG) -+set(protobufAlt_FOUND ${protobuf_FOUND}) -+if(protobufAlt_FOUND) -+ set(protobufAlt_VERSION ${protobuf_VERSION}) -+ set(protobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR}) -+ set(protobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR}) -+ set(protobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH}) -+ set(protobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK}) - endif() -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 94f926039..8efc98323 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -63,7 +63,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - opentelemetry-cpp - ORC - re2 -- Protobuf -+ protobuf - RapidJSON - Snappy - Substrait -@@ -189,7 +189,7 @@ macro(build_dependency DEPENDENCY_NAME) - build_opentelemetry() - elseif("${DEPENDENCY_NAME}" STREQUAL "ORC") - build_orc() -- elseif("${DEPENDENCY_NAME}" STREQUAL "Protobuf") -+ elseif("${DEPENDENCY_NAME}" STREQUAL "protobuf") - build_protobuf() - elseif("${DEPENDENCY_NAME}" STREQUAL "RapidJSON") - build_rapidjson() -@@ -1722,7 +1722,7 @@ if(ARROW_WITH_PROTOBUF) - # "3" for 3.12.0 are different. So 23.4 is rejected with 3.12.0. If - # we use FORCE_ANY_NEWER_VERSION here, we can bypass the check and - # use 23.4. -- resolve_dependency(Protobuf -+ resolve_dependency(protobuf - FORCE_ANY_NEWER_VERSION - TRUE - HAVE_ALT -@@ -1732,7 +1732,7 @@ if(ARROW_WITH_PROTOBUF) - PC_PACKAGE_NAMES - protobuf) - -- if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) -+ if(NOT protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) - add_definitions(-DPROTOBUF_USE_DLLS) - endif() - -@@ -1768,8 +1768,8 @@ if(ARROW_WITH_PROTOBUF) - message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}") - get_target_property(PROTOBUF_TYPE ${ARROW_PROTOBUF_LIBPROTOBUF} TYPE) - if(NOT STREQUAL "INTERFACE_LIBRARY") -- # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake -- message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}") -+ # protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake -+ message(STATUS "Found libprotoc: ${protobuf_PROTOC_LIBRARY}") - get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION) - message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") - message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") -@@ -3986,7 +3986,7 @@ endmacro() - - if(ARROW_WITH_GRPC) - set(ARROW_GRPC_REQUIRED_VERSION "1.30.0") -- if(NOT Protobuf_SOURCE STREQUAL gRPC_SOURCE) -+ if(NOT protobuf_SOURCE STREQUAL gRPC_SOURCE) - # ARROW-15495: Protobuf/gRPC must come from the same source - message(STATUS "Forcing gRPC_SOURCE to Protobuf_SOURCE (${Protobuf_SOURCE})") - set(gRPC_SOURCE "${Protobuf_SOURCE}") diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index ddf8db98b39..4cc55effdaa 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -78,11 +78,11 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "13.0.0"; + version = "14.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-Nd/aGRJip1a+k07viv7o0JdiytJQIdqmJuskniUayeY="; + hash = "sha256-XHDq+xAR+dEkuvsyiv5U9izFuSgLcIDh49Zo94wOQH4="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -115,15 +115,10 @@ stdenv.mkDerivation rec { ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.20.0"; - hash = "sha256-71hAwJ0cGvpwK/ibeeQt82e9uqxcu9sM1rPtPENMPfs="; + rev = "v0.27.0"; + hash = "sha256-wptEAXembah04pzqAz6UHeUxp+jMf6Lh/IdyuIhy/a8="; }; - patches = [ - # Protobuf switched to lower case project name. - ./cmake-find-protobuf.patch - ]; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 9d57891905a..ec2d5561570 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "assimp"; - version = "5.2.5"; + version = "5.3.1"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-vQx+PaET5mlvvIGHk6pEnZvM3qw8DiC3hd1Po6OAHxQ="; + hash = "sha256-/1A8n7oe9WsF3FpbLZxhifzrdj38t9l5Kc8Q5jfDoyY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index d4c3cd394ce..2a47de8d564 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -7,7 +7,7 @@ , pkg-config , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gsettings-desktop-schemas , makeWrapper , dbus diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 2e8bdc50ca6..89f81e26de4 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { dontAddWafCrossFlags = true; wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; + postPatch = '' + # U was removed in python 3.11 because it had no effect + substituteInPlace waflib/*.py \ + --replace "m='rU" "m='r" \ + --replace "'rU'" "'r'" + ''; + meta = with lib; { description = "Library for audio labelling"; homepage = "https://aubio.org/"; diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix index a10aace767b..0f420745bae 100644 --- a/pkgs/development/libraries/audio/game-music-emu/default.nix +++ b/pkgs/development/libraries/audio/game-music-emu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, removeReferencesTo }: +{ lib, stdenv, fetchurl, cmake, removeReferencesTo, zlib }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ]; + cmakeFlags = [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake removeReferencesTo ]; + buildInputs = [ zlib ]; # It used to reference it, in the past, but thanks to the postFixup hook, now # it doesn't. diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index a5ecbdcfccc..8955c8876ad 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-QEfkeofsVxB9gyISL/P7bvnbcBuG7Q3A4UoAyQAXxgE="; + hash = "sha256-eXMGwa6lOtKoUCcHR9BM2S3NWAZkGyZzF3FAjYaWTvg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index bb5a4e0dd53..b8b89abc8ea 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.2"; + version = "0.7.3"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-UJFD5aTzsT3Zjq4om/7BtWTt3XG7x8p4ZLgoNeMTMOE="; + hash = "sha256-LPg2m3kWsJJk8/FLn7bO81pum+4DKN7E9J2YIRzP1yI="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 14b0d4c5e46..a0869edf4fb 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook +{ lib +, stdenv +, fetchurl +, lv2 +, meson +, ninja +, pkg-config +, python3 +, libsndfile +, serd +, sord +, sratom +, gitUpdater # test derivations , pipewire @@ -6,24 +18,29 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.12"; + version = "0.24.20"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE="; + url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; + hash = "sha256-T7CCubiyhuqSu7cb3mt1Ykzsq23wzGOe51oqCWIS7rw="; }; - patches = [ ./lilv-pkgconfig.patch ]; - - nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ serd sord sratom ]; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; + buildInputs = [ libsndfile serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; - dontAddWafCrossFlags = true; - passthru.tests = { - inherit pipewire; + mesonFlags = [ "-Ddocs=disabled" ]; + + passthru = { + tests = { + inherit pipewire; + }; + updateScript = gitUpdater { + url = "https://gitlab.com/lv2/lilv.git"; + rev-prefix = "v"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch deleted file mode 100644 index a5a8c6007e4..00000000000 --- a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/lilv.pc.in -+++ b/lilv.pc.in -@@ -9 +9,2 @@ Description: Simple C library for hosting LV2 plugins --Requires: @LILV_PKG_DEPS@ -+Requires: lv2 -+Requires.private: @LILV_PKG_DEPS@ diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index 59f7d169291..01a3933fe2b 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { "LIBDIR=${placeholder "out"}/lib" ]; + postInstall = '' + mv $out/include/qm-dsp/* $out/include + rmdir $out/include/qm-dsp + ''; + env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; meta = with lib; { diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 075ce33ef9e..70054134767 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cd source substituteInPlace Makefile \ --replace 'ldconfig' "" - '' + lib.optionalString (!stdenv.targetPlatform.isx86_64) '' + '' + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' substituteInPlace Makefile \ --replace '-DENABLE_SSE2' "" ''; diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/development/libraries/audio/zix/default.nix index 44b8812b29e..9f5d8867a15 100644 --- a/pkgs/development/libraries/audio/zix/default.nix +++ b/pkgs/development/libraries/audio/zix/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "zix"; - version = "unstable-2023-02-13"; + version = "0.4.2"; src = fetchFromGitLab { owner = "drobilla"; repo = pname; - rev = "262d4a1522c38be0588746e874159da5c7bb457d"; - hash = "sha256-3vuefgnirM4ksK3j9sjBHgOmx0JpL+6tCPb69/7jI00="; + rev = "v${version}"; + hash = "sha256-nMm3Mdqc4ncCae8SoyGxZYURzmXLNcp1GjsSExfB6x4="; }; nativeBuildInputs = [ @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; + env = lib.optionalAttrs stdenv.isDarwin { + # Do not fail the build on clang-16/darwin. + # TODO: drop the workaround when upstream fixes it in: + # https://gitlab.com/drobilla/zix/-/issues/3 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "A lightweight C99 portability and data structure library"; homepage = "https://gitlab.com/drobilla/zix"; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index c6d656388d4..f9974e2ca25 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; + # std::unary_function has been removed in c++17 + makeFlags = [ "CXXFLAGS=-std=c++11" ]; + # Even when statically linking, libstdc++.la is put in dependency_libs here, # and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the # compiler do what it does best. (libaudiofile.la is a generated file, so we diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 9f5a68187c0..944182e1412 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-nx+ZqXsmcS0tQ/5+ck8Z19vdXO81R4uuRqGSDfIEV/U="; + sha256 = "sha256-chfKrPt9XzRhF2ZHOmbC4nm8e/rxuimMfwSzsvulc2U="; }; postPatch = '' diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index df43976e6cf..2c76371955c 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-xwPMuaaKzypxJK9mTKD4tJZjzl19pu60seGtS2QFjgI="; + sha256 = "sha256-4YuOC90FBcuNYGBsqw3wKYNGkg3MssezvR8bu6BNGeM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/development/libraries/backward-cpp/default.nix index 125e3799f57..15556a4108c 100644 --- a/pkgs/development/libraries/backward-cpp/default.nix +++ b/pkgs/development/libraries/backward-cpp/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bombela/backward-cpp"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index f3b138d2748..e473fa97a0e 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.2.98"; + version = "5.2.109"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-j1vVd9UcwmP3tGGN6NApiMyOql8vYljTqj3CKor1Ckk="; + hash = "sha256-OwwSGzMFwR2ajUUgAy7ea/Q2pWxn3DO72W7ukcjBJnU="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index ef174d1118a..48865cf8356 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation ( finalAttrs: { buildPhase = '' runHook preBuild - ./build.sh ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} - ./build.sh -shared ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} + ./build.sh ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} + ./build.sh -shared ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} runHook postBuild ''; diff --git a/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/pkgs/development/libraries/boost-ext/boost-sml/default.nix index fd69db12d3c..0383adca64a 100644 --- a/pkgs/development/libraries/boost-ext/boost-sml/default.nix +++ b/pkgs/development/libraries/boost-ext/boost-sml/default.nix @@ -7,15 +7,13 @@ stdenv.mkDerivation rec { pname = "boost-sml"; - # This is first commit since 1.1.6 that passes all tests (test_policies_logging is commented out) - version = "1.1.6"; - working_tests = "24d762d1901f4f6afaa5c5e0d1b7b77537964694"; + version = "1.1.9"; src = fetchFromGitHub { owner = "boost-ext"; repo = "sml"; - rev = "${working_tests}"; - hash = "sha256-ZhIfyYdzrzPTAYevOz5I6tAcUiLRMV8HENKX9jychEY="; + rev = "v${version}"; + hash = "sha256-RYgSpnsmgZybpkJALIzxpkDRfe9QF2FHG+nA3msFaK0="; }; buildInputs = [ boost ]; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 43cb3e95e98..5cb04d05a08 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -10,17 +10,18 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md buildGoModule { pname = "boringssl"; - version = "2021-07-09"; + version = "unstable-2023-09-27"; src = fetchgit { - url = "https://boringssl.googlesource.com/boringssl"; - rev = "268a4a6ff3bd656ae65fe41ef1185daa85cfae21"; - sha256 = "04fja4fdwhc69clmvg8i12zm6ks3sfl3r8i5bxn4x63b9dj5znlx"; + url = "https://boringssl.googlesource.com/boringssl"; + rev = "d24a38200fef19150eef00cad35b138936c08767"; + hash = "sha256-FBQ7y4N2rCM/Cyd6LBnDUXpSa2O3osUXukECTBjZL6s="; }; nativeBuildInputs = [ cmake ninja perl ]; - vendorHash = null; + vendorHash = "sha256-EJPcx07WuvHPAgiS1ASU6WHlHkxjUOO72if4TkmrqwY="; + proxyVendor = true; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix index 139c002bb3b..a9b6a7aa27d 100644 --- a/pkgs/development/libraries/botan/3.0.nix +++ b/pkgs/development/libraries/botan/3.0.nix @@ -1,9 +1,9 @@ { callPackage, fetchpatch, lib, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "3.1"; - revision = "1"; - sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms="; + baseVersion = "3.2"; + revision = "0"; + sha256 = "BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. badPlatforms = lib.platforms.darwin; }) diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index bff3a490b27..753dda572d4 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.19.0"; + version = "0.19.4"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-pGX8BjDupJb7rmaxig0XX9RCKiIw2GjM4TVmcB5HJ+I="; + hash = "sha256-Qi3nyUSwrYBy8lCP+R6/u/WtnZJcgSwb07pZVScAzcU="; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { "-DCAF_ENABLE_EXAMPLES:BOOL=OFF" ]; - doCheck = true; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + + doCheck = !stdenv.isDarwin; checkTarget = "test"; meta = with lib; { diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 69a8978ae62..017b4cf46a7 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,12 +1,8 @@ -{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv -, libintl, expat, zlib, libpng, pixman, fontconfig, freetype -, x11Support? !stdenv.isDarwin, libXext, libXrender +{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3 +, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib +, x11Support? !stdenv.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib -, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) -, libGL # libGLU libGL is no longer a big dependency -, pdfSupport ? true +, xcbSupport ? x11Support, libxcb , darwin , testers }: @@ -17,82 +13,27 @@ in stdenv.mkDerivation (finalAttrs: let inherit (finalAttrs) pname version; in { pname = "cairo"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; - sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; + hash = "sha256-JDoHNrl4oz3uKfnMp1IXM7eKZbVBggb+970cPUzxC2Q="; }; - patches = [ - # Fixes CVE-2018-19876; see Nixpkgs issue #55384 - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2018-19876 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 - # - # This patch is the merged commit from the above PR. - (fetchpatch { - name = "CVE-2018-19876.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; - hash = "sha256-wZ51BZWlXByFY3/CTn7el2A9aYkwL1FygJ2zqnN+UIQ="; - }) - - # Fix PDF output. - # https://gitlab.freedesktop.org/cairo/cairo/issues/342 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; - hash = "sha256-yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; - }) - - # Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364. - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2020-35492 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/85 - (fetchpatch { - name = "CVE-2020-35492.patch"; - includes = [ "src/cairo-image-compositor.c" ]; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; - hash = "sha256-cXKzLMENx4/BHXLZg3Kfkx3esCnaNaB7WvjNfL77FhE="; - }) - - # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 - ./skip-configure-stderr-check.patch - - # Fixes cairo crash on macOS Big Sur - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; - hash = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; - }) - - # Fix clang build failures on newer LLVM versions - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/119 - (fetchpatch { - name = "fix-types.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/38e486b34d435130f2fb38c429e6016c3c82cd53.patch"; - hash = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo="; - }) - - # Fix unexpected color addition on grayscale images (usually text). - # Upstream fix: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/114 - # Can be removed after 1.18 release - (fetchpatch { - name = "fix-grayscale-anialias.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff"; - hash = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM="; - }) - - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small separateDebugInfo = true; nativeBuildInputs = [ + gtk-doc + meson + ninja pkg-config + python3 ]; buildInputs = [ - libiconv - libintl + docbook_xsl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText @@ -100,49 +41,53 @@ in { Carbon ]); - propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ] + propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ] ++ optionals x11Support [ libXext libXrender ] - ++ optionals xcbSupport [ libxcb xcbutil ] + ++ optionals xcbSupport [ libxcb ] ++ optional gobjectSupport glib - ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = [ - "--enable-tee" - ] ++ (if stdenv.isDarwin then [ - "--disable-dependency-tracking" - "--enable-quartz" - "--enable-quartz-font" - "--enable-quartz-image" - "--enable-ft" - ] else (optional xcbSupport "--enable-xcb" - ++ optional glSupport "--enable-gl" - ++ optional pdfSupport "--enable-pdf" - )) ++ optional (!x11Support) "--disable-xlib"; - - preConfigure = - # On FreeBSD, `-ldl' doesn't exist. - lib.optionalString stdenv.isFreeBSD - '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in - do - cat "$i" | sed -es/-ldl//g > t - mv t "$i" - done - '' - + - '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' - substituteInPlace configure --replace strings $STRINGS - ''; + mesonFlags = [ + "-Dgtk_doc=true" + + # error: #error config.h must be included before this header + "-Dsymbol-lookup=disabled" + + # Only used in tests, causes a dependency cycle + "-Dspectre=disabled" + + (lib.mesonEnable "glib" gobjectSupport) + (lib.mesonEnable "tests" finalAttrs.doCheck) + (lib.mesonEnable "xlib" x11Support) + (lib.mesonEnable "xcb" xcbSupport) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--cross-file=${builtins.toFile "cross-file.conf" '' + [properties] + ipc_rmid_deferred_release = ${ + { + linux = "true"; + freebsd = "true"; + netbsd = "false"; + }.${stdenv.hostPlatform.parsed.kernel.name} or + (throw "Unknown value for ipc_rmid_deferred_release") + } + ''}" + ]; + + preConfigure = '' + patchShebangs version.py + ''; enableParallelBuilding = true; doCheck = false; # fails - postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; + postInstall = '' + # Work around broken `Requires.private' that prevents Freetype + # `-I' flags to be propagated. + sed -i "$out/lib/pkgconfig/cairo.pc" \ + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' + '' + lib.optionalString stdenv.isDarwin glib.flattenInclude; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -151,9 +96,8 @@ in { longDescription = '' Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. + Window System, XCB, Quartz, Win32, image buffers, PostScript, + PDF, and SVG file output. Cairo is designed to produce consistent output on all output media while taking advantage of display hardware acceleration @@ -162,10 +106,10 @@ in { homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; pkgConfigModules = [ + "cairo-pdf" "cairo-ps" "cairo-svg" - ] ++ lib.optional gobjectSupport "cairo-gobject" - ++ lib.optional pdfSupport "cairo-pdf"; + ] ++ lib.optional gobjectSupport "cairo-gobject"; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index f21c3955836..05e80893ebb 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.10.4"; + version = "1.0.1"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "sha256-45sxnVyyYIw9i3sbFZ1naBMoUzkpP21WarzR5crg4X8="; + sha256 = "sha256-ZruJikcMZuUBmNq+f6+wUl4Rr6MVFxmgcj1TSOKM1ZE="; }; nativeBuildInputs = [ cmake ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/pkgs/development/libraries/cassandra-cpp-driver/default.nix index ce310593e22..4e8175d0585 100644 --- a/pkgs/development/libraries/cassandra-cpp-driver/default.nix +++ b/pkgs/development/libraries/cassandra-cpp-driver/default.nix @@ -9,13 +9,13 @@ , examples ? false }: stdenv.mkDerivation rec { pname = "cassandra-cpp-driver"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "datastax"; repo = "cpp-driver"; rev = "refs/tags/${version}"; - sha256 = "sha256-sLKLaBFnGq3NIQV7Tz5aAfsL+LeLw8XDbcJt//H468k="; + sha256 = "sha256-GuvmKHJknudyn7ahrn/8+kKUA4NW5UjCfkYoX3aTE+Q="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/catboost/default.nix b/pkgs/development/libraries/catboost/default.nix new file mode 100644 index 00000000000..fc18eef2ca8 --- /dev/null +++ b/pkgs/development/libraries/catboost/default.nix @@ -0,0 +1,113 @@ +{ lib +, config +, stdenv +, fetchFromGitHub +, cmake +, libiconv +, llvmPackages +, ninja +, openssl +, python3Packages +, ragel +, yasm +, zlib +, cudaSupport ? config.cudaSupport +, cudaPackages ? {} +, pythonSupport ? false +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "catboost"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "catboost"; + repo = "catboost"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-A1zCIqPOW21dHKBQHRtS+/sstZ2o6F8k71lmJFGn0+g="; + }; + + patches = [ + ./remove-conan.patch + ]; + + postPatch = '' + substituteInPlace cmake/common.cmake \ + --replace "\''${RAGEL_BIN}" "${ragel}/bin/ragel" \ + --replace "\''${YASM_BIN}" "${yasm}/bin/yasm" + + shopt -s globstar + for cmakelists in **/CMakeLists.*; do + sed -i "s/OpenSSL::OpenSSL/OpenSSL::SSL/g" $cmakelists + ${lib.optionalString (lib.versionOlder cudaPackages.cudaVersion "11.8") '' + sed -i 's/-gencode=arch=compute_89,code=sm_89//g' $cmakelists + sed -i 's/-gencode=arch=compute_90,code=sm_90//g' $cmakelists + ''} + done + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + llvmPackages.bintools + ninja + (python3Packages.python.withPackages (ps: with ps; [ six ])) + ragel + yasm + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_nvcc + ]); + + buildInputs = [ + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_cudart + cuda_cccl + libcublas + ]); + + env = { + CUDAHOSTCXX = lib.optionalString cudaSupport "${stdenv.cc}/bin/cc"; + NIX_CFLAGS_LINK = lib.optionalString stdenv.isLinux "-fuse-ld=lld"; + NIX_LDFLAGS = "-lc -lm"; + }; + + cmakeFlags = [ + "-DCMAKE_BINARY_DIR=$out" + "-DCMAKE_POSITION_INDEPENDENT_CODE=on" + "-DCATBOOST_COMPONENTS=app;libs${lib.optionalString pythonSupport ";python-package"}" + ] ++ lib.optionals cudaSupport [ + "-DHAVE_CUDA=on" + ]; + + installPhase = '' + runHook preInstall + + mkdir $dev + cp -r catboost $dev + install -Dm555 catboost/app/catboost -t $out/bin + install -Dm444 catboost/libs/model_interface/static/lib/libmodel_interface-static-lib.a -t $out/lib + install -Dm444 catboost/libs/model_interface/libcatboostmodel${stdenv.hostPlatform.extensions.sharedLibrary} -t $out/lib + install -Dm444 catboost/libs/train_interface/libcatboost${stdenv.hostPlatform.extensions.sharedLibrary} -t $out/lib + + runHook postInstall + ''; + + meta = with lib; { + description = "High-performance library for gradient boosting on decision trees"; + longDescription = '' + A fast, scalable, high performance Gradient Boosting on Decision Trees + library, used for ranking, classification, regression and other machine + learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. + ''; + license = licenses.asl20; + platforms = platforms.unix; + homepage = "https://catboost.ai"; + maintainers = with maintainers; [ PlushBeaver natsukium ]; + mainProgram = "catboost"; + }; +}) diff --git a/pkgs/development/libraries/catboost/remove-conan.patch b/pkgs/development/libraries/catboost/remove-conan.patch new file mode 100644 index 00000000000..6f96b7989a5 --- /dev/null +++ b/pkgs/development/libraries/catboost/remove-conan.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index becd2ad03c..7e3c8c99b1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,7 +27,6 @@ cmake_policy(SET CMP0104 OLD) + + include(cmake/archive.cmake) + include(cmake/common.cmake) +-include(cmake/conan.cmake) + include(cmake/cuda.cmake) + include(cmake/cython.cmake) + include(cmake/fbs.cmake) +@@ -37,21 +36,6 @@ include(cmake/recursive_library.cmake) + include(cmake/swig.cmake) + include(cmake/global_vars.cmake) + +-if (CMAKE_CROSSCOMPILING) +- include(${CMAKE_BINARY_DIR}/conan_paths.cmake) +-else() +- conan_cmake_autodetect(settings) +- conan_cmake_install( +- PATH_OR_REFERENCE ${CMAKE_SOURCE_DIR} +- INSTALL_FOLDER ${CMAKE_BINARY_DIR} +- BUILD missing +- REMOTE conancenter +- SETTINGS ${settings} +- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" +- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" +- ) +-endif() +- + if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) + include(CMakeLists.linux-x86_64.txt) + elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND HAVE_CUDA) diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index f1c1a272b5f..0b945c8c599 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.isDarwin Foundation; installTargets = [ "install_hdrs" ] - ++ lib.optional (!stdenv.targetPlatform.isStatic) "install_shared_lib" - ++ lib.optional stdenv.targetPlatform.isStatic "install_lib"; + ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" + ++ lib.optional stdenv.hostPlatform.isStatic "install_lib"; postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index e0d6149362c..968f32a0af5 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gmp , autoreconfHook -, texlive +, texliveSmall }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [gmp]; nativeBuildInputs = [ autoreconfHook - texlive.combined.scheme-small # for building the documentation + texliveSmall # for building the documentation ]; # No actual checks yet (2018-05-05), but maybe one day. # Requested here: https://github.com/cddlib/cddlib/issues/25 diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix deleted file mode 100644 index 27b7b9b9c8c..00000000000 --- a/pkgs/development/libraries/cdk/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - pname = "cdk"; - version = "5.0-20221025"; - - src = fetchurl { - urls = [ - "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz" - "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz" - ]; - hash = "sha256-A8z6Icn8PWHd0P2hnaVFNZBVu+71ociC37n/SPN0avI="; - }; - - buildInputs = [ - ncurses - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Curses development kit"; - homepage = "https://invisible-island.net/cdk/"; - changelog = "https://invisible-island.net/cdk/CHANGES"; - license = licenses.mit; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix index 86908c87138..60d5bc1289a 100644 --- a/pkgs/development/libraries/cgreen/default.nix +++ b/pkgs/development/libraries/cgreen/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cgreen"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "cgreen-devs"; repo = "cgreen"; rev = finalAttrs.version; - sha256 = "sha256-beaCoyDCERb/bdKcKS7dRQHlI0auLOStu3cZr1dhubg="; + sha256 = "sha256-qcOj+NlgbHCYuNsM6ngNI2fNhkCwLL6mIVkNSv9hRE8="; }; postPatch = '' diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 8add9c62347..14b4e549264 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "02m25y9m46pb6n46s51av62kpd936lkfv3b13kfpckgvmh5lxpm8"; }; + # fortify breaks the libcompat vsnprintf implementation + hardeningDisable = lib.optionals (stdenv.hostPlatform.isMusl && (stdenv.hostPlatform != stdenv.buildPlatform)) [ "fortify" ]; + # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix deleted file mode 100644 index 4ef014bfa52..00000000000 --- a/pkgs/development/libraries/cimg/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gmic -, gmic-qt -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cimg"; - version = "3.2.6"; - - src = fetchFromGitHub { - owner = "GreycLab"; - repo = "CImg"; - rev = "v.${finalAttrs.version}"; - hash = "sha256-HEqjvL16Ca3Al3I6VK50CU6zHFj9Nn/SAXXCfRU4rgo="; - }; - - outputs = [ "out" "doc" ]; - - installPhase = '' - runHook preInstall - - install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples - install -m 644 CImg.h $out/include/ - cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ - cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ - cp README.txt $doc/share/doc/cimg/ - - runHook postInstall - ''; - - passthru.tests = { - # Needs to update them all in lockstep. - inherit gmic gmic-qt; - }; - - meta = { - homepage = "http://cimg.eu/"; - description = "A small, open source, C++ toolkit for image processing"; - longDescription = '' - CImg stands for Cool Image. It is easy to use, efficient and is intended - to be a very pleasant toolbox to design image processing algorithms in - C++. Due to its generic conception, it can cover a wide range of image - processing applications. - ''; - license = lib.licenses.cecill-c; - maintainers = [ - lib.maintainers.AndersonTorres - lib.maintainers.lilyinstarlight - ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/clang-ocl/default.nix b/pkgs/development/libraries/clang-ocl/default.nix deleted file mode 100644 index 8053b672d36..00000000000 --- a/pkgs/development/libraries/clang-ocl/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocm-device-libs -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "clang-ocl"; - version = "5.4.2"; - - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "clang-ocl"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-uMSvcVJj+me2E+7FsXZ4l4hTcK6uKEegXpkHGcuist0="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - buildInputs = [ rocm-device-libs ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "OpenCL compilation with clang compiler"; - homepage = "https://github.com/RadeonOpenCompute/clang-ocl"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/clap/default.nix b/pkgs/development/libraries/clap/default.nix index 832ca66d6d7..1da0b31cb10 100644 --- a/pkgs/development/libraries/clap/default.nix +++ b/pkgs/development/libraries/clap/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clap"; - version = "1.1.8"; + version = "1.1.10"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = version; - hash = "sha256-UY6HSth3xuXVfiKolttpYf19rZ2c/X1FXHV7TA/hAiM="; + hash = "sha256-AH3kSCp4Q8Nw3To2vuPuMH/cWm3cmzj2OEH/Azcbdmo="; }; postPatch = '' diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 80c4187c951..804aa13ed91 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -68,6 +68,10 @@ stdenv.mkDerivation rec { "--enable-quartz-backend=yes" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + #doCheck = true; # no tests possible without a display passthru = { diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 41aa3045841..987d90e2699 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { "--enable-wayland-egl-server" "--enable-gles1" "--enable-gles2" + # Force linking against libGL. + # Otherwise, it tries to load it from the runtime library path. + "LIBS=-lGL" ] ++ lib.optionals stdenv.isDarwin [ "--disable-glx" "--without-x" @@ -82,11 +85,15 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] ++ lib.optionals stdenv.isDarwin [ OpenGL ]; - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ - "-I${pango.dev}/include/pango-1.0" - "-I${cairo.dev}/include/cairo" - "-I${harfbuzz.dev}/include/harfbuzz" - ]); + env = { + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + "-I${pango.dev}/include/pango-1.0" + "-I${cairo.dev}/include/cairo" + "-I${harfbuzz.dev}/include/harfbuzz" + ]); + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; #doCheck = true; # all tests fail (no idea why) diff --git a/pkgs/development/libraries/composable_kernel/default.nix b/pkgs/development/libraries/composable_kernel/default.nix deleted file mode 100644 index 54bf1251c30..00000000000 --- a/pkgs/development/libraries/composable_kernel/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, unstableGitUpdater -, cmake -, rocm-cmake -, hip -, openmp -, clang-tools-extra -, gtest -, buildTests ? false -, buildExamples ? false -, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx1030" ... ] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "composable_kernel"; - version = "unstable-2023-01-16"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildExamples [ - "example" - ]; - - # ROCm 5.6 should release composable_kernel as stable with a tag in the future - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "composable_kernel"; - rev = "80e05267417f948e4f7e63c0fe807106d9a0c0ef"; - hash = "sha256-+c0E2UtlG/abweLwCWWjNHDO5ZvSIVKwwwettT9mqR4="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - clang-tools-extra - ]; - - buildInputs = [ - openmp - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ] ++ lib.optionals (gpuTargets != [ ]) [ - "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] ++ lib.optionals buildTests [ - "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names - ]; - - # No flags to build selectively it seems... - postPatch = lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - '' + lib.optionalString (!buildExamples) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(example)" "" - ''; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - '' + lib.optionalString buildExamples '' - mkdir -p $example/bin - mv $out/bin/example_* $example/bin - ''; - - passthru.updateScript = unstableGitUpdater { }; - - # Times out otherwise - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "Performance portable programming model for machine learning tensor operators"; - homepage = "https://github.com/ROCmSoftwarePlatform/composable_kernel"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix deleted file mode 100644 index 6f4cdb1cf68..00000000000 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, unzip, bintools-unwrapped, coreutils, substituteAll }: - -stdenv.mkDerivation rec { - pname = "cosmopolitan"; - version = "2.2"; - - src = fetchFromGitHub { - owner = "jart"; - repo = pname; - rev = version; - sha256 = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk="; - }; - - patches = [ - # make sure tests set PATH correctly - (substituteAll { src = ./fix-paths.patch; inherit coreutils; }) - ]; - - nativeBuildInputs = [ bintools-unwrapped unzip ]; - - outputs = [ "out" "dist" ]; - - # slashes are significant because upstream uses o/$(MODE)/foo.o - buildFlags = [ "o/cosmopolitan.h" "o//cosmopolitan.a" "o//libc/crt/crt.o" "o//ape/ape.o" "o//ape/ape.lds" ]; - checkTarget = "o//test"; - enableParallelBuilding = true; - - doCheck = true; - dontConfigure = true; - dontFixup = true; - - preCheck = '' - # some syscall tests fail because we're in a sandbox - rm test/libc/calls/sched_setscheduler_test.c - rm test/libc/thread/pthread_create_test.c - rm test/libc/calls/getgroups_test.c - - # fails - rm test/libc/stdio/posix_spawn_test.c - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/{include,lib} - install o/cosmopolitan.h $out/include - install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} o/ape/ape-no-modify-self.o $out/lib - - cp -RT . "$dist" - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://justine.lol/cosmopolitan/"; - description = "Your build-once run-anywhere c library"; - platforms = platforms.x86_64; - badPlatforms = platforms.darwin; - license = licenses.isc; - maintainers = teams.cosmopolitan.members; - }; -} diff --git a/pkgs/development/libraries/cosmopolitan/fix-paths.patch b/pkgs/development/libraries/cosmopolitan/fix-paths.patch deleted file mode 100644 index 85c59f3f12a..00000000000 --- a/pkgs/development/libraries/cosmopolitan/fix-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/test/tool/plinko/plinko_test.c -+++ b/test/tool/plinko/plinko_test.c -@@ -91,8 +91,8 @@ TEST(plinko, worksOrPrintsNiceError) { - sigaction(SIGQUIT, &savequit, 0); - sigaction(SIGPIPE, &savepipe, 0); - sigprocmask(SIG_SETMASK, &savemask, 0); - execve("bin/plinko.com", (char *const[]){"bin/plinko.com", 0}, -- (char *const[]){0}); -+ (char *const[]){"PATH=@coreutils@/bin", 0}); - _exit(127); - } - close(pfds[0][0]); diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index debc2b7aebd..5223f2039cf 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.0"; + version = "5.24.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-krskfuoCRxYcAIDqrae4+yEABXXZ9Nv0BjBVwSMjC7g="; + sha256 = "sha256-Prb593+jXhYzwPHQnwen2qgaNfdX1Atiz1FhmXm9X7U="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index 484af3337a0..4c0badf3df7 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,8 +1,8 @@ -let version = "2.9.8"; in +let version = "2.9.11"; in { stdenv, lib, buildPackages, fetchurl, zlib, gettext -, wordlists ? [ (fetchurl { +, lists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; - hash = "sha256-WLOCTIDdO6kIsMytUdbhZx4woj/u1gf7jmORR2i8T4U="; + hash = "sha256-popxGjE1c517Z+nzYLM/DU7M+b1/rE0XwNXkVqkcUXo="; }) ] }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-H500OF6jqnzXwH+jiNwlgQrqnTwz4mDHE6Olhz1w44Y="; + hash = "sha256-yosEmjwtOyIloejRXWE3mOvHSOOVA4jtomlN5Qe6YCA="; }; nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs util '' + '' - ln -vs ${toString wordlists} dicts/ + ln -vs ${toString lists} dicts/ ''; postInstall = '' diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index c8bc708a2aa..5aac0850a74 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.8.3"; src = fetchurl { - url = "http://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; + url = "https://ctpp.havoc.ru/download/${pname}-${version}.tar.gz"; sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high performance templating engine"; - homepage = "http://ctpp.havoc.ru"; + homepage = "https://ctpp.havoc.ru/"; maintainers = [ maintainers.robbinch ]; platforms = platforms.linux; license = licenses.bsd2; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index f9408818e37..c2799b97e2a 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -5,6 +5,9 @@ , darwin # Accelerate , llvmPackages # openmp , withMkl ? false, mkl +, withCUDA ? false +, withCuDNN ? false +, cudaPackages # Enabling both withOneDNN and withOpenblas is broken # https://github.com/OpenNMT/CTranslate2/issues/1294 , withOneDNN ? false, oneDNN @@ -21,18 +24,20 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-PdCjzLyc5O1rrTtPz8JD08unY7uMNS5fcD3ZLHJDeYg="; + hash = "sha256-ehybfwwMYMKPPeyv05zgDxmw0zr35eoY8wc/tb7DQw0="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake + ] ++ lib.optionals withCUDA [ + cudaPackages.cuda_nvcc ]; cmakeFlags = [ @@ -40,6 +45,8 @@ stdenv.mkDerivation rec { # https://github.com/OpenNMT/CTranslate2/blob/54810350e662ebdb01ecbf8e4a746f02aeff1dd7/python/tools/prepare_build_environment_linux.sh#L53 # https://github.com/OpenNMT/CTranslate2/blob/59d223abcc7e636c1c2956e62482bc3299cc7766/python/tools/prepare_build_environment_macos.sh#L12 "-DOPENMP_RUNTIME=COMP" + "-DWITH_CUDA=${cmakeBool withCUDA}" + "-DWITH_CUDNN=${cmakeBool withCuDNN}" "-DWITH_DNNL=${cmakeBool withOneDNN}" "-DWITH_OPENBLAS=${cmakeBool withOpenblas}" "-DWITH_RUY=${cmakeBool withRuy}" @@ -49,6 +56,12 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withMkl [ mkl + ] ++ lib.optionals withCUDA [ + cudaPackages.cuda_cudart + cudaPackages.libcublas + cudaPackages.libcurand + ] ++ lib.optionals withCuDNN [ + cudaPackages.cudnn ] ++ lib.optionals withOneDNN [ oneDNN ] ++ lib.optionals withOpenblas [ diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/development/libraries/ctre/default.nix index bdc35ec23da..0c7ef379612 100644 --- a/pkgs/development/libraries/ctre/default.nix +++ b/pkgs/development/libraries/ctre/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ctre"; - version = "3.8"; + version = "3.8.1"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; rev = "v${version}"; - hash = "sha256-oGJHSyvcgvBJh5fquK6dU70czVg4txcGTuicvrTK2hc="; + hash = "sha256-EzAPIqdfktrZ+FTEzz52nRNnH7CG59ZE9Ww7qMkAAbY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cyclonedds/default.nix b/pkgs/development/libraries/cyclonedds/default.nix index 96d49c3132f..899249150b3 100644 --- a/pkgs/development/libraries/cyclonedds/default.nix +++ b/pkgs/development/libraries/cyclonedds/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cyclonedds"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "eclipse-cyclonedds"; repo = "cyclonedds"; rev = version; - sha256 = "sha256-Ie2l2TwEXqhMZWL3CmQD+c8LdQlclP6egsP7jnsOAlM="; + sha256 = "sha256-LSCfQPyd/QOsrnLNbKb0OlCvmHi/2aDDhi8VeXpYb1w="; }; patches = [ diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 8476860f1e7..9c5e5101c8a 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -4,6 +4,13 @@ , withTools ? false # "dav1d" binary , withExamples ? false, SDL2 # "dav1dplay" binary , useVulkan ? false, libplacebo, vulkan-loader, vulkan-headers + +# for passthru.tests +, ffmpeg +, gdal +, handbrake +, libavif +, libheif }: assert useVulkan -> withExamples; @@ -34,6 +41,15 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit + ffmpeg + gdal + handbrake + libavif + libheif; + }; + meta = with lib; { description = "A cross-platform AV1 decoder focused on speed and correctness"; longDescription = '' diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index d8c3309acb9..a809eda31c0 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "dbus"; - version = "1.14.8"; + version = "1.14.10"; src = fetchurl { url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; - sha256 = "sha256-pr1brFzxnww8WUva4lZaCVaWmApoOg7zfLYhLgk73jU="; + sha256 = "sha256-uh8h0r2dM52i1KqHgMCd8y/qh5mLc9ok9Jq53x42pQ8="; }; patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple interprocess messaging system"; - homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; + homepage = "https://www.freedesktop.org/wiki/Software/dbus/"; changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${version}/NEWS"; license = licenses.gpl2Plus; # most is also under AFL-2.1 maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 431f010eed1..92b6397c417 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "A general purpose cross-platform C++ machine learning library"; homepage = "http://www.dlib.net"; license = licenses.boost; - maintainers = with maintainers; [ christopherpoole ma27 ]; + maintainers = with maintainers; [ christopherpoole ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index a8d228addc2..1bf86800df8 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GmteQy+nYQFspLvdw44TjuQQeTRQ24OtDeAA+TQJKiU="; + hash = "sha256-8MPAyCqqjDpDHSyiZ1cvvgflaOLNzPGswZSsSjSffvw="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 4c2ec82b0f3..5d2e3b3245c 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.8.6"; + version = "1.9.0"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-BYZoMesDquXaphZvnf2Vd/RuOC9jsOjZsGNbDmQ3u+c="; + sha256 = "sha256-KZRW/ra84RegCCT6J0k+N7XqZF+xW+Ecq2TVdPZnM7M="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index f02dacb9503..801ad7979ae 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.8.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-LEv9yURkYvONObTbIA4CS+umwCRMH8gRQaDtzbCzID4="; + hash = "sha256-QFK8mEMcqQwALFNvAdD8yWixwMYHSbeo6xqx86PvejU="; }; patches = [ ./version.patch ]; @@ -36,19 +36,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withOdbc [ unixODBC ]; cmakeFlags = [ - "-DBUILD_AUTOCOMPLETE_EXTENSION=ON" - "-DBUILD_ICU_EXTENSION=ON" - "-DBUILD_PARQUET_EXTENSION=ON" - "-DBUILD_TPCH_EXTENSION=ON" - "-DBUILD_TPCDS_EXTENSION=ON" - "-DBUILD_FTS_EXTENSION=ON" - "-DBUILD_HTTPFS_EXTENSION=ON" - "-DBUILD_VISUALIZER_EXTENSION=ON" - "-DBUILD_JSON_EXTENSION=ON" - "-DBUILD_JEMALLOC_EXTENSION=ON" - "-DBUILD_EXCEL_EXTENSION=ON" - "-DBUILD_INET_EXTENSION=ON" - "-DBUILD_TPCE=ON" + "-DDUCKDB_EXTENSION_CONFIGS=${src}/.github/config/in_tree_extensions.cmake" "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" "-DJDBC_DRIVER=${enableFeature withJdbc}" ] ++ lib.optionals doInstallCheck [ @@ -69,6 +57,7 @@ stdenv.mkDerivation rec { excludes = map (pattern: "exclude:'${pattern}'") [ "[s3]" "Test closing database during long running query" + "Test using a remote optimizer pass in case thats important to someone" "test/common/test_cast_hugeint.test" "test/sql/copy/csv/test_csv_remote.test" "test/sql/copy/parquet/test_parquet_remote.test" @@ -79,6 +68,8 @@ stdenv.mkDerivation rec { "test/sql/storage/compression/patas/patas_read.test" "test/sql/json/read_json_objects.test" "test/sql/json/read_json.test" + "test/sql/json/table/read_json_objects.test" + "test/sql/json/table/read_json.test" "test/sql/copy/parquet/parquet_5968.test" "test/fuzzer/pedro/buffer_manager_out_of_memory.test" "test/sql/storage/compression/bitpacking/bitpacking_size_calculation.test" @@ -90,6 +81,7 @@ stdenv.mkDerivation rec { "test/sql/copy/parquet/delta_byte_array_multiple_pages.test" "test/sql/copy/csv/test_csv_httpfs_prepared.test" "test/sql/copy/csv/test_csv_httpfs.test" + "test/sql/settings/test_disabled_file_system_httpfs.test" "test/sql/copy/csv/parallel/test_parallel_csv.test" "test/sql/copy/csv/parallel/csv_parallel_httpfs.test" "test/common/test_cast_struct.test" @@ -114,10 +106,12 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/duckdb/duckdb"; + changelog = "https://github.com/duckdb/duckdb/releases/tag/v${version}"; description = "Embeddable SQL OLAP Database Management System"; + homepage = "https://duckdb.org/"; license = licenses.mit; - platforms = platforms.all; + mainProgram = "duckdb"; maintainers = with maintainers; [ costrouc cpcloud ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/duckdb/version.patch b/pkgs/development/libraries/duckdb/version.patch index 1f52fdb3b93..f40785b4307 100644 --- a/pkgs/development/libraries/duckdb/version.patch +++ b/pkgs/development/libraries/duckdb/version.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 349af6acf7..7ffec0b4cb 100644 +index 2b49e11288..0a4a69b9a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -196,52 +196,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") +@@ -244,52 +244,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") set(SUN TRUE) endif() diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 5f830ba5c51..0258165d4ee 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.30.2"; + version = "2.32.1"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-ObleQiGxFtyBhlbQTIKIQFXUiuuqKZDCWeqM3/2kJYI="; + sha256 = "sha256-rSrBvzZXex01xKdxtNF0oG9SKh5e9sH15Tp5X7Ykhj4="; }; postPatch = '' diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 66e05dc9af1..f84b44007e2 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.12"; + version = "1.1.13"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - hash = "sha256-KxlUuoj2HJhkqkIX+Pic/0+36g/N3qfAAlnvYO2Y6uQ="; + hash = "sha256-NA+jr27aYu0XPG9sxnBtjeBTFHmV7TENRsFy8dDdNUc="; }; postPatch = '' diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 003de885c79..0967ba113f8 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' ''; + outputs = [ "out" "doc" "man" "dev" ]; + nativeBuildInputs = [ autoreconfHook perl ]; buildInputs = [ mpi blas lapack scalapack ] @@ -74,7 +76,9 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-assembly" ++ lib.optionals enableCuda [ "--enable-nvidia-gpu" "--with-NVIDIA-GPU-compute-capability=${nvidiaArch}" ]; - doCheck = true; + enableParallelBuilding = true; + + doCheck = !enableCuda; nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 5fb09906895..d4ab53f37bc 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , aspell , groff , pkg-config @@ -13,15 +14,23 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.5.0"; + version = "2.6.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FJ4iTN0sqCXYdGOVeLYkbgfzfVuPOXBlijd6HvRvLhU="; + hash = "sha256-ZoanKOVudg+N7gmiLw+1O0bunb59ZM+eW7NaZYv/fh0="; }; + 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/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 0c4c339c639..fb2db6a963e 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,32 +1,43 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, zlib -, expat +, fetchpatch , cmake -, which -, libxml2 -, python3 -, gettext , doxygen +, gettext , graphviz , libxslt -, libiconv , removeReferencesTo +, libiconv +, brotli +, expat +, inih +, zlib +, libxml2 +, python3 +, which }: stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.7"; + version = "0.28.1"; - outputs = [ "out" "lib" "dev" "doc" "man" "static" ]; + outputs = [ "out" "lib" "dev" "doc" "man" ]; src = fetchFromGitHub { owner = "exiv2"; - repo = "exiv2"; + repo = "exiv2"; rev = "v${version}"; - sha256 = "sha256-xytVGrLDS22n2/yydFTT6CsDESmhO9mFbPGX4yk+b6g="; + hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch"; + hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls="; + }) + ]; + nativeBuildInputs = [ cmake doxygen @@ -36,10 +47,14 @@ stdenv.mkDerivation rec { removeReferencesTo ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; propagatedBuildInputs = [ + brotli expat + inih zlib ]; @@ -65,63 +80,28 @@ stdenv.mkDerivation rec { preCheck = '' patchShebangs ../test/ mkdir ../test/tmp - - ${lib.optionalString stdenv.hostPlatform.isAarch '' - # Fix tests on arm - # https://github.com/Exiv2/exiv2/issues/933 - rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py - ''} - - ${lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib - # Removing tests depending on charset conversion - substituteInPlace ../test/Makefile --replace "conversions.sh" "" - rm -f ../tests/bugfixes/redmine/test_issue_460.py - rm -f ../tests/bugfixes/redmine/test_issue_662.py - rm -f ../tests/bugfixes/github/test_issue_1046.py - - rm ../tests/bugfixes/redmine/test_issue_683.py - - # disable tests that requires loopback networking - substituteInPlace ../tests/bash_tests/testcases.py \ - --replace "def io_test(self):" "def io_disabled(self):" - ''} - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString stdenv.hostPlatform.isAarch32 '' + # Fix tests on arm + # https://github.com/Exiv2/exiv2/issues/933 + rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py + '' + lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib export LC_ALL=C - '' + lib.optionalString stdenv.isAarch32 '' - # these tests are fixed in 0.28, remove when updating to 0.28 - rm -f ../tests/bugfixes/github/test_issue_1503.py - rm -f ../tests/bugfixes/github/test_pr1475_AVIF.py - rm -f ../tests/bugfixes/github/test_pr1475_HEIC.py - rm -f ../tests/bugfixes/github/test_pr1475_HIF.py - ''; - - # With CMake we have to enable samples or there won't be - # a tests target. This removes them. - postInstall = '' - ( cd "$out/bin" - mv exiv2 .exiv2 - rm * - mv .exiv2 exiv2 - ) - - mkdir -p $static/lib - mv $lib/lib/*.a $static/lib/ - remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a + # disable tests that requires loopback networking + substituteInPlace ../tests/bash_tests/testcases.py \ + --replace "def io_test(self):" "def io_disabled(self):" ''; - postFixup = '' - substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config.cmake --replace \ - "set(_IMPORT_PREFIX \"$out\")" \ - "set(_IMPORT_PREFIX \"$static\")" - substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config-*.cmake --replace \ - "$lib/lib/libexiv2-xmp.a" \ - "$static/lib/libexiv2-xmp.a" + preFixup = '' + remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a ''; disallowedReferences = [ stdenv.cc.cc ]; + # causes redefinition of _FORTIFY_SOURCE + hardeningDisable = [ "fortify3" ]; + meta = with lib; { homepage = "https://exiv2.org"; description = "A library and command-line utility to manage image metadata"; diff --git a/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch b/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch new file mode 100644 index 00000000000..8908beb0824 --- /dev/null +++ b/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +Date: Sat, 5 Jun 2021 14:50:26 +0200 +Subject: [PATCH] Do not require wget and unzip + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2261fe7..ce8edad 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -243,21 +243,6 @@ if(BUILD_DOCUMENTATION) + set(DOXYFILE_MAKE make.bat) + endif() + +- if(NOT CHECK_DOCUMENTATION) +- find_program(WGET_EXE wget) +- if(WGET_EXE) +- message(STATUS "Found WGet: ${WGET_EXE}") +- else() +- message(FATAL_ERROR "wget is needed to build the documentation. Please install it correctly") +- endif() +- find_program(UNZIP_EXE unzip) +- if(UNZIP_EXE) +- message(STATUS "Found Unzip: ${UNZIP_EXE}") +- else() +- message(FATAL_ERROR "unzip is needed to build the documentation. Please install it correctly") +- endif() +- endif() +- + # Target to create documentation directories + add_custom_target(docdirs + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/doc +-- +2.40.1 + diff --git a/pkgs/development/libraries/fastcdr/default.nix b/pkgs/development/libraries/fastcdr/default.nix new file mode 100644 index 00000000000..19998799a6f --- /dev/null +++ b/pkgs/development/libraries/fastcdr/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gtest +, withDocs ? true +, doxygen +, graphviz-nox +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fastcdr"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "eProsima"; + repo = "Fast-CDR"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ZJQnm3JN56y2v/XIShfZxkEEu1AKMJxt8wpRqSn9HWk="; + }; + + patches = [ + ./0001-Do-not-require-wget-and-unzip.patch + ]; + + cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF" + # fastcdr doesn't respect BUILD_TESTING + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "-DEPROSIMA_BUILD_TESTS=ON" + ++ lib.optional withDocs "-DBUILD_DOCUMENTATION=ON"; + + outputs = [ "out" ] ++ lib.optional withDocs "doc"; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals withDocs [ + doxygen + graphviz-nox + ]; + + doCheck = true; + + checkInputs = [ gtest ]; + + meta = with lib; { + homepage = "https://github.com/eProsima/Fast-CDR"; + description = "Serialization library for OMG's Common Data Representation (CDR)"; + longDescription = '' + A C++ library that provides two serialization mechanisms. One is the + standard CDR serialization mechanism, while the other is a faster + implementation that modifies the standard. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ panicgh ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 7f95b999549..8389640e4e5 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "23.09"; + version = "23.11"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-Sl+dOM1YMDwCN07ThR/JFwhNS10P7+uQJNUQAvFdYa8="; + sha256 = "sha256-iK0cjhq16DU/77p0cM3SMk+gE1PQV0zd96a3kxwXNLk="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/development/libraries/fbjni/default.nix new file mode 100644 index 00000000000..1a5228f4d86 --- /dev/null +++ b/pkgs/development/libraries/fbjni/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch +, jdk_headless +, gtest +}: + +stdenv.mkDerivation rec { + pname = "fbjni"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-97KqfFWtR3VJe2s0D60L3dsIDm4kMa0hpkKoZSAEoVY="; + }; + + patches = [ + # Part of https://github.com/facebookincubator/fbjni/pull/76 + # fix cmake file installation directory + (fetchpatch { + url = "https://github.com/facebookincubator/fbjni/commit/ab02e60b5da28647bfcc864b0bb1b9a90504cdb1.patch"; + sha256 = "sha256-/h6kosulRH/ZAU2u0zRSaNDK39jsnFt9TaSxyBllZqM="; + }) + # install headers + (fetchpatch { + url = "https://github.com/facebookincubator/fbjni/commit/74e125caa9a815244f1e6bd08eaba57d015378b4.patch"; + sha256 = "sha256-hQS35D69GD3ewV4zzPG+LO7jk7ncCj2CYDbLJ6SnpqE="; + }) + ]; + + nativeBuildInputs = [ + cmake + jdk_headless + ]; + + buildInputs = [ + gtest + ]; + + cmakeFlags = [ + "-DJAVA_HOME=${jdk_headless.passthru.home}" + ]; + + meta = with lib; { + description = "A library designed to simplify the usage of the Java Native Interface"; + homepage = "https://github.com/facebookincubator/fbjni"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 71077d6e315..99e211877da 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-quality implementation of the AAC codec from Android"; homepage = "https://sourceforge.net/projects/opencore-amr/"; - license = licenses.asl20; + license = licenses.fraunhofer-fdk; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 6bd9a8b8f1a..8dc42dea247 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -7,5 +7,17 @@ import ./generic.nix { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; } + # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks. + # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary. + { + name = "utils-fix_crash_in_ff_seek_frame_binary.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d"; + hash = "sha256-UxZ4VneZpw+Q/UwkEUDNdb2nOx1QnMrZ40UagspNTxI="; + postFetch = '' + substituteInPlace "$out" \ + --replace libavformat/seek.c libavformat/utils.c \ + --replace 'const AVInputFormat *const ' 'const AVInputFormat *' + ''; + } ]; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6bde5aa776b..e713ca1413f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -43,7 +43,7 @@ , withFreetype ? withHeadlessDeps # Needed for drawtext filter , withFrei0r ? withFullDeps # frei0r video filtering , withFribidi ? withFullDeps # Needed for drawtext filter -, withGlslang ? withFullDeps && !stdenv.isDarwin +, withGlslang ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder @@ -52,7 +52,7 @@ , withLadspa ? withFullDeps # LADSPA audio filtering , withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library , withLzma ? withHeadlessDeps # xz-utils -, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx +, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer @@ -80,7 +80,7 @@ , withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 # AV1 encoder/decoder (focused on speed and correctness) , withTensorflow ? false # Tensorflow dnn backend support , withTheora ? withHeadlessDeps # Theora encoder -, withV4l2 ? withFullDeps && !stdenv.isDarwin # Video 4 Linux support +, withV4l2 ? withHeadlessDeps && !stdenv.isDarwin # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps # Vdpau hardware acceleration @@ -386,8 +386,8 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withHardcodedTables "hardcoded-tables") (enableFeature withSafeBitstreamReader "safe-bitstream-reader") - (enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads") - (enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads") + (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads") + (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads") "--disable-os2threads" # We don't support OS/2 (enableFeature withNetwork "network") @@ -545,7 +545,10 @@ stdenv.mkDerivation (finalAttrs: { in "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h"; - nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]; + strictDeps = true; + + nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ] + ++ optionals withCudaLLVM [ clang ]; # TODO This was always in buildInputs before, why? buildInputs = optionals withFullDeps [ libdc1394 ] @@ -559,7 +562,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withBzlib [ bzip2 ] ++ optionals withCaca [ libcaca ] ++ optionals withCelt [ celt ] - ++ optionals withCudaLLVM [ clang ] ++ optionals withDav1d [ dav1d ] ++ optionals withDrm [ libdrm ] ++ optionals withFdkAac [ fdk_aac ] @@ -697,5 +699,6 @@ stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "libavutil" ]; platforms = platforms.all; maintainers = with maintainers; [ atemu ]; + mainProgram = "ffmpeg"; }; }) diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index ec1715b005f..eeac7d14568 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch"; + hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 58bf002eb27..747a976f4c9 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -7,22 +7,17 @@ stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "23.3.3"; + version = "23.5.26"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "sha256-h0lF7jf1cDVVyqhUCi7D0NoZ3b4X/vWXsFplND80lGs="; + hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE="; }; nativeBuildInputs = [ cmake python3 ]; - postPatch = '' - # Fix default value of "test_data_path" to make tests work - substituteInPlace tests/test.cpp --replace '"tests/";' '"../tests/";' - ''; - cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index a65ad5c6fe3..1f487955b3f 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFLATCC_INSTALL=on" - "-DCMAKE_BUILD_TYPE=Release" ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/development/libraries/flatpak/binary-path.patch b/pkgs/development/libraries/flatpak/binary-path.patch new file mode 100644 index 00000000000..9da437df91b --- /dev/null +++ b/pkgs/development/libraries/flatpak/binary-path.patch @@ -0,0 +1,29 @@ +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index eba81fef..134024e2 100644 +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -7532,8 +7532,13 @@ export_desktop_file (const char *app, + g_key_file_remove_key (keyfile, groups[i], "X-GNOME-Bugzilla-ExtraInfoScript", NULL); + + new_exec = g_string_new (""); +- if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) +- flatpak = FLATPAK_BINDIR "/flatpak"; ++ if (g_str_has_suffix (name, ".service")) ++ { ++ flatpak = "/run/current-system/sw/bin/flatpak"; ++ } else { ++ if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) ++ flatpak = "flatpak"; ++ } + + g_string_append_printf (new_exec, + "%s run --branch=%s --arch=%s", +@@ -8867,7 +8872,7 @@ flatpak_dir_deploy (FlatpakDir *self, + error)) + return FALSE; + if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) +- flatpak = FLATPAK_BINDIR "/flatpak"; ++ flatpak = "flatpak"; + + bin_data = g_strdup_printf ("#!/bin/sh\nexec %s run --branch=%s --arch=%s %s \"$@\"\n", + flatpak, escaped_branch, escaped_arch, escaped_app); diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 69dca4c5044..0c44b99db8d 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -89,6 +89,11 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch + # Use flatpak from PATH to avoid references to `/nix/store` in `/desktop` files. + # Applications containing `DBusActivatable` entries should be able to find the flatpak binary. + # https://github.com/NixOS/nixpkgs/issues/138956 + ./binary-path.patch + # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch @@ -176,13 +181,6 @@ stdenv.mkDerivation (finalAttrs: { PATH=${lib.makeBinPath [vsc-py]}:$PATH patchShebangs --build subprojects/variant-schema-compiler/variant-schema-compiler ''; - preFixup = '' - gappsWrapperArgs+=( - # Use flatpak from PATH in exported assets (e.g. desktop files). - --set FLATPAK_BINARY flatpak - ) - ''; - passthru = { icon-validator-patch = substituteAll { src = ./fix-icon-validation.patch; diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index 683cdbcaf18..da147500900 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -180,14 +180,16 @@ index d9fc8251..d8ddb96e 100755 @@ -1,10 +1,10 @@ #!/bin/sh - if command -v gtk-update-icon-cache >/dev/null && test -d "$1/exports/share/icons/hicolor"; then +-if command -v gtk-update-icon-cache >/dev/null && test -d "$1/exports/share/icons/hicolor"; then - cp /usr/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" -+ cp @hicolorIconTheme@/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" ++if test -d "$1/exports/share/icons/hicolor"; then ++ @coreutils@/bin/cp -f @hicolorIconTheme@/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" for dir in "$1"/exports/share/icons/*; do if test -f "$dir/index.theme"; then - if ! gtk-update-icon-cache --quiet "$dir"; then +- echo "Failed to run gtk-update-icon-cache for $dir" + if ! @gtk3@/bin/gtk-update-icon-cache --quiet "$dir"; then - echo "Failed to run gtk-update-icon-cache for $dir" ++ @coreutils@/bin/echo "Failed to run gtk-update-icon-cache for $dir" exit 1 fi diff --git a/triggers/mime-database.trigger b/triggers/mime-database.trigger diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 8d1c19a48ac..ab74a09d079 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.4.4"; + version = "5.4.5"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "sha256-+1EdNdmEk5tQDd1DXklPbEKC/Dr2yV2gwbtwBtZxpNM="; + sha256 = "sha256-taSS7jpVyjVfNe6kSuUDXMD2PgKmtG64V5MjZyQzorI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index b42fdbd60cc..97c356a3aa4 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.20"; + version = "1.4.6"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-IK4R87gG5PvA+gtZMftHO7V0i+6dSH9qoSiFCDV4pe0="; + hash = "sha256-gTgCoca8Av4WlrbqMapTUiVxl3dza1v8I6OheFiVasA="; }; buildInputs = [ diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 6e6989d9304..1687bf5c516 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freetype"; - version = "2.13.1"; + version = "2.13.2"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6mfjsBmxEE0WZ6onT13DB9jL1gazmbwy3zCKd/GlZL8="; + sha256 = "sha256-EpkcTlXFBt1/m3ZZM+Yv0r4uBtQhUF15UKEy5PG7SE0="; }; propagatedBuildInputs = [ zlib bzip2 brotli libpng ]; # needed when linking against freetype @@ -101,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { fonts. ''; homepage = "https://www.freetype.org/"; + changelog = "https://gitlab.freedesktop.org/freetype/freetype/-/raw/VER-${builtins.replaceStrings ["."] ["-"] finalAttrs.version}/docs/CHANGES"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) platforms = platforms.all; pkgConfigModules = [ "freetype2" ]; diff --git a/pkgs/development/libraries/frugally-deep/default.nix b/pkgs/development/libraries/frugally-deep/default.nix new file mode 100644 index 00000000000..f275ec5f02b --- /dev/null +++ b/pkgs/development/libraries/frugally-deep/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, gitUpdater +, cmake +, functionalplus +, eigen +, nlohmann_json +, doctest +, python3Packages +, buildTests ? false # Needs tensorflow +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "frugally-deep"; + version = "0.15.24-p0"; + + src = fetchFromGitHub { + owner = "Dobiasd"; + repo = "frugally-deep"; + rev = "v${finalAttrs.version}"; + hash = "sha256-yg2SMsYOOSOgsdwIH1bU3iPM45z6c7WeIrgOddt3um4="; + }; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals buildTests [ + python3Packages.python + python3Packages.numpy + ]; + + buildInputs = lib.optionals buildTests [ + doctest + python3Packages.tensorflow + ]; + + propagatedBuildInputs = [ + functionalplus + eigen + nlohmann_json + ]; + + cmakeFlags = lib.optionals buildTests [ "-DFDEEP_BUILD_UNITTEST=ON" ]; + passthru.updateScript = gitUpdater; + + meta = with lib; { + description = "Header-only library for using Keras (TensorFlow) models in C++"; + homepage = "https://github.com/Dobiasd/frugally-deep"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ Madouura ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix index 4fc6c745cf6..b456dd88734 100644 --- a/pkgs/development/libraries/functionalplus/default.nix +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.18-p0"; + version = "0.2.20-p0"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-jypBQjFdVEktB8Q71RTg+3RJoeFwD5Wxw+fq+4QG38g="; + sha256 = "sha256-PKd3gx63VTxyq1q0v7WaKXVA0oICpZQfVsKsgUml9wk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e23eb42d33e..28f083c31b1 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-/7Egbg4Cg5Gqsy+CEMVbs2NCWbdJteDNWelBsrQSUj4="; + hash = "sha256-+69mh1hKL1r7SNwDilaQz5UochMMWFG2lrBLYBF31JY="; }; nativeBuildInputs = [ @@ -233,6 +233,9 @@ stdenv.mkDerivation (finalAttrs: { "test_sentinel2_zipped" # tries to call unwrapped executable "test_SetPROJAuxDbPaths" + # fixed and renamed in 3.8.0RC1 + # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 + "test_visoss_6" ] ++ lib.optionals (!stdenv.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 76e661dfbd4..3298be5cc3c 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -9,7 +9,12 @@ , libiconv , enablePython ? false , python ? null -, swig +, swig4 +, expat +, libuuid +, openjpeg +, zlib +, pkg-config }: stdenv.mkDerivation rec { @@ -27,6 +32,10 @@ stdenv.mkDerivation rec { "-DGDCM_BUILD_APPLICATIONS=ON" "-DGDCM_BUILD_SHARED_LIBS=ON" "-DGDCM_BUILD_TESTING=ON" + "-DGDCM_USE_SYSTEM_EXPAT=ON" + "-DGDCM_USE_SYSTEM_ZLIB=ON" + "-DGDCM_USE_SYSTEM_UUID=ON" + "-DGDCM_USE_SYSTEM_OPENJPEG=ON" # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue: "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_BINDIR=bin" @@ -38,15 +47,23 @@ stdenv.mkDerivation rec { "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = lib.optionals enableVTK [ + buildInputs = [ + expat + libuuid + openjpeg + zlib + ] ++ lib.optionals enableVTK [ vtk ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Cocoa libiconv - ] ++ lib.optionals enablePython [ swig python ]; + ] ++ lib.optionals enablePython [ swig4 python ]; disabledTests = [ # require networking: diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index d982b772970..f77daec2ea6 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -19,7 +19,7 @@ , lib , testers , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection }: diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 36c7120ac60..1d6f158b52f 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -18,10 +18,17 @@ stdenv.mkDerivation rec { (import ./fix-const-weights-clang-patch.nix fetchpatch) ]; + postPatch = '' + substituteInPlace gecode/flatzinc/lexer.yy.cpp \ + --replace "register " "" + ''; + nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs configure"; + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 1f3ce471dc0..90bdfdb0d60 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; passthru.tests = { - pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; }; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 9d8f0fd823f..4a346fdcffc 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 - (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 70d06c107fd..1b45be61128 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , autoreconfHook , buildPackages , optimize ? false # impure hardware optimizations @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; }; + patches = [ + (fetchpatch { + name = "gf2x-1.3.0-configure-clang16.patch"; + url = "https://gitlab.inria.fr/gf2x/gf2x/-/commit/a2f0fd388c12ca0b9f4525c6cfbc515418dcbaf8.diff"; + hash = "sha256-Aj2KzWZMR24S04IbPOBPwacCU4rEiB+FFWxtRuF50LA="; + }) + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index 617d51d85ed..fdfb203ba12 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gl3w"; - version = "unstable-2022-03-24"; + version = "unstable-2023-10-10"; src = fetchFromGitHub { owner = "skaslev"; repo = pname; - rev = "5f8d7fd191ba22ff2b60c1106d7135bb9a335533"; - hash = "sha256-qV/PZmaP5iCHhIzTA2bE4d1RMB6LzRbTsB5gWVvi9bU="; + rev = "3a33275633ce4be433332dc776e6a5b3bdea6506"; + hash = "sha256-kEm5QItpasSFJQ32YBHPpc+itz/nQ8bQMCavbOTGT/w="; }; nativeBuildInputs = [ python3 cmake ]; diff --git a/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch b/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch new file mode 100644 index 00000000000..234bc1943c9 --- /dev/null +++ b/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch @@ -0,0 +1,37 @@ +From 44d0a3a9bd8c6fe59f6ccb44206a50a900bfcf4a Mon Sep 17 00:00:00 2001 +From: Connor Baker <connor.baker@tweag.io> +Date: Tue, 31 Oct 2023 14:30:24 +0000 +Subject: [PATCH] aarch64/math-vector.h: add NVCC include guard + +--- + sysdeps/aarch64/fpu/bits/math-vector.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h +index 7c200599c1..583a426494 100644 +--- a/sysdeps/aarch64/fpu/bits/math-vector.h ++++ b/sysdeps/aarch64/fpu/bits/math-vector.h +@@ -25,17 +25,17 @@ + /* Get default empty definitions for simd declarations. */ + #include <bits/libm-simd-decl-stubs.h> + +-#if __GNUC_PREREQ(9, 0) ++#if __GNUC_PREREQ(9, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __Float32x4_t __f32x4_t; + typedef __Float64x2_t __f64x2_t; +-#elif __glibc_clang_prereq(8, 0) ++#elif __glibc_clang_prereq(8, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __attribute__ ((__neon_vector_type__ (4))) float __f32x4_t; + typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t; + #endif + +-#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0) ++#if (__GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)) && !defined(__CUDACC__) + # define __SVE_VEC_MATH_SUPPORTED + typedef __SVFloat32_t __sv_f32_t; + typedef __SVFloat64_t __sv_f64_t; +-- +2.42.0 + diff --git a/pkgs/development/libraries/glibc/2.37-master.patch.gz b/pkgs/development/libraries/glibc/2.37-master.patch.gz deleted file mode 100644 index 04b4e264751..00000000000 --- a/pkgs/development/libraries/glibc/2.37-master.patch.gz +++ /dev/null Binary files differdiff --git a/pkgs/development/libraries/glibc/2.38-master.patch.gz b/pkgs/development/libraries/glibc/2.38-master.patch.gz new file mode 100644 index 00000000000..6414956807f --- /dev/null +++ b/pkgs/development/libraries/glibc/2.38-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index f98c0eb1c34..3e17817c0ba 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -43,9 +43,9 @@ } @ args: let - version = "2.37"; - patchSuffix = "-8"; - sha256 = "sha256-Ilfv8RGhgV109GhW2q9AsBnB5VMVbGnUi6DL/Bu5GkM="; + version = "2.38"; + patchSuffix = "-27"; + sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -59,14 +59,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.36/master && git describe - glibc-2.37-8-g590d0e089b - $ git show --minimal --reverse glibc-2.37.. | gzip -9n --rsyncable - > 2.37-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.38/master && git describe + glibc-2.38-27-g750a45a783 + $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz To compare the archive contents zdiff can be used. - $ zdiff -u 2.37-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.37-master.patch.gz + $ zdiff -u 2.38-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz */ - ./2.37-master.patch.gz + ./2.38-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -89,13 +89,26 @@ stdenv.mkDerivation ({ ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch - /* Patch derived from archlinux (at the time of adding they're at 2.37), - https://github.com/archlinux/svntogit-packages/blob/packages/glibc/trunk/reenable_DT_HASH.patch + /* Patch derived from archlinux, + https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/blob/e54d98e2d1aae4930ecad9404ef12234922d9dfd/reenable_DT_HASH.patch - See https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 for context. + See also https://github.com/ValveSoftware/Proton/issues/6051 + & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 */ ./reenable_DT_HASH.patch ] + /* NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost + every HPC piece of software, without this patch CUDA compilation on ARM + is effectively broken. See + https://forums.developer.nvidia.com/t/nvcc-fails-to-build-with-arm-neon-instructions-cpp-vs-cu/248355/2. + */ + ++ ( + let + isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64; + isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux; + in + lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch + ) ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -135,6 +148,7 @@ stdenv.mkDerivation ({ "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") + "--enable-fortify-source" ] ++ lib.optionals (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) [ # This feature is currently supported on # i386, x86_64 and x32 with binutils 2.29 or later, @@ -159,7 +173,7 @@ stdenv.mkDerivation ({ "libc_cv_as_needed=no" ] ++ lib.optional withGd "--with-gd" - ++ lib.optional (!withLibcrypt) "--disable-crypt"; + ++ lib.optional withLibcrypt "--enable-crypt"; makeFlags = (args.makeFlags or []) ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" @@ -274,7 +288,7 @@ stdenv.mkDerivation ({ license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco ma27 ]; + maintainers = with maintainers; [ eelco ma27 connorbaker ]; platforms = platforms.linux; } // (args.meta or {}); }) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 1c822bf1ed0..be3bee081e7 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -3,7 +3,7 @@ , profilingLibraries ? false , withGd ? false , withLibcrypt? false -, buildPackages +, pkgsBuildBuild , libgcc }: @@ -95,17 +95,26 @@ in "user-defined-trusted-dirs=${libgcc}/lib" ]; - postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then '' + postInstall = previousAttrs.postInstall + (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} localedata/install-locales - '' else lib.optionalString stdenv.buildPlatform.isLinux '' + '' else lib.optionalString stdenv.buildPlatform.isLinux # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html # Instead of using their patch to build a build-native localedef, - # we simply use the one from buildPackages + # we simply use the one from pkgsBuildBuild. + # + # Note that we can't use pkgsBuildHost (aka buildPackages) here, because + # that will cause an eval-time infinite recursion: "buildPackages.glibc + # depended on buildPackages.libgcc, which, since it's GCC, depends on the + # target's bintools, which depend on the target's glibc, which, again, + # depends on buildPackages.glibc, causing an infinute recursion when + # evaluating buildPackages.glibc when glibc hasn't come from stdenv + # (e.g. on musl)." https://github.com/NixOS/nixpkgs/pull/259964 + '' pushd ../glibc-2*/localedata export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata - mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale - ${lib.getBin buildPackages.glibc}/bin/localedef \ + mkdir -p $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale + ${lib.getBin pkgsBuildBuild.glibc}/bin/localedef \ --alias-file=../intl/locale.alias \ -i locales/C \ -f charmaps/UTF-8 \ @@ -115,7 +124,7 @@ in else "--big-endian"} \ C.UTF-8 - cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib + cp -r $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale $out/lib popd '') + '' @@ -145,7 +154,7 @@ in ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so ln -sf $out/lib/librt.so.1 $out/lib/librt.so ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so - ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so + test -f $out/lib/libutil.so.1 && ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so touch $out/lib/libpthread.a # Put libraries for static linking in a separate output. Note @@ -154,6 +163,8 @@ in mkdir -p $static/lib mv $out/lib/*.a $static/lib mv $static/lib/lib*_nonshared.a $out/lib + # If libutil.so.1 is missing, libutil.a is required. + test -f $out/lib/libutil.so.1 || mv $static/lib/libutil.a $out/lib # Some of *.a files are linker scripts where moving broke the paths. sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ -i "$static"/lib/*.a diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh index d91f936c937..27894b09b91 100644 --- a/pkgs/development/libraries/glibc/locales-builder.sh +++ b/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 diff --git a/pkgs/development/libraries/glibc/reenable_DT_HASH.patch b/pkgs/development/libraries/glibc/reenable_DT_HASH.patch index f828b011bd9..87a2329d824 100644 --- a/pkgs/development/libraries/glibc/reenable_DT_HASH.patch +++ b/pkgs/development/libraries/glibc/reenable_DT_HASH.patch @@ -1,145 +1,28 @@ -From e47de5cb2d4dbecb58f569ed241e8e95c568f03c Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Fri, 29 Apr 2022 16:37:51 +0200 -Subject: [PATCH] Do not use --hash-style=both for building glibc shared - objects +From 31915e55f9c34f6137ab1c5ac002375a2d5d4589 Mon Sep 17 00:00:00 2001 +From: Frederik Schwan <frederik.schwan@linux.com> +Date: Fri, 4 Aug 2023 15:19:57 +0200 +Subject: [PATCH] force --hash-style=both to keep compatibility with old niche + software -The comment indicates that --hash-style=both was used to maintain -compatibility with static dlopen, but we had many internal ABI -changes since then, so this compatiblity does not add value anymore. - -Reviewed-by: Carlos O'Donell <carlos@redhat.com> --- - Makeconfig | 9 +++++++++ - Makerules | 7 +++++++ - config.make.in | 1 + - configure | 28 ++++++++++++++++++++++++++++ - configure.ac | 16 ++++++++++++++++ - 5 files changed, 61 insertions(+) + Makeconfig | 4 ++++ + 1 file changed, 4 insertions(+) -diff --git b/Makeconfig a/Makeconfig -index 760f14e92f..0aa5fb0099 100644 ---- b/Makeconfig -+++ a/Makeconfig -@@ -362,6 +362,15 @@ relro-LDFLAGS = -Wl,-z,relro +diff --git a/Makeconfig b/Makeconfig +index 77d7fd14df..2ae67c4beb 100644 +--- a/Makeconfig ++++ b/Makeconfig +@@ -378,6 +378,10 @@ relro-LDFLAGS = -Wl,-z,relro LDFLAGS.so += $(relro-LDFLAGS) LDFLAGS-rtld += $(relro-LDFLAGS) -+ifeq (yes,$(have-hash-style)) -+# For the time being we unconditionally use 'both'. At some time we -+# should declare statically linked code as 'out of luck' and compile -+# with --hash-style=gnu only. +hashstyle-LDFLAGS = -Wl,--hash-style=both +LDFLAGS.so += $(hashstyle-LDFLAGS) +LDFLAGS-rtld += $(hashstyle-LDFLAGS) -+endif -+ - ifeq (no,$(build-pie-default)) - pie-default = $(no-pie-ccflag) - else # build-pie-default -diff --git b/Makerules a/Makerules -index 354528b8c7..428464f092 100644 ---- b/Makerules -+++ a/Makerules -@@ -557,6 +557,13 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules - -Wl,--verbose 2>/dev/null | \ - sed > $@T \ - -e '/^=========/,/^=========/!d;/^=========/d' \ -+ $(if $(filter yes,$(have-hash-style)), \ -+ -e 's/^.*\.gnu\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ -e '/^[ ]*\.hash[ ]*:.*$$/{h;d;}' \ -+ -e '/DATA_SEGMENT_ALIGN/{H;g}' \ -+ , \ -+ -e 's/^.*\.hash[ ]*:.*$$/ .note.ABI-tag : { *(.note.ABI-tag) } &/' \ -+ ) \ - -e 's/^.*\*(\.dynbss).*$$/& \ - PROVIDE(__start___libc_freeres_ptrs = .); \ - *(__libc_freeres_ptrs) \ -diff --git b/config.make.in a/config.make.in -index fff4c78dd0..bf728c71c0 100644 ---- b/config.make.in -+++ a/config.make.in -@@ -70,6 +70,7 @@ have-libcap = @have_libcap@ - have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ - fno-unit-at-a-time = @fno_unit_at_a_time@ - bind-now = @bindnow@ -+have-hash-style = @libc_cv_hashstyle@ - use-default-link = @use_default_link@ - have-cxx-thread_local = @libc_cv_cxx_thread_local@ - have-loop-to-function = @libc_cv_cc_loop_to_function@ -diff --git b/configure a/configure -index 716dc041b6..5a730dc5fc 100755 ---- b/configure -+++ a/configure -@@ -622,6 +622,7 @@ libc_cv_cc_nofma - libc_cv_mtls_dialect_gnu2 - fno_unit_at_a_time - libc_cv_has_glob_dat -+libc_cv_hashstyle - libc_cv_fpie - libc_cv_z_execstack - ASFLAGS_config -@@ -6193,6 +6194,33 @@ $as_echo "$libc_cv_fpie" >&6; } - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style option" >&5 -+$as_echo_n "checking for --hash-style option... " >&6; } -+if ${libc_cv_hashstyle+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat > conftest.c <<EOF -+int _start (void) { return 42; } -+EOF -+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp -+ -fPIC -shared -o conftest.so conftest.c -+ -Wl,--hash-style=both -nostdlib 1>&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; } -+then -+ libc_cv_hashstyle=yes -+else -+ libc_cv_hashstyle=no -+fi -+rm -f conftest* -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_hashstyle" >&5 -+$as_echo "$libc_cv_hashstyle" >&6; } -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_DAT reloc" >&5 - $as_echo_n "checking for GLOB_DAT reloc... " >&6; } - if ${libc_cv_has_glob_dat+:} false; then : -diff --git b/configure.ac a/configure.ac -index d08ad4d64e..a045f6608e 100644 ---- b/configure.ac -+++ a/configure.ac -@@ -1360,6 +1360,22 @@ LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpie=yes], [libc_cv_fpie=no]) - - AC_SUBST(libc_cv_fpie) - -+AC_CACHE_CHECK(for --hash-style option, -+ libc_cv_hashstyle, [dnl -+cat > conftest.c <<EOF -+int _start (void) { return 42; } -+EOF -+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp -+ -fPIC -shared -o conftest.so conftest.c -+ -Wl,--hash-style=both -nostdlib 1>&AS_MESSAGE_LOG_FD]) -+then -+ libc_cv_hashstyle=yes -+else -+ libc_cv_hashstyle=no -+fi -+rm -f conftest*]) -+AC_SUBST(libc_cv_hashstyle) + - AC_CACHE_CHECK(for GLOB_DAT reloc, - libc_cv_has_glob_dat, [dnl - cat > conftest.c <<EOF + # Linker options to enable and disable DT_RELR. + ifeq ($(have-dt-relr),yes) + dt-relr-ldflag = -Wl,-z,pack-relative-relocs -- -2.37.1 +2.41.0 diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 8af09dcd6f6..417d70d621b 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; - # https://github.com/g-truc/glm/pull/1055 - # Fix more implicit-int-float-conversion warnings # (https://github.com/g-truc/glm/pull/986 wasn't enough, and -Werror is used) - patches = [(fetchpatch { - url = "https://github.com/kraj/glm/commit/bd9b5060bc3b9581090d44f15b4e236566ea86a6.patch"; - sha256 = "sha256-QO4o/wV564kJimBcEyr9TWzREEnRJ1n0j0HPojN4pkI="; - })]; + # (https://github.com/g-truc/glm/pull/1055 neither) + patches = [ + (fetchpatch { + name = "glm-0.9.9.8-clang.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/glm/files/glm-0.9.9.8-clang.patch?id=79476d4b145a4a6b0cbc0e73a6cefb5d584bf8fa"; + hash = "sha256-D8O+qofnGUEaH5nQGdNddwHyr5FhPQa/lOup4z4SFgY="; + }) + ]; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 2b088eb459a..0315f39c605 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -6,22 +6,22 @@ # files. let - rev = "d4e37b5868ef910e3e52744c34408084bb13051c"; + rev = "28ea239c53a2d5d8800c472bc2452eaa16e37af2"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { name = "config.guess-${builtins.substring 0 7 rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "191czpnbc1nxrygg8fd3839y1f4m9x43rp57vgrsas6p07zzh3c1"; + hash = "sha256-7CV3YUJSMm+InfHel7mkV8A6mpSBEEhWPCEaRElti6M="; }; configSub = fetchurl { name = "config.sub-${builtins.substring 0 7 rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "0148p54gw10p6sk2rn3gi9vvqm89rk8kcvl9335ckayhanx31381"; + hash = "sha256-Rlxf5nx9NrcugIgScWRF1NONS5RzTKjTaoY50SMjh4s="; }; in stdenv.mkDerivation { pname = "gnu-config"; - version = "2023-07-31"; + version = "2023-09-19"; unpackPhase = '' runHook preUnpack diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 4050f3e4d12..7ba77c14d6c 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -158,6 +158,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 artturin ]); pkgConfigModules = [ "gobject-introspection-1.0" ]; platforms = platforms.unix; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; license = with licenses; [ gpl2 lgpl2 ]; longDescription = '' diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index b223f249f83..4dec79e0e2d 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - hash = "sha256-lVHjcIGtO96BAYoNJPJFw/ggaZBUlZj7Mal6aDgKe3E="; + hash = "sha256-BD4u/hi0rSK5bUNN3nY/vtMs+NbCINxp3w0P+53Gb8Y="; }; patches = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { pkg-config texinfo ] ++ lib.optionals pythonSupport [ - python3.pythonForBuild + python3.pythonOnBuildForHost ncurses swig2 which diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 1e2eddf2751..85ec3352f70 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphene-hardened-malloc"; - version = "11"; + version = "12"; src = fetchFromGitHub { owner = "GrapheneOS"; repo = "hardened_malloc"; rev = finalAttrs.version; - sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU="; + sha256 = "sha256-ujwzr4njNsf/VTyEq7zKHWxoivU3feavSTx+MLIj1ZM="; }; doCheck = true; diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 1ad814e2b95..2972d5712cb 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -77,6 +77,10 @@ stdenv.mkDerivation rec { "-Dintrospection=enabled" "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" + ] ++ lib.optionals stdenv.isAarch32 [ + # the box test is failing with SIGBUS on armv7l-linux + # https://github.com/ebassi/graphene/issues/215 + "-Darm_neon=false" ]; doCheck = true; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 0532907ac15..daf3bad132d 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.57.0"; # N.B: if you change this, please update: + version = "1.59.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; + hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; fetchSubmodules = true; }; @@ -37,14 +37,8 @@ stdenv.mkDerivation rec { (fetchpatch { # armv6l support, https://github.com/grpc/grpc/pull/21341 name = "grpc-link-libatomic.patch"; - url = "https://github.com/lopsided98/grpc/commit/164f55260262c816e19cd2c41b564486097d62fe.patch"; - hash = "sha256-d6kMyjL5ZnEnEz4XZfRgXJBH53gp1r7q1tlwh+HM6+Y="; - }) - # Fix generated CMake config file - # FIXME: remove when merged - (fetchpatch { - url = "https://github.com/grpc/grpc/pull/33361/commits/117dc80eb43021dd5619023ef6d02d0d6ec7ae7a.patch"; - hash = "sha256-VBk3ZD5h9uOQVN0st+quUQK/wXqvfFNk8G8AN4f2MQo="; + url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; + hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; }) ]; @@ -64,6 +58,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" + "-D_gRPC_CPP_PLUGIN=${buildPackages.grpc}/bin/grpc_cpp_plugin" ] # The build scaffold defaults to c++14 on darwin, even when the compiler uses # a more recent c++ version by default [1]. However, downgrades are @@ -94,13 +89,12 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=unknown-warning-option" - ] ++ lib.optionals stdenv.isAarch64 [ - "-Wno-error=format-security" - ] - ); + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error" + ] ++ lib.optionals stdenv.isDarwin [ + # Workaround for https://github.com/llvm/llvm-project/issues/48757 + "-Wno-elaborated-enum-base" + ]); enableParallelBuilds = true; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index c1003a6e33f..cdc27587413 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,11 +1,13 @@ -{ fetchurl, lib, stdenv, libidn, libkrb5 }: +{ fetchurl, lib, stdenv, libidn, libkrb5 +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gsasl"; version = "2.2.0"; src = fetchurl { - url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz"; + url = "mirror://gnu/gsasl/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k="; }; @@ -24,6 +26,8 @@ stdenv.mkDerivation rec { ''; doCheck = !stdenv.hostPlatform.isDarwin; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "GNU SASL, Simple Authentication and Security Layer library"; @@ -38,6 +42,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ shlevy ]; + pkgConfigModules = [ "libgsasl" ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 3f3bb65fbe4..7534ea5d08a 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -4,7 +4,7 @@ , glib , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , meson , ninja # just for passthru diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index 7dbe5cd2bbf..6c5c98b77d7 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -14,11 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja gobject-introspection libtool vala ]; buildInputs = [ glib libcanberra ]; - mesonFlags = [ - "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - "-Denable_vala=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - ]; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index fa7eb93fe0c..c4d15352020 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 icu + vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN) ]; propagatedBuildInputs = [ @@ -56,6 +57,9 @@ stdenv.mkDerivation rec { configureFlags = [ "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" "GLIB_MKENUMS=${lib.getDev buildPackages.glib}/bin/glib-mkenums" + "PKG_CONFIG_VAPIGEN_VAPIGEN=${lib.getBin buildPackages.vala}/bin/vapigen" + "--enable-introspection=yes" + "--enable-vala=yes" ]; passthru = { diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 276f2d192ef..72c8b76e59f 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -109,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-5k51za/X/y/H/DToVbBrHj7SJ8wG+jeNF7vNdngMM4w="; + hash = "sha256-tAKc0pCKCJxV8dkCpWXQB0lclbFELYOEhdxH+xLfcTc="; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 449873bc7c5..d9b624a5994 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.5"; + version = "1.22.6"; 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-7dQzi0XCapryjA01qrlkoCTDiEum9SDYQo3wQhLIyTo="; + hash = "sha256-UPK00XwC7v5DC776jFzRNLG+eKU8D2DpURNtls9J/Us="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index ed7396f291c..96899b63e5b 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.5"; + version = "1.22.6"; 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-RAjXkw84GAnoWReswZcS8XMmG6hb3yDFVnsqIbEZO2E="; + hash = "sha256-9QDmz93/VZCPk3cR/CaghA3iih6exJYhwLbxrb2PgY4="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 5b1396f35d5..917a5041eee 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-Kt0VGapu6wHVRMuUKTaI7jvCB59rymB1v1wj0AoJIb4="; + hash = "sha256-iShWDvrxYTfDAoXnGHCOXQurB3frTvgSfgJ04SDT2Gs="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index a8bbb632055..93ddc619a57 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-vM3TvWHYaCmxbODiBtthsz95SsF5JCP558xl110aMbU="; + hash = "sha256-dI1CNnLFl/h24TCAT7mEhI9bS4nv14pQbLF/dkZ5UwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index f967e2e0ce1..8ff8220aa75 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,6 +10,7 @@ , orc , bzip2 , gettext +, libGL , libv4l , libdv , libavc1394 @@ -52,26 +53,15 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-tnsxMTpUxpKbgpadQdPP3y9Y21c/tfSR5rul2ErqB3g="; + hash = "sha256-s7B/4/HOf+k6qb5yF4ZgRFSPNcSneSKA7sfhCKMvmBc="; }; - # TODO: Patch is conditional to spare rebuilds during the current staging-next cycle and should be removed during the next bump - patches = lib.optionals qt5Support [ - # Needed until https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5083 is merged and released - (fetchpatch { - name = "gst-plugins-good-fix-qt5-without-viv-fb.patch"; - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/03d8ef0b7c6e70eb936de0514831c1aafc763dcf.diff"; - hash = "sha256-17XU/W/TMPg5669O1EBXByAN/VwFu/0idTg5ze3M/D4="; - stripLen = 2; - }) - ]; - strictDeps = true; depsBuildBuild = [ pkg-config ]; @@ -90,6 +80,7 @@ stdenv.mkDerivation rec { hotdoc ] ++ lib.optionals qt5Support (with qt5; [ qtbase + qttools ]) ++ lib.optionals qt6Support (with qt6; [ qtbase qttools @@ -139,6 +130,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ + libGL libv4l libpulseaudio libavc1394 diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 2309e8717e2..7dbd9b61cbc 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-hYPwwfT8sB7tEfoePCESZUOovXOe1Pwdsx91alqwHZo="; + hash = "sha256-d4nmQIOIol8jy/lIz8XGIw1zW7zYt/N/SgHJ40ih46c="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index e0d324936dd..ee467f965c8 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -2,13 +2,11 @@ , stdenv , fetchFromGitLab , fetchpatch -, writeText , rustPlatform , meson , ninja , python3 , pkg-config -, rust , rustc , cargo , cargo-c @@ -205,14 +203,7 @@ stdenv.mkDerivation rec { ) ++ [ (lib.mesonOption "sodium-source" "system") (lib.mesonEnable "doc" enableDocumentation) - ] ++ (let - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--cross-file=${crossFile}" - ]); + ]; # turn off all auto plugins since we use a list of plugins we generate mesonAutoFeatures = "disabled"; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 885726ee2ac..aa211eb51a5 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-80PrVJZOvU2MBxvl7srVhvKP6wFW4DbgaxSNDn/rscA="; + hash = "sha256-CuM6i1BEO2LxFYGpGB6Qa0HNOHey15nb6nKRLD7aS7M="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 2392d7f341d..cf5f93707cc 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.5"; + version = "1.22.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-JoBHOyGBWPGEZ8rD4cUCkbf/TgcQ3TUKWeqsvCnAmlQ="; + hash = "sha256-PjFFTJjLL39tLTVezrkzqJL6Dx3Am8NsmryTDY4pykg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index c5d400048df..d2227763f4e 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.5"; + version = "1.22.6"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-qaVQJnyVhN8OjHBDTTBHbo/QAYtzPBwe4z3q9CK9sks="; + hash = "sha256-2bovwmvvmMeOmCxZn1hdRru2X+Ei2onC16tB9GilLHs="; }; outputs = [ diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 73914495d6d..45e640e2a70 100644 --- a/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 539cfc37051..b2afb21b621 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isDarwin [ ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch ./patches/2.0-darwin-x11.patch + # Fixes an incompatible function pointer conversion and implicit int errors with clang 16. + ./patches/2.0-clang.patch ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index a527faf5a8b..27afba7833e 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -23,7 +23,8 @@ , at-spi2-atk , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , fribidi , xorg , libepoxy @@ -110,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc # For xmllint libxml2 - ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ lib.optionals ((withIntrospection || compileSchemas) && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ] ++ lib.optionals waylandSupport [ wayland-scanner @@ -183,6 +184,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace meson.build \ --replace "x11_enabled = false" "" + # this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled. + substituteInPlace meson.build \ + --replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}' + files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index b7e8c13ccca..0503ac199f9 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -1,5 +1,6 @@ { lib , stdenv +, buildPackages , substituteAll , fetchurl , pkg-config @@ -7,6 +8,7 @@ , graphene , gi-docgen , meson +, mesonEmulatorHook , ninja , python3 , makeWrapper @@ -45,6 +47,7 @@ , wayland-scanner , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux +, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , cups , AppKit , Cocoa @@ -99,6 +102,8 @@ stdenv.mkDerivation rec { sassc gi-docgen libxml2 # for xmllint + ] ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ] ++ lib.optionals waylandSupport [ wayland-scanner ] ++ setupHooks; @@ -190,6 +195,10 @@ stdenv.mkDerivation rec { }; postPatch = '' + # this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled. + substituteInPlace meson.build \ + --replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}' + files=( build-aux/meson/gen-demo-header.py demos/gtk-demo/geninclude.py diff --git a/pkgs/development/libraries/gtk/patches/2.0-clang.patch b/pkgs/development/libraries/gtk/patches/2.0-clang.patch new file mode 100644 index 00000000000..1e2e73b9833 --- /dev/null +++ b/pkgs/development/libraries/gtk/patches/2.0-clang.patch @@ -0,0 +1,49 @@ +diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c +index 4317523fb8..3c09cd3ae8 100644 +--- a/gtk/gtkscale.c ++++ b/gtk/gtkscale.c +@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale, + mark->position = position; + + priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark, +- (GCompareFunc) compare_marks, ++ (GCompareDataFunc) compare_marks, + GINT_TO_POINTER ( + gtk_range_get_inverted (GTK_RANGE (scale)) + )); +diff --git a/tests/testmenubars.c b/tests/testmenubars.c +index 416a939861..c65e82be26 100644 +--- a/tests/testmenubars.c ++++ b/tests/testmenubars.c +@@ -21,7 +21,7 @@ + #include <gtk/gtk.h> + + static GtkWidget * +-create_menu (depth) ++create_menu (int depth, gboolean _unused) + { + GtkWidget *menu; + GtkWidget *menuitem; +@@ -35,19 +35,19 @@ create_menu (depth) + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + menuitem = gtk_menu_item_new_with_mnemonic ("Two"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + menuitem = gtk_menu_item_new_with_mnemonic ("Three"); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); + gtk_widget_show (menuitem); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), +- create_menu (depth - 1)); ++ create_menu (depth - 1, _unused)); + + return menu; + } diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix index ec1f00cdc36..d6997019308 100644 --- a/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk4-layer-shell"; - version = "1.0.1"; + version = "1.0.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk4-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-MG/YW4AhC2joUX93Y/pzV4s8TrCo5Z/I3hAT70jW8dw="; + hash = "sha256-decjPkFkYy7kIjyozsB7BEmw33wzq1EQyIBrxO36984="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 82c5ea6597a..1d3f15ba987 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.7"; + version = "3.24.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HXo1r5xc7MrLJE7jwt65skVyDYUQrFx+b0tvmUfmeJw="; + sha256 = "0pQMZJIuW5WFVLI9TEHRg56p5D4NLls4Gc+0aCSgmMQ="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 9ffc49e5588..d6fe7044013 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -17,13 +17,13 @@ }: let - pythonEnv = python3.pythonForBuild.withPackages (ps: with ps; [ + pythonEnv = python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ]); in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.4.6"; + version = "0.4.8"; outputs = [ "bin" "out" "dev" "devdoc" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libgusb"; rev = "refs/tags/${version}"; - hash = "sha256-CtB9+5dDs+l05NyIFkKJpS1x3zHSykhLW3HiIM0RUWY="; + hash = "sha256-xhWx45uOh8Yokd3/32CQ6tsdkgGaYUOvaylrq/jmoP0="; }; patches = [ diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 7fd4572e0b7..b88daae22db 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -5,6 +5,7 @@ , meson , ninja , pkg-config +, substituteAll , gettext , dbus , glib @@ -53,12 +54,9 @@ stdenv.mkDerivation rec { }; patches = [ - # Hardcode the ssh path again. - # https://gitlab.gnome.org/GNOME/gvfs/-/issues/465 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch"; - hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8="; - revert = true; + (substituteAll { + src = ./hardcode-ssh-path.patch; + ssh_program = "${lib.getBin openssh}/bin/ssh"; }) ]; @@ -76,7 +74,6 @@ stdenv.mkDerivation rec { pkg-config gettext wrapGAppsHook - libxml2 libxslt docbook_xsl docbook_xml_dtd_42 @@ -92,7 +89,7 @@ stdenv.mkDerivation rec { libimobiledevice libbluray libnfs - openssh + libxml2 gsettings-desktop-schemas libsoup_3 ] ++ lib.optionals udevSupport [ diff --git a/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch b/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch new file mode 100644 index 00000000000..aaf8e291aa8 --- /dev/null +++ b/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/meson.build b/daemon/meson.build +index 72a16890..718944e1 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -256,7 +256,7 @@ if enable_sftp + '-DDEFAULT_BACKEND_TYPE=sftp', + '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,', + '-DMAX_JOB_THREADS=1', +- '-DSSH_PROGRAM="ssh"', ++ '-DSSH_PROGRAM="@ssh_program@"', + ] + + programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}} diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 227015b76b9..6c6818b455d 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.7.1"; + version = "22.7.2"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TSi537RLZGwnyC1nL/Ge3lTlV2FmH1nmAzFSHmaTv04="; + hash = "sha256-vcCugIohuZg+GhUA7ZgkyhMxN0KSvCFVO/HLOnrNxxA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 41e29d0d88a..88f373dd4af 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ , ninja , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , icu , graphite2 , harfbuzz # The icu variant uses and propagates the non-icu one. @@ -30,14 +30,15 @@ , gtk4 , mapnik , qt5 +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; version = "7.3.0"; src = fetchurl { - url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"; + url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; hash = "sha256-IHcHiXSaybqEbfM5g9vaItuDbHDZ9dBQy5qlNHCUqPs="; }; @@ -103,6 +104,9 @@ stdenv.mkDerivation rec { passthru.tests = { inherit gimp gtk3 gtk4 mapnik; inherit (qt5) qtbase; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -112,5 +116,10 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; license = licenses.mit; platforms = platforms.unix; + pkgConfigModules = [ + "harfbuzz" + "harfbuzz-gobject" + "harfbuzz-subset" + ]; }; -} +}) diff --git a/pkgs/development/libraries/hax11/default.nix b/pkgs/development/libraries/hax11/default.nix index 20533ff9131..608411ec71f 100644 --- a/pkgs/development/libraries/hax11/default.nix +++ b/pkgs/development/libraries/hax11/default.nix @@ -9,13 +9,13 @@ multiStdenv.mkDerivation (finalAttrs: { pname = "hax11"; - version = "unstable-2022-12-10"; + version = "unstable-2023-09-25"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "hax11"; - rev = "dce456f2b209f1be18d91064be257b66b69b7d9f"; - hash = "sha256-e3jYvbglQ5Nzoz/B+WEkCw48Tu+i73t+PNq51mjzmjY="; + rev = "2ea9d469785bbe0338729c4deeb902a259fd7b10"; + hash = "sha256-bYuIngZ76m5IgbbTFTZ8LJmpHl4nHS272Ci1B9eJIws="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/hipblas/default.nix b/pkgs/development/libraries/hipblas/default.nix deleted file mode 100644 index e8402c0d05b..00000000000 --- a/pkgs/development/libraries/hipblas/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, hip -, gfortran -, rocblas -, rocsolver -, gtest -, lapack-reference -, buildTests ? false -, buildBenchmarks ? false -, buildSamples ? false -}: - -# Can also use cuBLAS -stdenv.mkDerivation (finalAttrs: { - pname = "hipblas"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ] ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "hipBLAS"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-mSZCq8UaiffMzWVflW1nAX6CQZ1DqwWJaSIzKslZSEk="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - gfortran - ]; - - buildInputs = [ - rocblas - rocsolver - ] ++ lib.optionals buildTests [ - gtest - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - lapack-reference - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ] ++ lib.optionals buildSamples [ - "-DBUILD_CLIENTS_SAMPLES=ON" - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/hipblas-test $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/hipblas-bench $benchmark/bin - '' + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv $out/bin/example-* $sample/bin - '' + lib.optionalString (buildTests || buildBenchmarks || buildSamples) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm BLAS marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipBLAS"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - # Fixed in develop branch by using C++17 and related refactor - broken = versions.minor finalAttrs.version != versions.minor hip.version || buildTests || buildBenchmarks || buildSamples; - }; -}) diff --git a/pkgs/development/libraries/hipcub/default.nix b/pkgs/development/libraries/hipcub/default.nix deleted file mode 100644 index d0f33c0dc1d..00000000000 --- a/pkgs/development/libraries/hipcub/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocprim -, hip -, gtest -, gbenchmark -, buildTests ? false -, buildBenchmarks ? false -}: - -# CUB can also be used as a backend instead of rocPRIM. -stdenv.mkDerivation (finalAttrs: { - pname = "hipcub"; - version = "5.4.4"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "hipCUB"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-reFxSOYQOf9QcoZzaLt4D1yKGQoDxpt/3rwiHgP1DCo="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ]; - - buildInputs = [ - rocprim - ] ++ lib.optionals buildTests [ - gtest - ] ++ lib.optionals buildBenchmarks [ - gbenchmark - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${hip}" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_TEST=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_BENCHMARK=ON" - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/benchmark_* $benchmark/bin - '' + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Thin wrapper library on top of rocPRIM or CUB"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB"; - license = with licenses; [ bsd3 ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/hipfft/default.nix b/pkgs/development/libraries/hipfft/default.nix deleted file mode 100644 index c4d13cb4f55..00000000000 --- a/pkgs/development/libraries/hipfft/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, hip -, git -, rocfft -, gtest -, boost -, fftw -, fftwFloat -, openmp -, buildTests ? false -, buildBenchmarks ? false -, buildSamples ? false -}: - -# Can also use cuFFT -stdenv.mkDerivation (finalAttrs: { - pname = "hipfft"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ] ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "hipFFT"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-yDtm9J0wqH6zo4HcgQbqhvwbzbOiJPQ48gJ2gC8PvjA="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - hip - git - cmake - rocm-cmake - ]; - - buildInputs = [ - rocfft - ] ++ lib.optionals (buildTests || buildBenchmarks || buildSamples) [ - gtest - boost - fftw - fftwFloat - openmp - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DCMAKE_MODULE_PATH=${hip}/lib/cmake/hip" - "-DHIP_ROOT_DIR=${hip}" - "-DHIP_PATH=${hip}" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_RIDER=ON" - ] ++ lib.optionals buildSamples [ - "-DBUILD_CLIENTS_SAMPLES=ON" - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/hipfft-test $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/hipfft-rider $benchmark/bin - '' + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv clients/staging/hipfft_* $sample/bin - patchelf $sample/bin/hipfft_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" - '' + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "FFT marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipFFT"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/hipfort/default.nix b/pkgs/development/libraries/hipfort/default.nix deleted file mode 100644 index 5c5f0f61e81..00000000000 --- a/pkgs/development/libraries/hipfort/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, gfortran -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hipfort"; - version = "5.6.0"; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "hipfort"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-x1pF9md7RIcobE/4UxHxOaURbljFZGOashW1KM0lmo0="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - gfortran - ]; - - cmakeFlags = [ - "-DHIPFORT_COMPILER=${gfortran}/bin/gfortran" - "-DHIPFORT_AR=${gfortran.cc}/bin/gcc-ar" - "-DHIPFORT_RANLIB=${gfortran.cc}/bin/gcc-ranlib" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - postPatch = '' - patchShebangs bin - - substituteInPlace bin/hipfc bin/mymcpu \ - --replace "/bin/cat" "cat" - - substituteInPlace bin/CMakeLists.txt \ - --replace "/bin/mkdir" "mkdir" \ - --replace "/bin/cp" "cp" \ - --replace "/bin/sed" "sed" \ - --replace "/bin/chmod" "chmod" \ - --replace "/bin/ln" "ln" - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Fortran interfaces for ROCm libraries"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipfort"; - license = with licenses; [ mit ]; # mitx11 - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/hipsolver/default.nix b/pkgs/development/libraries/hipsolver/default.nix deleted file mode 100644 index ff499b342f2..00000000000 --- a/pkgs/development/libraries/hipsolver/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, hip -, gfortran -, rocblas -, rocsolver -, gtest -, lapack-reference -, buildTests ? false -, buildBenchmarks ? false -, buildSamples ? false -}: - -# Can also use cuSOLVER -stdenv.mkDerivation (finalAttrs: { - pname = "hipsolver"; - version = "5.4.4"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ] ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "hipSOLVER"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-p9hgKqRALLItv/HTpVlTsu+m9wlwCBYPYnJcm8StIao="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - gfortran - ]; - - buildInputs = [ - rocblas - rocsolver - ] ++ lib.optionals buildTests [ - gtest - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - lapack-reference - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ] ++ lib.optionals buildSamples [ - "-DBUILD_CLIENTS_SAMPLES=ON" - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/hipsolver-test $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/hipsolver-bench $benchmark/bin - '' + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv clients/staging/example-* $sample/bin - patchelf $sample/bin/example-* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" - '' + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm SOLVER marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipSOLVER"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix deleted file mode 100644 index 4f4b0c7cdc0..00000000000 --- a/pkgs/development/libraries/hipsparse/default.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocsparse -, hip -, gfortran -, git -, gtest -, openmp -, buildTests ? false -, buildSamples ? false -}: - -# This can also use cuSPARSE as a backend instead of rocSPARSE -stdenv.mkDerivation (finalAttrs: { - pname = "hipsparse"; - version = "5.4.4"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "hipSPARSE"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JWjmMvqIm4in1aPq2UgYmL0eWjrrRBiU6vH3FnCZZ40="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - gfortran - ]; - - buildInputs = [ - rocsparse - git - ] ++ lib.optionals buildTests [ - gtest - ] ++ lib.optionals (buildTests || buildSamples) [ - openmp - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ]; - - # We have to manually generate the matrices - # CMAKE_MATRICES_DIR seems to be reset in clients/tests/CMakeLists.txt - postPatch = '' - substituteInPlace clients/common/utility.cpp \ - --replace "#ifdef __cpp_lib_filesystem" " #if true" - '' + lib.optionalString buildTests '' - mkdir -p matrices - - ln -s ${rocsparse.passthru.matrices.matrix-01}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-02}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-03}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-04}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-05}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-06}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-07}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-08}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-09}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-10}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-11}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-12}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-13}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-14}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-15}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-16}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-17}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-18}/*.mtx matrices - ln -s ${rocsparse.passthru.matrices.matrix-19}/*.mtx matrices - - # Not used by the original cmake, causes an error - rm matrices/*_b.mtx - - echo "deps/convert.cpp -> deps/mtx2csr" - hipcc deps/convert.cpp -O3 -o deps/mtx2csr - - for mat in $(ls -1 matrices | cut -d "." -f 1); do - echo "mtx2csr: $mat.mtx -> $mat.bin" - deps/mtx2csr matrices/$mat.mtx matrices/$mat.bin - unlink matrices/$mat.mtx - done - - substituteInPlace clients/tests/CMakeLists.txt \ - --replace "\''${PROJECT_BINARY_DIR}/matrices" "/build/source/matrices" - ''; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/hipsparse-test $test/bin - mv /build/source/matrices $test - rmdir $out/bin - '' + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv clients/staging/example_* $sample/bin - patchelf --set-rpath $out/lib:${lib.makeLibraryPath ( - finalAttrs.buildInputs ++ [ hip gfortran.cc ])} $sample/bin/example_* - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm SPARSE marshalling library"; - homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 421782fc8d3..53bd7f067b2 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.5"; + version = "2.3.7"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-jVIYP0yA1oSsUMN4vtrkfawj9Q2MwNjSrwDBTvGErg8="; + hash = "sha256-Bytm5uaHYsfMeZ+JKs75003iHNObRBGDpV7Rz9yW7jQ="; }; strictDeps = true; diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index df3c295d4d9..a887ea55330 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-NtjgK/8XApEs4iSo9DzyK4Cc/FQJRAEwCwJbD24FP34="; + hash = "sha256-JBs2FvcdAvxysYhzakP0wU/mUCWfKZ8dk5ROWL5sej0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 91118946a18..dbaa4888922 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: +{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, python3, hunspell }: let @@ -934,4 +934,37 @@ rec { readmeFile = "README_pt_PT.txt"; license = with lib.licenses; [ gpl2 lgpl21 mpl11 ]; }; + + /* PERSIAN */ + + fa_IR = fa-ir; + fa-ir = mkDict { + pname = "hunspell-dict-fa-ir"; + version = "experimental-2022-09-04"; + dictFileName = "fa-IR"; + readmeFile = "README.md"; + src = fetchFromGitHub { + owner = "b00f"; + repo = "lilak"; + rev = "1a80a8e5c9377ac424d29ef20be894e250bc9765"; + hash = "sha256-xonnrclzgFEHdQ9g8ijm0bo9r5a5Y0va52NoJR5d8mo="; + }; + nativeBuildInputs = [ python3 ]; + buildPhase = '' + runHook preBuild + mkdir build + (cd src && python3 lilak.py) + mv build/* ./ + # remove timestamp from file + sed -i 's/^\(## *File Version[^,]*\),.*/\1/' fa-IR.aff + runHook postBuild + ''; + meta = with lib; { + description = "Hunspell dictionary for Persian (Iran)"; + homepage = "https://github.com/b00f/lilak"; + license = licenses.asl20; + maintainers = with maintainers; [ nix-julia ]; + platforms = platforms.all; + }; + }; } diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix index 2bfde78f7db..0b9765dac4c 100644 --- a/pkgs/development/libraries/hyperscan/default.nix +++ b/pkgs/development/libraries/hyperscan/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3 -, util-linux, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ragel +, python3 +, util-linux +, pkg-config , boost +, pcre , withStatic ? false # build only shared libs by default, build static+shared if true }: -# NOTICE: pkg-config, pcap and pcre intentionally omitted from build inputs -# pcap used only in examples, pkg-config used only to check for pcre -# which is fixed 8.41 version requirement (nixpkgs have 8.42+, and -# I not see any reason (for now) to backport 8.41. - stdenv.mkDerivation (finalAttrs: { pname = "hyperscan"; version = "5.4.2"; @@ -24,16 +26,24 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost ]; nativeBuildInputs = [ - cmake ragel python3 util-linux + cmake ragel python3 util-linux pkg-config ]; cmakeFlags = [ - "-DFAT_RUNTIME=ON" "-DBUILD_AVX512=ON" ] + ++ lib.optional (!stdenv.isDarwin) "-DFAT_RUNTIME=ON" ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; + # hyperscan CMake is completely broken for chimera builds when pcre is compiled + # the only option to make it build - building from source + # In case pcre is built from source, chimera build is turned on by default + preConfigure = lib.optional withStatic '' + mkdir -p pcre + tar xvf ${pcre.src} --strip-components 1 -C pcre + ''; + postPatch = '' sed -i '/examples/d' CMakeLists.txt substituteInPlace libhs.pc.in \ @@ -46,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck bin/unit-hyperscan + ${lib.optionalString withStatic ''bin/unit-chimera''} runHook postCheck ''; @@ -67,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.hyperscan.io/"; maintainers = with maintainers; [ avnik ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.bsd3; }; }) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index dc49780b329..21396a6bdaf 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' echo "${finalAttrs.version}" > IGRAPH_VERSION + '' + # https://github.com/igraph/igraph/issues/2340 + + lib.optionalString stdenv.isDarwin '' + sed -i "/safelocale/d" tests/CMakeLists.txt ''; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index ca7a47d3638..73bc80ef9d5 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.9"; + version = "1.90"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU="; + sha256 = "sha256-rJMWCPVhho34NcPvJZaB5d6EbZkJyLXEfeotplOOaiA="; }; dontBuild = true; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 4f3c956a440..ab237d9dca0 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -22,6 +22,8 @@ , enlightenment , xorg , testers + +, gitUpdater }: let @@ -29,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.11.1"; + version = "1.12.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-9xK2u53K1G2Lj0rVJhDcu667TMgLX9EvkxJNOjgPpr8="; + hash = "sha256-jCTS0YnE1a5gLb8vwPuxF6qSPqtsiDBB8P7spOjGd04="; }; buildInputs = [ @@ -59,19 +61,25 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "bin" "out" "dev" ]; - passthru.tests = { - inherit - libcaca - diffoscopeMinimal - feh - icewm - openbox - fluxbox - enlightenment; + passthru = { + tests = { + inherit + libcaca + diffoscopeMinimal + feh + icewm + openbox + fluxbox + enlightenment; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.enlightenment.org/old/legacy-imlib2.git"; + rev-prefix = "v"; + }; }; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { description = "Image manipulation library"; @@ -84,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://docs.enlightenment.org/api/imlib2/html"; - changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; + changelog = "https://git.enlightenment.org/old/legacy-imlib2/raw/tag/v${finalAttrs.version}/ChangeLog"; license = licenses.imlib2; pkgConfigModules = [ "imlib2" ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/development/libraries/inih/default.nix index cc4a4648723..61bca95d9b2 100644 --- a/pkgs/development/libraries/inih/default.nix +++ b/pkgs/development/libraries/inih/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "inih"; - version = "56"; + version = "57"; src = fetchFromGitHub { owner = "benhoyt"; repo = pname; rev = "r${version}"; - sha256 = "sha256-7k3i3pElihastUDrdf9DyRZMe2UNFckfLUFGb4rbWLo="; + hash = "sha256-a4nvhJSmZGqu2sdZSPNPjdnkzZ9dSKocL/XG2aDyFw4="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 331198e975e..b909051aa77 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.11"; + version = "22.3.12"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-pweKUf/KW64neJkEZwjePh7ft8KEBu1I9zCIx/lMQT8="; + sha256 = "sha256-BfMH3gFInWiBCuFZC0bZzpoZCEQzv/+tMvRH9ep5rLk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index cb014ed80bf..68028849b63 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "23.1.6"; + version = "23.3.5"; outputs = [ "out" "dev" ]; @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-Z1xBU+4SdwknXpYUS8EwEURNIsg2+R/U0CcW3FW325M="; + hash = "sha256-7OdLpqO2evNeyxceOtHEI7sJCVybqvrcM1ZZx8bI4xw="; }; patches = [ # fix platform detection (fetchpatch { - url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/04ffb03f744780a55aba311c612d708b00584bb7/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; - sha256 = "sha256-o/Pg0S53SYh3O7L+AwxOPl1Bx4TS6iKB8ql8GhhHI/o="; + url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/7376a99f060c26d6be8e56674da52a61662617b9/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; + hash = "sha256-57yePuHWYb3XXrB4MjYO2h6jbqfs4SGTLlLG91el8M4="; }) ]; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 7a68f130663..fa5d2b3b0c9 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isAarch64 zlib; meta = { - homepage = "http://irrlicht.sourceforge.net/"; + homepage = "https://irrlicht.sourceforge.io/"; license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index a7901466081..b3ef27e3877 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ OpenGL Cocoa IOKit ]; meta = { - homepage = "http://irrlicht.sourceforge.net/"; + homepage = "https://irrlicht.sourceforge.net/"; license = lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = lib.platforms.darwin; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix deleted file mode 100644 index 2df3e554c9b..00000000000 --- a/pkgs/development/libraries/jasper/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "jasper"; - version = "2.0.32"; - - src = fetchFromGitHub { - owner = "jasper-software"; - repo = pname; - rev = "version-${version}"; - hash = "sha256-Uwgtex0MWC/pOmEr8itHMIa4wxd97c/tsTzcLgV8D0I="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - meta = with lib; { - homepage = "https://jasper-software.github.io/jasper/"; - description = "Image processing/coding toolkit"; - longDescription = '' - JasPer is a software toolkit for the handling of image data. The software - provides a means for representing images, and facilitates the manipulation - of image data, as well as the import/export of such data in numerous - formats (e.g., JPEG-2000 JP2, JPEG, PNM, BMP, Sun Rasterfile, and - PGX). The import functionality supports the auto-detection (i.e., - automatic determination) of the image format, eliminating the need to - explicitly identify the format of coded input data. A simple color - management engine is also provided in order to allow the accurate - representation of color. Partial support is included for the ICC color - profile file format, an industry standard for specifying color. - - The JasPer software consists of a library and several application - programs. The code is written in the C programming language. This language - was chosen primarily due to the availability of C development environments - for most computing platforms when JasPer was first developed, circa 1999. - ''; - license = licenses.free; # MIT-like - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index 9bbd2135e0b..b4351f4e9df 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jffi"; - version = "1.3.11"; + version = "1.3.12"; src = fetchFromGitHub { owner = "jnr"; repo = "jffi"; rev = "jffi-${version}"; - sha256 = "sha256-fZnZH2j/IXbfsJkJG8s2ArOrWwVE2kgvSREVaSVoDyo="; + sha256 = "sha256-U0pBoKewZEen7aH3rIvZ8dKKeXKE1+Z5WtfM0HK6/LQ="; }; nativeBuildInputs = [ jdk ant texinfo pkg-config ]; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index ed1d4af35fb..017f0581dc9 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.28"; + version = "1.18.30"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-t3TcT8pUMiXYtejBY360E8Q2Oy5hPpUiJ3b3kqjOwOA="; + sha256 = "sha256-1+4SLu4erutFGCqJ/zb8LdCGhY0bL1S2Fcb+97odYBI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index a00399497e2..f8915282069 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, python3, autoreconfHook }: +{ lib, stdenv, fetchurl, python3, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; - sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; + url = "https://github.com/ArtifexSoftware/jbig2dec/archive/${version}/jbig2dec-${version}.tar.gz"; + hash = "sha256-qXBTaaZjOrpTJpNFDsgCxWI5fhuCRmLegJ7ekvZ6/yE="; }; postPatch = '' patchShebangs test_jbig2dec.py ''; - nativeBuildInputs = [ autoreconfHook ]; + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ autoconf automake libtool ]; nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/development/libraries/jbig2enc/default.nix b/pkgs/development/libraries/jbig2enc/default.nix index 734cb3839ad..7c847918c9f 100644 --- a/pkgs/development/libraries/jbig2enc/default.nix +++ b/pkgs/development/libraries/jbig2enc/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch +, python3 , leptonica , zlib , libwebp @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; + propagatedBuildInputs = [ leptonica zlib @@ -42,6 +44,11 @@ stdenv.mkDerivation rec { }) ]; + # We don't want to install this Python 2 script + postInstall = '' + rm "$out/bin/pdf.py" + ''; + # This is necessary, because the resulting library has # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib # in its rpath, which means that patchelf --shrink-rpath removes @@ -56,5 +63,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; platforms = lib.platforms.all; homepage = "https://github.com/agl/jbig2enc"; + mainProgram = "jbig2"; }; } diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index a14a220f519..ff2fca37fba 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-6"; + version = "6.0-7"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-jOKVS+BMADS/jIagOnYwxeGTpTMySmGlOHkPD2LJdkA="; + sha256 = "sha256-Z4getn/mVYIRANkIOyt7jMpcqHBvq5GXLK/ST5zV1r4="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 18c492dc93b..8a3b8658fbb 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { ; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; + env.NIX_LDFLAGS = lib.optionalString (stdenv.cc.libcxx != null) "-l${stdenv.cc.libcxx.cxxabi.libName}"; - doCheck = true; + # Tries to link test binaries binaries dynamically and fails + doCheck = !stdenv.hostPlatform.isStatic; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/jemalloc/rust.nix b/pkgs/development/libraries/jemalloc/rust.nix new file mode 100644 index 00000000000..1a9968933b1 --- /dev/null +++ b/pkgs/development/libraries/jemalloc/rust.nix @@ -0,0 +1,24 @@ +{ lib +, stdenv +, jemalloc +, writeText + +, unprefixed ? false +}: + +let + # On some platforms the unprefixed feature will be ignored: + # https://github.com/tikv/jemallocator/blob/ab0676d77e81268cd09b059260c75b38dbef2d51/jemalloc-sys/src/env.rs + unprefixed' = unprefixed && !stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAndroid; + +in jemalloc.overrideAttrs (oldAttrs: { + configureFlags = oldAttrs.configureFlags ++ [ + "--with-private-namespace=_rjem_" + ] ++ lib.optionals (!unprefixed') [ + "--with-jemalloc-prefix=_rjem_" + ]; + + setupHook = writeText "setup-hook.sh" '' + export JEMALLOC_OVERRIDE="@out@/lib/libjemalloc${stdenv.hostPlatform.extensions.library}" + ''; +}) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 4b54ccc0664..0ca03efca02 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -7,7 +7,7 @@ , nixosTests , pkg-config , gettext -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages , gobject-introspection , gi-docgen diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index e6768dc0fa5..517746aa9b5 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { strictDeps = true; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; diff --git a/pkgs/development/libraries/kcp/default.nix b/pkgs/development/libraries/kcp/default.nix index 69a2b91553e..29bab008798 100644 --- a/pkgs/development/libraries/kcp/default.nix +++ b/pkgs/development/libraries/kcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A Fast and Reliable ARQ Protocol"; homepage = "https://github.com/skywind3000/kcp"; license = licenses.mit; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 3543fef6633..2a264d47c24 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -25,21 +25,6 @@ mkDerivation { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; - # baloo suffers from issues when running on btrfs as well as with certain LVM/dm-crypt setups - # where the device id will change on reboot causing baloo to reindex all the files and then having - # duplicate files. A patch has been proposed that addresses this, which has not been accepted yet. - # However, without this patch, people tend to disable baloo rather than dealing with the constant - # reindexing. - # - # https://bugs.kde.org/show_bug.cgi?id=402154 - patches = [ - (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=159031"; - hash = "sha256-hCtNXUpRhIP94f7gpwTGWWh1h/7JRRJaRASIwHWQjnY="; - name = "use_fsid.patch"; - }) - ]; - # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index c72caa6d585..f53e0d6c16b 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.110/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.112/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 3b07654fb80..8815683aef6 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -26,7 +26,11 @@ mkDerivation { kded ]; outputs = [ "out" "dev" ]; + separateDebugInfo = true; patches = [ ./0001-Remove-impure-smbd-search-path.patch ]; + meta = { + homepage = "https://api.kde.org/frameworks/kio/html/"; + }; } diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index e9f812d68da..04256007ef2 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -6,6 +6,7 @@ mkDerivation { pname = "networkmanager-qt"; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 78aa189559f..c0ed3f7d79b 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,11 +1,11 @@ { mkDerivation , extra-cmake-modules -, aspell, qtbase, qttools +, aspell, hunspell, qtbase, qttools }: mkDerivation { pname = "sonnet"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ aspell qttools ]; + buildInputs = [ aspell hunspell qttools ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1fd8a2ba15a..f6909957ba4 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/attica-5.110.0.tar.xz"; - sha256 = "1lp7y0r3npv93kcw1fkgl8c2njbs6y4m8cg32b60pyjahfqspxd6"; - name = "attica-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/attica-5.112.0.tar.xz"; + sha256 = "0syg508bjfq5ycr246p3f4q37ihvqk5j7n66vkn7h7dvgwspjff5"; + name = "attica-5.112.0.tar.xz"; }; }; baloo = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/baloo-5.110.0.tar.xz"; - sha256 = "0bg2nyp7zp1mka7ng8bwcd0hrbglrdiz7xw43r9q8wycr9qmva1n"; - name = "baloo-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/baloo-5.112.0.tar.xz"; + sha256 = "17h83s5r70hg8qjv9vli43zv854jll40cmmh2pjcg7nlfi1ypcbz"; + name = "baloo-5.112.0.tar.xz"; }; }; bluez-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/bluez-qt-5.110.0.tar.xz"; - sha256 = "1xvr85i0lkdpca64dzd7wqasc7acpzvh2kawl9nrfkrn96vrm0cz"; - name = "bluez-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/bluez-qt-5.112.0.tar.xz"; + sha256 = "03kzvklzj9h4sl1850c1lh4b3z9lis7d6l9fb9cfnffh3wjpjagb"; + name = "bluez-qt-5.112.0.tar.xz"; }; }; breeze-icons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/breeze-icons-5.110.0.tar.xz"; - sha256 = "1m5z8g7rvilvwfn65yazci51i83ixv7fc5sh2v5vgxrlmhbysg0s"; - name = "breeze-icons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/breeze-icons-5.112.0.tar.xz"; + sha256 = "0n3xdja42hzn3hssj0a8d97kkb790kinp2xmslfl7w8izsz53p39"; + name = "breeze-icons-5.112.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/extra-cmake-modules-5.110.0.tar.xz"; - sha256 = "0f347y8q3ckgfq4skh2q69n67v3w9k680db0br4f43i37vdzaikp"; - name = "extra-cmake-modules-5.110.0.tar.xz"; + 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"; }; }; frameworkintegration = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/frameworkintegration-5.110.0.tar.xz"; - sha256 = "0ghl5p01g3jdj75wzyjwq4b0l0p98r0vkkf6zj6d3lbax207z0sq"; - name = "frameworkintegration-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/frameworkintegration-5.112.0.tar.xz"; + sha256 = "1kiy4vcr8lj82mhpgn99yw4w6lwr26yjmsfdv3n6ha667gqv2gn6"; + name = "frameworkintegration-5.112.0.tar.xz"; }; }; kactivities = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-5.110.0.tar.xz"; - sha256 = "1c1456jc3s7cl2l3kmkgprgngip0j9c7ssd0b0fvjd41dwhzhra5"; - name = "kactivities-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-5.112.0.tar.xz"; + sha256 = "0nzbvby11f14h5w2q5wa5kij7bpx01ffqsi8mmjk71imhq5mzkfz"; + name = "kactivities-5.112.0.tar.xz"; }; }; kactivities-stats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-stats-5.110.0.tar.xz"; - sha256 = "1agqsdgbmglrzpg9w4df9qdg4hf8g1nnnkq7adp6cxsj3x8c8zx4"; - name = "kactivities-stats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-stats-5.112.0.tar.xz"; + sha256 = "0czic2s147nhjphdkfymnakrw73bzi0pbmb8s3frrxsf4yp7gvzy"; + name = "kactivities-stats-5.112.0.tar.xz"; }; }; kapidox = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kapidox-5.110.0.tar.xz"; - sha256 = "1qi2mcslw0gsxc6p5q78lhg3if01j8dhxf0ypwb8njsfjcr45d24"; - name = "kapidox-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kapidox-5.112.0.tar.xz"; + sha256 = "0fa80ncx4h5izhw6vjjglmxcs9h4rvf2q1bcm0m4zcpky5h8bdqi"; + name = "kapidox-5.112.0.tar.xz"; }; }; karchive = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/karchive-5.110.0.tar.xz"; - sha256 = "1pqc0j4xkhwc6gdgg1q7pl3hjnrscwz8vbdz8jbvpaz51cy5iipw"; - name = "karchive-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/karchive-5.112.0.tar.xz"; + sha256 = "0rzxxgp5hcs63yfqisvf1m2m0qyrj2ri9966h5hc25jh5ajrgmi7"; + name = "karchive-5.112.0.tar.xz"; }; }; kauth = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kauth-5.110.0.tar.xz"; - sha256 = "1yymmyvhqgrwdpy5c2narh6d0ac41mw9ifrhckcyr22kdyrmgcz1"; - name = "kauth-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kauth-5.112.0.tar.xz"; + sha256 = "1xq5jhnp3dyykx84p5ijhi6kj0x2iz8k665bkkz4zcv9l8gf9jv7"; + name = "kauth-5.112.0.tar.xz"; }; }; kbookmarks = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kbookmarks-5.110.0.tar.xz"; - sha256 = "1k04mcfciv3gq4qw5gkpq7189wfxxlr427h4827m3hs3ysbgc4vh"; - name = "kbookmarks-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kbookmarks-5.112.0.tar.xz"; + sha256 = "12m8wx8sv12mwj2xprbr3ywr66mq3415byjfsz8f5yx4lhywkcfi"; + name = "kbookmarks-5.112.0.tar.xz"; }; }; kcalendarcore = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcalendarcore-5.110.0.tar.xz"; - sha256 = "19zb1g4lbiqy4vcay6hbjx9ak5r00frfn1hahpc544q9l0dznl52"; - name = "kcalendarcore-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcalendarcore-5.112.0.tar.xz"; + sha256 = "0najg934lylb5m64lmkpv3v7ri2g3ncsg8ycg7gkm8r93nypa60r"; + name = "kcalendarcore-5.112.0.tar.xz"; }; }; kcmutils = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcmutils-5.110.0.tar.xz"; - sha256 = "0ccgrd757ww890nvajw1s9yvq6iikp316q123rfminrc0mlrpzaq"; - name = "kcmutils-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcmutils-5.112.0.tar.xz"; + sha256 = "0b4l5hf90jrbj4bbrkmyz1va6znwd8dpp2w0i5h002xbpf6vwp2y"; + name = "kcmutils-5.112.0.tar.xz"; }; }; kcodecs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcodecs-5.110.0.tar.xz"; - sha256 = "1i15q8kg1dn72sxg9djvg9h4mhqh9rgvnsf3bz0pjd5jbwqqyv1v"; - name = "kcodecs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcodecs-5.112.0.tar.xz"; + sha256 = "0pnmqq5asj361x9fk1vapwssafbb2zxjr0nh8lp8666f675wg2yx"; + name = "kcodecs-5.112.0.tar.xz"; }; }; kcompletion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcompletion-5.110.0.tar.xz"; - sha256 = "0a9l6p9kfg074wxz0r9dn43baibrbzbh80x60rds2jaf3yjg212g"; - name = "kcompletion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcompletion-5.112.0.tar.xz"; + sha256 = "1k09ahwgz1fipdc1l2k13r97hgyvwjsr5dlvhkbrd384sip84q8j"; + name = "kcompletion-5.112.0.tar.xz"; }; }; kconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfig-5.110.0.tar.xz"; - sha256 = "1i9idh0rh8ryry5gf22wwgzd15y14jymxjdxbkgx13kqpfyqhaxd"; - name = "kconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfig-5.112.0.tar.xz"; + sha256 = "080qv53727ijdz9325kzl81nxchds3cpy6siv1h5s4scbb92dpl6"; + name = "kconfig-5.112.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfigwidgets-5.110.0.tar.xz"; - sha256 = "04mlw41xdps7qgnmmccqgs7jc5iipx2vqp9bd91l3sz4p90wj3sg"; - name = "kconfigwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfigwidgets-5.112.0.tar.xz"; + sha256 = "0yk84f9pwb600pligwa2022r9srz4fd7kkf90r7q7vmf5r3hl3r9"; + name = "kconfigwidgets-5.112.0.tar.xz"; }; }; kcontacts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcontacts-5.110.0.tar.xz"; - sha256 = "0gib8nlis59kbhydqvf6alwxvy4db94r2p3vpbcdy48gc4i06344"; - name = "kcontacts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcontacts-5.112.0.tar.xz"; + sha256 = "0q20xnj43ysq1wdymvl8j8zyvycsqs4hm2x72gz42hd9dlbp77s5"; + name = "kcontacts-5.112.0.tar.xz"; }; }; kcoreaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcoreaddons-5.110.0.tar.xz"; - sha256 = "0xcd2ph62a7kbm8camp1vnsxlaq1kmqm9hw9gyphcdh0rh6fi3bf"; - name = "kcoreaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcoreaddons-5.112.0.tar.xz"; + sha256 = "032n4fl4d8lhgmd08f7nfa18izrccggxhdbgk33vnf1lw7c6yamp"; + name = "kcoreaddons-5.112.0.tar.xz"; }; }; kcrash = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcrash-5.110.0.tar.xz"; - sha256 = "15j70r6afc0lyg41047r27l089gkq8fh39w9iyvhv0h8hfxxah6g"; - name = "kcrash-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcrash-5.112.0.tar.xz"; + sha256 = "1sarh8ncibl8bz7pkd5xs4dd5vciyj82pckazxx4f482irdzyxzx"; + name = "kcrash-5.112.0.tar.xz"; }; }; kdav = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdav-5.110.0.tar.xz"; - sha256 = "0qz5iq9fi1vk1z7w4wdh7kxrc06vnyrvs7n0llyrjaprzjn8yx6a"; - name = "kdav-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdav-5.112.0.tar.xz"; + sha256 = "1m6basdd6p0yaij9jdsc35sj198gsackk3dx4kci3a8zlvvag32g"; + name = "kdav-5.112.0.tar.xz"; }; }; kdbusaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdbusaddons-5.110.0.tar.xz"; - sha256 = "0ilzk67h5cxrjf78hw505pvbqvd2lkjk3m0g188pcw0sdg10xb8h"; - name = "kdbusaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdbusaddons-5.112.0.tar.xz"; + sha256 = "0n04z0srf3xzd0m9sa9f3q7hrzbjrg1hbajzm89p71hfr7dmcgjq"; + name = "kdbusaddons-5.112.0.tar.xz"; }; }; kdeclarative = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdeclarative-5.110.0.tar.xz"; - sha256 = "1vcqdi4lji97wm5vil2p1g7wi6rwrz0g6aiqf1nzi026fpsc8njj"; - name = "kdeclarative-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdeclarative-5.112.0.tar.xz"; + sha256 = "1wzhqp5mzbk9lz7ks4ggzb1k6c3fkxwwyzdapwfgn79k5qrhqvjk"; + name = "kdeclarative-5.112.0.tar.xz"; }; }; kded = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kded-5.110.0.tar.xz"; - sha256 = "1n8hzkwhqrx4mb7ahqnkga01zslcp82ya22hppfapldy83bfrgyl"; - name = "kded-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kded-5.112.0.tar.xz"; + sha256 = "16qiybj9q1v6j5csyx2f7pdpxih60psszyyvq9yj4ycdzjhjzmmn"; + name = "kded-5.112.0.tar.xz"; }; }; kdelibs4support = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdelibs4support-5.110.0.tar.xz"; - sha256 = "119hhc0f862kzr5flrlpg9b8xlcl1qxa5xkccad0hpba76pk2af4"; - name = "kdelibs4support-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdelibs4support-5.112.0.tar.xz"; + sha256 = "0rrzqyawck0mmh8xfs73jx6jghv5bm1346h3xkhgw6ydfzdv3kcv"; + name = "kdelibs4support-5.112.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdesignerplugin-5.110.0.tar.xz"; - sha256 = "146i8n9rrajh03x180z48qi8dn31dywsz052bhbn4yw61ag4w4nc"; - name = "kdesignerplugin-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdesignerplugin-5.112.0.tar.xz"; + sha256 = "0rrk7d06m1ywxf6n1crf510imidhfkpfb58qpaby2fzwb1ifmlyj"; + name = "kdesignerplugin-5.112.0.tar.xz"; }; }; kdesu = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdesu-5.110.0.tar.xz"; - sha256 = "0ll5k4lpn1v4bc365w2ky0qszikfz2r589ni8iyk109qdqciyrr9"; - name = "kdesu-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdesu-5.112.0.tar.xz"; + sha256 = "1yn16q3yrycrh6xsfh7faa5n9cr0lafiwh9dwr5p8rm62nmas83g"; + name = "kdesu-5.112.0.tar.xz"; }; }; kdewebkit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdewebkit-5.110.0.tar.xz"; - sha256 = "0p09lby7csx3j513lm91k247iwxby423cz7da51n20qncan8g65v"; - name = "kdewebkit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdewebkit-5.112.0.tar.xz"; + sha256 = "11za35zxaa3mlvmrkp4rx47sl6ihbc1xgcaf18r6a0cyn4zhx2fz"; + name = "kdewebkit-5.112.0.tar.xz"; }; }; kdnssd = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdnssd-5.110.0.tar.xz"; - sha256 = "0xmahgn572ah8ji4d4afalcl7r2krn971ix5jwcqgrj57m5haj45"; - name = "kdnssd-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdnssd-5.112.0.tar.xz"; + sha256 = "0cd1dm44f12n29d8idh29djhfd2z6lj4hc4l42hxx2nasi009p2s"; + name = "kdnssd-5.112.0.tar.xz"; }; }; kdoctools = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdoctools-5.110.0.tar.xz"; - sha256 = "1g05gppc6qzkag1x18anymbwdswpg32w6jh12x9jfj79vcp7wg4j"; - name = "kdoctools-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdoctools-5.112.0.tar.xz"; + sha256 = "1cinjrbg31pilzlir9vmigf86ypgpxr9mmyqpjfvq6yxvxfnq7li"; + name = "kdoctools-5.112.0.tar.xz"; }; }; kemoticons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kemoticons-5.110.0.tar.xz"; - sha256 = "1r1d3kw6wzw63kq9wy4ic2b9hcnmm4rs7v9f1z9jhq9m1jp0zy12"; - name = "kemoticons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kemoticons-5.112.0.tar.xz"; + sha256 = "037xj9i1x81npm7fyqizkyi7k4slakx1c5x9drp0py5133a0k6z8"; + name = "kemoticons-5.112.0.tar.xz"; }; }; kfilemetadata = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kfilemetadata-5.110.0.tar.xz"; - sha256 = "07ma48iq5vpnj391shm3s9an3rqhxskfziw6pksmzxxnga0whbl9"; - name = "kfilemetadata-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kfilemetadata-5.112.0.tar.xz"; + sha256 = "1yvz3439jmg8m0ry9z0930ya679fahphb6s7mci23xf5zjpczgy4"; + name = "kfilemetadata-5.112.0.tar.xz"; }; }; kglobalaccel = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kglobalaccel-5.110.0.tar.xz"; - sha256 = "1iw22vyrk07pzcsh41cvfp8i8589jm1yqn1cx1ad5rmryzsjalzp"; - name = "kglobalaccel-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kglobalaccel-5.112.0.tar.xz"; + sha256 = "0flb0rkw5bh1xb706pgzsjq41slma4xwg3ghmvrdr622qf87w9hh"; + name = "kglobalaccel-5.112.0.tar.xz"; }; }; kguiaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kguiaddons-5.110.0.tar.xz"; - sha256 = "0ajmxj8nhis6f4hwd64s9qfw3hbip80xrdy3d1wksykbq7g5b89c"; - name = "kguiaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kguiaddons-5.112.0.tar.xz"; + sha256 = "0yw4ikb14f2q1z0hr64bxnxvg770jjllqfvhbnl5hn3m7l61psmb"; + name = "kguiaddons-5.112.0.tar.xz"; }; }; kholidays = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kholidays-5.110.0.tar.xz"; - sha256 = "0zikajmic93wqgy9865pf61sdlnsyzzf2jal7bj25is7a1mk8mjc"; - name = "kholidays-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kholidays-5.112.0.tar.xz"; + sha256 = "1b5jdss17wvm66gwzh6qb0caz9b3fnr6cd902bvqa7dr1aby4j52"; + name = "kholidays-5.112.0.tar.xz"; }; }; khtml = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/khtml-5.110.0.tar.xz"; - sha256 = "17d87vjim32mn0s1d9zl9342aamqg4xmi6xh6d8ghrgms3vqc7in"; - name = "khtml-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/khtml-5.112.0.tar.xz"; + sha256 = "0rw6286w971q61gahm1qzic0gsfmfz8x449jw6zy38d9k17h7s2n"; + name = "khtml-5.112.0.tar.xz"; }; }; ki18n = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ki18n-5.110.0.tar.xz"; - sha256 = "03qks9kncvazq2wz3myrjgz5m0gjxm80m1ayv9vjndyyc74a9smw"; - name = "ki18n-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ki18n-5.112.0.tar.xz"; + sha256 = "06wng9mpr2ln9dd1ayvwglc6071iqg5285jisg95vgf2c3kl5m9k"; + name = "ki18n-5.112.0.tar.xz"; }; }; kiconthemes = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kiconthemes-5.110.0.tar.xz"; - sha256 = "0bb6r7jaknjyhyjhdrlji320qgb7cgxshcgab0209zk8dl8a510d"; - name = "kiconthemes-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kiconthemes-5.112.0.tar.xz"; + sha256 = "04nqw9a2c7bba5y7y741wqwm95jfpbva71q1fj43grd6hcqlff53"; + name = "kiconthemes-5.112.0.tar.xz"; }; }; kidletime = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kidletime-5.110.0.tar.xz"; - sha256 = "0hc30778d1k0vm4qsp58cf3d5bnws328qxazm8d5a6kxdc7izz44"; - name = "kidletime-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kidletime-5.112.0.tar.xz"; + sha256 = "0pch2baf9867w6llk98mxag2y3sjz6irqci88rrsnwn4s1vcs356"; + name = "kidletime-5.112.0.tar.xz"; }; }; kimageformats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kimageformats-5.110.0.tar.xz"; - sha256 = "0ivks2c2kgd26pr0n0b4x3hb7dmmq52vlp7f6ny14qpvm3cgnscd"; - name = "kimageformats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kimageformats-5.112.0.tar.xz"; + sha256 = "1lw9vvmb032ymy0a1443q3p9nwn8shc9kbaz05jw4jwa74wp7i65"; + name = "kimageformats-5.112.0.tar.xz"; }; }; kinit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kinit-5.110.0.tar.xz"; - sha256 = "0ps2299hf02yvgs971cb4bljbmdbcvcmm2xqz6q0h8asjkpkilv5"; - name = "kinit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kinit-5.112.0.tar.xz"; + sha256 = "1mij6nw1w0zyv724096pfbb0r95300yqb884bx3wlm5nibawwpz7"; + name = "kinit-5.112.0.tar.xz"; }; }; kio = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kio-5.110.0.tar.xz"; - sha256 = "0sy91zlk60q5jligxp870srfc6fhd3fyk5yamkg266yfvyy9m3r2"; - name = "kio-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kio-5.112.0.tar.xz"; + sha256 = "16gv0f8l4jn19mrwc52c6gw2n8hb28n6v7x6kx7qbs3z0wf57f44"; + name = "kio-5.112.0.tar.xz"; }; }; kirigami2 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kirigami2-5.110.0.tar.xz"; - sha256 = "13j9z0nha3wq97apgkj43bayqijpgy6a2l7f9iryww054aqdjggx"; - name = "kirigami2-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kirigami2-5.112.0.tar.xz"; + sha256 = "048f3sji3dx7q415fkmkj0xmnl0dxacdr9d08d5rqkxz2d94hzk3"; + name = "kirigami2-5.112.0.tar.xz"; }; }; kitemmodels = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemmodels-5.110.0.tar.xz"; - sha256 = "06gym33644npci4crhykyfyp2v74pya72kdzmqh4lkzp252pyfhj"; - name = "kitemmodels-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemmodels-5.112.0.tar.xz"; + sha256 = "130avvp4lq8f8pag39mna0p3rjyvhbq6akng9d4l01nf8287zv2s"; + name = "kitemmodels-5.112.0.tar.xz"; }; }; kitemviews = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemviews-5.110.0.tar.xz"; - sha256 = "1nqbypn0crbaqa8x19z0fh8mqbr8wbf8nc8wg0irzp32js9vcqyp"; - name = "kitemviews-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemviews-5.112.0.tar.xz"; + sha256 = "1xpk5xfrp38bjgsyvc3wmcq7vj1sa2wxz0wld2bby3nsixbrdq68"; + name = "kitemviews-5.112.0.tar.xz"; }; }; kjobwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kjobwidgets-5.110.0.tar.xz"; - sha256 = "1bl7igakmh1ipiamigs5s8fj6fy905b3j1dqgq9hxdxk59k1r1h2"; - name = "kjobwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kjobwidgets-5.112.0.tar.xz"; + sha256 = "1x1ip1c1v7mydvrz620gaajx6c1p88vlbi3i66fdfnxvhkcrqzqv"; + name = "kjobwidgets-5.112.0.tar.xz"; }; }; kjs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjs-5.110.0.tar.xz"; - sha256 = "0xlkdi7qs75ipf87h8m7bvjn4l28y5qy20hvag1gc370fxz54v15"; - name = "kjs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjs-5.112.0.tar.xz"; + sha256 = "00nr7darrijxm7czvjwvs4jrw8yd8ypz49l4xym19fvslcb5d0x9"; + name = "kjs-5.112.0.tar.xz"; }; }; kjsembed = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjsembed-5.110.0.tar.xz"; - sha256 = "1ynmj8ac9g9amjz0ljz3wf7sjsrwmz1kfi26r36rpqlf9mmkzfqm"; - name = "kjsembed-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjsembed-5.112.0.tar.xz"; + sha256 = "0hs6ka5qj1w3kha6rssvvpw6dh4pw001wfpfjzn8klawjwndjv1r"; + name = "kjsembed-5.112.0.tar.xz"; }; }; kmediaplayer = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kmediaplayer-5.110.0.tar.xz"; - sha256 = "1jhh3gsbibi2hrhswg1nz1mdxn2wir5p9cvqpcqv7k8vm6rb82z3"; - name = "kmediaplayer-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kmediaplayer-5.112.0.tar.xz"; + sha256 = "1bdanmrbzyh6hbpkflq7gwrjm03647pbbiv670li0cmyfmnz904r"; + name = "kmediaplayer-5.112.0.tar.xz"; }; }; knewstuff = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knewstuff-5.110.0.tar.xz"; - sha256 = "0qld8ijy7z60qdlwa9vaq905xgzyvh5zw6ymngs00axl33m9bbbl"; - name = "knewstuff-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knewstuff-5.112.0.tar.xz"; + sha256 = "1l417xsqpwxv73wm0fdgjpfnvs19casm1x2xsl299pj66kcm1y7l"; + name = "knewstuff-5.112.0.tar.xz"; }; }; knotifications = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifications-5.110.0.tar.xz"; - sha256 = "0zm3d36v9dgqb3pdwpj962wpngfhq08q9x9rj99f88g9dlnmy6gm"; - name = "knotifications-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifications-5.112.0.tar.xz"; + sha256 = "1xlx91rn826gw3mqddvfs884mx95rhksf70wc1m5jd49cdcgw1mz"; + name = "knotifications-5.112.0.tar.xz"; }; }; knotifyconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifyconfig-5.110.0.tar.xz"; - sha256 = "1651rh0av8lqp8rmb3djizsb8ypihkabprgppla3af2xf446n7wp"; - name = "knotifyconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifyconfig-5.112.0.tar.xz"; + sha256 = "18qikgc5lp5xjmar823j0cgwqpgc8b5sr8rq1x2p23pbb9ywfpqj"; + name = "knotifyconfig-5.112.0.tar.xz"; }; }; kpackage = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpackage-5.110.0.tar.xz"; - sha256 = "1jd85m7pxzah9d6b3zi2nswvsinx85brkiq142vic5l0rm6l89id"; - name = "kpackage-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpackage-5.112.0.tar.xz"; + sha256 = "0g84q54yhm9a1h48pim371rjbl208ka56a6xx23zqis20wqjs0kp"; + name = "kpackage-5.112.0.tar.xz"; }; }; kparts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kparts-5.110.0.tar.xz"; - sha256 = "13av8v2kggbvyv8nxganjb88q38g3gbykbkwrigywc3767p838r3"; - name = "kparts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kparts-5.112.0.tar.xz"; + sha256 = "0mr45zk4i7jfazkawi7i2ry88y9a17wsny4ck0zln3ggb6wra32c"; + name = "kparts-5.112.0.tar.xz"; }; }; kpeople = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpeople-5.110.0.tar.xz"; - sha256 = "10drcfjcw00qhdlsficxb07hnnsd93smcig8argznpgwd61f807p"; - name = "kpeople-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpeople-5.112.0.tar.xz"; + sha256 = "0xfczzy2pwdszzzmyj8ldr1178d93za26j0rqbj3wnqsnji9yn6n"; + name = "kpeople-5.112.0.tar.xz"; }; }; kplotting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kplotting-5.110.0.tar.xz"; - sha256 = "1fbzy9k0gx1468qsdd1c8fqaml3c01yy0m6n205y3ymkca78hdbk"; - name = "kplotting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kplotting-5.112.0.tar.xz"; + sha256 = "0a18ly62ilsmaihm398q1jvj10ccw00di3rywq0wq45n0ghnx7zx"; + name = "kplotting-5.112.0.tar.xz"; }; }; kpty = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpty-5.110.0.tar.xz"; - sha256 = "1cx9wszi9zlay0vb9wz9hgbmbq006xgssnzzrmby4q4s6bhb92ps"; - name = "kpty-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpty-5.112.0.tar.xz"; + sha256 = "1p6rm94hvq6w54h84vhcqbbnj2gmypipj05vx7c9bnijy0d4nfxf"; + name = "kpty-5.112.0.tar.xz"; }; }; kquickcharts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kquickcharts-5.110.0.tar.xz"; - sha256 = "0s8xnsmhx2m6wn7fmmddzwnwc2yr3kvy85vd65m3avfw073rgj5v"; - name = "kquickcharts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kquickcharts-5.112.0.tar.xz"; + sha256 = "1c634jda7lqmv009jg2jdarkd08q1hf4fb3wnj35hilj37c57b5a"; + name = "kquickcharts-5.112.0.tar.xz"; }; }; kross = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kross-5.110.0.tar.xz"; - sha256 = "169zsxrmbdv5xn6s0wmf1l2a3qghn88hgl714i0cnymq5ixy25x5"; - name = "kross-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kross-5.112.0.tar.xz"; + sha256 = "1b887bx4d3nr55305mk91wnm6bfhbgnqjmbc3a9jkv65c78j9hsa"; + name = "kross-5.112.0.tar.xz"; }; }; krunner = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/krunner-5.110.0.tar.xz"; - sha256 = "0q3jhq2cswnqj5rdkxhizlv06rsxsm38ipxhcsw6p8zqabi1i351"; - name = "krunner-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/krunner-5.112.0.tar.xz"; + sha256 = "00bfszbpr2w21nz3vhih8hp0f9gzn1906axvib3jm1w3kjmy2avn"; + name = "krunner-5.112.0.tar.xz"; }; }; kservice = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kservice-5.110.0.tar.xz"; - sha256 = "0rin6v96mcmw53dzw8sw56g7188623d1k4vs18bv44l86gixdhgg"; - name = "kservice-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kservice-5.112.0.tar.xz"; + sha256 = "01aj0yrlxlwr5sm1z0pq6caa4ijj3nsgqhza1zr4mzrx2ybf753z"; + name = "kservice-5.112.0.tar.xz"; }; }; ktexteditor = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktexteditor-5.110.0.tar.xz"; - sha256 = "0iwzw51km3mr8kdva14mxz9bvcfcf09v5igah2axkjaxazxyigla"; - name = "ktexteditor-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktexteditor-5.112.0.tar.xz"; + sha256 = "0d0cw9qd7mmnhdqayx4lcpd60hp1al5zwy565rsvxmjly564l3i9"; + name = "ktexteditor-5.112.0.tar.xz"; }; }; ktextwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktextwidgets-5.110.0.tar.xz"; - sha256 = "0cr7n58mak928dysyqhsr1pj0w90amikx9jav4gs4lzb4m4rjp7q"; - name = "ktextwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktextwidgets-5.112.0.tar.xz"; + sha256 = "0x83f0ih3c25yggmvyibyfaiikk4zc0k5gf6yr87c62ihgv7gniz"; + name = "ktextwidgets-5.112.0.tar.xz"; }; }; kunitconversion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kunitconversion-5.110.0.tar.xz"; - sha256 = "083w0gz157j2g8qzm03yq3qwq58wafcq26qcc2ly2fksyyxkzzda"; - name = "kunitconversion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kunitconversion-5.112.0.tar.xz"; + sha256 = "1zi47yd3aydy2mcmgfgwp4g12w7681lyc1niq5p13670mxhlkrwc"; + name = "kunitconversion-5.112.0.tar.xz"; }; }; kwallet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwallet-5.110.0.tar.xz"; - sha256 = "0mg5y8cvzvs7w3yy5xnpsps2b6m476l5ilw5kvarrjjpq7ybnkqz"; - name = "kwallet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwallet-5.112.0.tar.xz"; + sha256 = "1v38wyz9hhhvzwrpxsjkd8yqyy4yv9hii1413ffcm9x971nliq2s"; + name = "kwallet-5.112.0.tar.xz"; }; }; kwayland = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwayland-5.110.0.tar.xz"; - sha256 = "0ggxvywvqfhhhb5370n90dyw0mjwkp3i7rgv58nyqsmby0g08r85"; - name = "kwayland-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwayland-5.112.0.tar.xz"; + sha256 = "0nzpg4x9hg9jd1kg6sq0lh658kz3cz25z5kji7hpq2h0svmxx709"; + name = "kwayland-5.112.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwidgetsaddons-5.110.0.tar.xz"; - sha256 = "1cyphs0r5j2v93pwi9mbn6xd928lnhb0zmyfj5pywdx9n7lv0x6a"; - name = "kwidgetsaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwidgetsaddons-5.112.0.tar.xz"; + sha256 = "0x5mz04dwlpl0h75v0c5w04qjpcb3fbpjk7hbslwgfwr7gviqyib"; + name = "kwidgetsaddons-5.112.0.tar.xz"; }; }; kwindowsystem = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwindowsystem-5.110.0.tar.xz"; - sha256 = "0l3aknr3zqz9zwqlyhnr8n53bcfb22rm38vdiv0l5vpwjbjn0270"; - name = "kwindowsystem-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwindowsystem-5.112.0.tar.xz"; + sha256 = "08ihg6zq979h4v6c157n80pi3cfsg9w9qiyqaw3h79365zji73j1"; + name = "kwindowsystem-5.112.0.tar.xz"; }; }; kxmlgui = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kxmlgui-5.110.0.tar.xz"; - sha256 = "1j8v52ix9sv7q76cvl2gnpjs602ri57kgfh21bvqd88gf2xnwxjq"; - name = "kxmlgui-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kxmlgui-5.112.0.tar.xz"; + sha256 = "17jsqzxn5wgwsm3lrfgdygyzvqibzv9vfgg11s2gc5bq9x4s0j8g"; + name = "kxmlgui-5.112.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kxmlrpcclient-5.110.0.tar.xz"; - sha256 = "0fzd9amj2j4bw54q8fbgczqf785s6siqr1a8wbqf56wyyhki5psx"; - name = "kxmlrpcclient-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kxmlrpcclient-5.112.0.tar.xz"; + sha256 = "09zwgrh336bk5cfab2zcdzcfdzjvlqa47ljfrciyh4h8m5f7y12h"; + name = "kxmlrpcclient-5.112.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/modemmanager-qt-5.110.0.tar.xz"; - sha256 = "08q43arx9q81rqwhczzcn4cyl5glalwzjncb120a2cihida2m71v"; - name = "modemmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/modemmanager-qt-5.112.0.tar.xz"; + sha256 = "0323zp03wj4ignfc94qg89h3j4qmh3mkdac5snr1axjaaf6sk6w8"; + name = "modemmanager-qt-5.112.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/networkmanager-qt-5.110.0.tar.xz"; - sha256 = "1bnlvpfhw6l64rgaxx9zkxd5wmwvyal5xmv31vxzf92ig6sgjdqq"; - name = "networkmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/networkmanager-qt-5.112.0.tar.xz"; + sha256 = "1larg78j7rlbbscv04imc1k6f1srapr2yrbyxif38d4iipfg04f9"; + name = "networkmanager-qt-5.112.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/oxygen-icons5-5.110.0.tar.xz"; - sha256 = "1dmig458gbl0ypb99kj514nwl5gbjpfvixw9lipgc2wwnn1nkia2"; - name = "oxygen-icons5-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/oxygen-icons5-5.112.0.tar.xz"; + sha256 = "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a"; + name = "oxygen-icons5-5.112.0.tar.xz"; }; }; plasma-framework = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/plasma-framework-5.110.0.tar.xz"; - sha256 = "0jfln8lrzmcnkqhl8pij5w6mdj6g25rwc332f07g9465y9ap07cf"; - name = "plasma-framework-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/plasma-framework-5.112.0.tar.xz"; + sha256 = "0nq8dzqk1hxzm8yngzgm9zqw8155fy38zq6k3613af5mgj7jmdhj"; + name = "plasma-framework-5.112.0.tar.xz"; }; }; prison = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/prison-5.110.0.tar.xz"; - sha256 = "019a3z18gq7nb3ahf5dd3b5fixzyfklg60dk2w4win2w19s70wb7"; - name = "prison-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/prison-5.112.0.tar.xz"; + sha256 = "1blgs0k4kz3smsf0qb9y6krzbssyv1hbqvjc7qvk4qwk81qhyfvq"; + name = "prison-5.112.0.tar.xz"; }; }; purpose = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/purpose-5.110.0.tar.xz"; - sha256 = "0nl6qh7j5c3ijnq0qw1a5jmj1x5nb9hlssjjn8fdvfr7q6z67rsc"; - name = "purpose-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/purpose-5.112.0.tar.xz"; + sha256 = "1cqcmhbb26xypllmk3z4r0z8sw79idzz6nz72ahwa4ha0pqbl8p3"; + name = "purpose-5.112.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/qqc2-desktop-style-5.110.0.tar.xz"; - sha256 = "04pyhlr89azw0kyjxfpx6phxljck8yiflcszd4xkgiw3n9rjyg3g"; - name = "qqc2-desktop-style-5.110.0.tar.xz"; + 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"; }; }; solid = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/solid-5.110.0.tar.xz"; - sha256 = "1k64cqlws7nxki21cwg197avfnxsxpw3isry5p7bqyfmq45ydcvd"; - name = "solid-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/solid-5.112.0.tar.xz"; + sha256 = "0hpm5akhk24fzbg27p6ql598s5mxa6n8h359ajf45afabimhjx0y"; + name = "solid-5.112.0.tar.xz"; }; }; sonnet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/sonnet-5.110.0.tar.xz"; - sha256 = "16qk63yy1y03z4rlc08qzr7mmds1yz0k9x1ws2nzp47khkza250i"; - name = "sonnet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/sonnet-5.112.0.tar.xz"; + sha256 = "026iivz27d7v4kpwkl6qwbcqnd71kvg77szy91fch37iki7z6361"; + name = "sonnet-5.112.0.tar.xz"; }; }; syndication = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syndication-5.110.0.tar.xz"; - sha256 = "0dsd05ckfv9fdnrbgprriba7lbbfs2z9qv869pcr4n7pn7x778sd"; - name = "syndication-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syndication-5.112.0.tar.xz"; + sha256 = "03if949klq28kaf3xzcva917fqv7cn6pzjwsgymya3nc730kfsc8"; + name = "syndication-5.112.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syntax-highlighting-5.110.0.tar.xz"; - sha256 = "0gbmgan0cy4xhjcf10g0lffhwvkhhpcgbnk190xlzl4chnmpq9w5"; - name = "syntax-highlighting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syntax-highlighting-5.112.0.tar.xz"; + sha256 = "1m88nfmf4kxliqkgm78f95yvsjv76xm2rmg92v9mg00r9d00y95h"; + name = "syntax-highlighting-5.112.0.tar.xz"; }; }; threadweaver = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/threadweaver-5.110.0.tar.xz"; - sha256 = "085y4m7z0rybsvpqzl2sjwnf8yjm4lnc3n49idj2c0psm8v5ksm0"; - name = "threadweaver-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/threadweaver-5.112.0.tar.xz"; + sha256 = "1i3qj6qf0sv5pf8d5wx6gy11dqyp4x4b4759gwbhlrizkm4fa7f9"; + name = "threadweaver-5.112.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index aefbaa6d41d..08d0ffae8f9 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "sha256-cErtSbGetacXizSyhzYg7CmdsIdS1qhXT5XUGHmriFE="; + sha256 = "sha256-fY1ofUKu01DCUly2mk/DqnkWlNpnYdzMHELC7neWtd0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index cee48d5e9ef..e7bbd2b131d 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kupferlauncher/keybinder/"; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.cstrahan ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix index 1089c3ddf1f..7b81d8ca7c6 100644 --- a/pkgs/development/libraries/kquickimageedit/default.nix +++ b/pkgs/development/libraries/kquickimageedit/default.nix @@ -6,14 +6,14 @@ mkDerivation rec { pname = "kquickimageeditor"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g7+BAWjpQBJPbrwnIwSudjBFtwaj4JKemV+BLfPzl4I="; + sha256 = "sha256-+BByt07HMb4u6j9bVZqkUPvyRaElKvJ2MjKlPakL87E="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix index e6b8ced1a01..bff25956f7a 100644 --- a/pkgs/development/libraries/kronosnet/default.nix +++ b/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.26"; + version = "1.28"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-LkV5bi1kMRP2ofBIe+hbOzbSRStWyr3afnNdZqpVDBA="; + sha256 = "sha256-HxdZy2TiQT7pWyhaSq4YJAcqjykzWy1aI3gEZrlbghQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/pkgs/development/libraries/kuserfeedback/default.nix b/pkgs/development/libraries/kuserfeedback/default.nix index bea9f86fc90..5e1fe28297f 100644 --- a/pkgs/development/libraries/kuserfeedback/default.nix +++ b/pkgs/development/libraries/kuserfeedback/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { pname = "kuserfeedback"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-dqrJIrFTJJsnRoCm9McsI47xTj3wS60Ay2QVixBj8mQ="; + hash = "sha256-JSMIuCLdRpDqhasWiMmw2lUSl4rGtDX3ell5/B0v/RM="; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix index e0e804c1101..943dee42c0e 100644 --- a/pkgs/development/libraries/kweathercore/default.nix +++ b/pkgs/development/libraries/kweathercore/default.nix @@ -9,14 +9,14 @@ mkDerivation rec { pname = "kweathercore"; - version = "0.6"; + version = "0.7"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LIgUSXKHcRqcBwGTRxU5Z4eHuWmPLerorlrnI6Cf9k4="; + sha256 = "sha256-CnnoPkgz97SfDG13zfyIWweVnp2oxAChTPKFxJC+L8A="; }; buildInputs = [ diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 95547fb6382..de1af1f447e 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - hash = "sha256-Ju5y1keFTmYtmWQ+srLTQWVavzH0mQg41mUPtc+SCcg="; + hash = "sha256-NY3KEPzScgeshXoNf0NaRtvGzR98ENu4QMGTG/GWXwg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 4bae576bd18..8c6eeb3f3fb 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.9"; + version = "1.12.10"; src = fetchFromGitHub { - sha256 = "sha256-TuiOAinJsQWJVJiaS8kWk4Pl+hn521f4ooJ2p+eR6mk="; + sha256 = "sha256-0AHChU96LOVCsd+b77nKV4lOt1FtbVfv+OSNvGjekYo="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 0c953b8d871..f2ea91bf8be 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-7hFGY255dLgDo93+Nx2we/cfEtwaiaajdVg1VTst1/U="; + hash = "sha256-jf1sKFfUmeNbLtmawKISmLQK2/95XvSg40se9IEKMT0="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix index 2b99c7bdaf1..0c97f116a0b 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/development/libraries/lib2geom/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.2.2"; + version = "1.3"; outputs = [ "out" "dev" ]; @@ -23,16 +23,19 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - sha256 = "sha256-xkUxcAk8KJkL482R7pvgmCT+5I8aUMm/q25pvK3ZPuY="; + hash = "sha256-llUpW8VRBD8RKaGfyedzsMbLRb8DIo0ePt6m2T2w7Po="; }; patches = [ - # Fixed upstream, remove when the new version releases: - # https://gitlab.com/inkscape/lib2geom/-/issues/49 + # Fix compilation with Clang. + # https://gitlab.com/inkscape/lib2geom/-/merge_requests/102 (fetchpatch { - name = "expect-double-eq-in-choose-test.patch"; - url = "https://gitlab.com/inkscape/lib2geom/-/commit/5b7c75dd3841cb415f163f0a81f556c57d3e0a83.patch"; - sha256 = "RMgwJkylrGFTTrqBzqs5j2LMSLsHhcE/UT1pKBZnU50="; + url = "https://gitlab.com/inkscape/lib2geom/-/commit/a5b5ac7d992023f8a80535ede60421e73ecd8e20.patch"; + hash = "sha256-WJYkk3WRYVyPSvyTbKDUrYvUwFgKA9mmTiEWtYQqM4Q="; + }) + (fetchpatch { + url = "https://gitlab.com/inkscape/lib2geom/-/commit/23d9393af4bee17aeb66a3c13bdad5dbed982d08.patch"; + hash = "sha256-LAaGMIXpDI/Wzv5E2LasW1Y2/G4ukhuEzDmFu3AzZOA="; }) ]; @@ -60,6 +63,20 @@ stdenv.mkDerivation rec { doCheck = true; + # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 + checkPhase = let + disabledTests = + lib.optionals stdenv.isAarch64 [ + # Broken on all platforms, test just accidentally passes on some. + # https://gitlab.com/inkscape/lib2geom/-/issues/63 + "elliptical-arc-test" + ]; + in '' + runHook preCheck + ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' + runHook postCheck + ''; + meta = with lib; { description = "Easy to use 2D geometry library in C++"; homepage = "https://gitlab.com/inkscape/lib2geom"; diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index a569b59621e..828a6891e29 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -84,6 +84,10 @@ stdenv.mkDerivation { "--${if withX then "with" else "without"}-x" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; description = "A generic image manipulation library"; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index fc55f14f118..7f2c12a9dea 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -28,10 +28,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost libgeotiff libtiff LASzip2 ]; cmakeFlags = [ - "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" # libLAS is currently not compatible with LASzip 3, # see https://github.com/libLAS/libLAS/issues/144. diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix index 58d7150a234..e9e5c19f777 100644 --- a/pkgs/development/libraries/libaec/default.nix +++ b/pkgs/development/libraries/libaec/default.nix @@ -4,20 +4,22 @@ stdenv.mkDerivation rec { pname = "libaec"; - version = "1.0.6"; + version = "1.1.1"; src = fetchFromGitLab { domain = "gitlab.dkrz.de"; owner = "k202009"; repo = "libaec"; rev = "v${version}"; - sha256 = "sha256-N0YwJuVqv8jv/uSbpn/eJBTMhlHDcY/74+anH2vNvpI="; + sha256 = "sha256-5nsJrbJVqjXNb3exYgEvSGUq8ccy9HG+gwmBZvjnupc="; }; nativeBuildInputs = [ cmake ]; + doCheck = true; + meta = with lib; { homepage = "https://gitlab.dkrz.de/k202009/libaec"; description = "Adaptive Entropy Coding library"; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 6be0370a177..30d3c0d81b5 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 , enableButteraugli ? true, libjxl , enableVmaf ? true, libvmaf +, gitUpdater }: let @@ -8,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.6.1"; + version = "3.7.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "sha256-U7hmKdpjTtqStM4UIjCvgJ2swpZ1x0Px1Q9+gSHbaeQ="; + hash = "sha256-Zf0g/CMI73O9Dkn9o7aIvwZ/8wh3lCmVY8nZaPwBp68="; stripRoot = false; }; @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: "-DCONFIG_RUNTIME_CPU_DETECT=0" ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ - "-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as" + "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as" ] ++ lib.optionals stdenv.isAarch32 [ # armv7l-hf-multiplatform does not support NEON # see lib/systems/platform.nix @@ -64,6 +65,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "static" ]; + passthru = { + updateScript = gitUpdater { + url = "https://aomedia.googlesource.com/aom"; + rev-prefix = "v"; + ignoredVersions = "(alpha|beta|rc).*"; + }; + }; + meta = with lib; { description = "Alliance for Open Media AV1 codec library"; longDescription = '' diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index de305474a3a..d58ba0bc5c5 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -23,36 +23,31 @@ , cmake , nix , samba -, buildPackages }: -let - autoreconfHook = buildPackages.autoreconfHook269; -in assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.6.2"; + version = "3.7.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg="; + hash = "sha256-p2JgJ/rvqaQ6yyXSh+ehScUH565ud5bQncl+lOnsWfc="; }; - outputs = [ "out" "lib" "dev" ]; - patches = [ - # fixes static linking; upstream in releases after 3.6.2 - # https://github.com/libarchive/libarchive/pull/1825 merged upstream - (assert finalAttrs.version == "3.6.2"; fetchpatch { - name = "001-only-add-iconv-to-pc-file-if-needed.patch"; - url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; - hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; + # Pull fix for test failure on 32-bit systems: + (fetchpatch { + name = "32-bit-tests-fix.patch"; + url = "https://github.com/libarchive/libarchive/commit/3bd918d92f8c34ba12de9c6604d96f9e262a59fc.patch"; + hash = "sha256-RM3xFM6S2DkM5DJ0kAba8eLzEXuY5/7AaU06maHJ6rM="; }) ]; + outputs = [ "out" "lib" "dev" ]; + postPatch = let skipTestPaths = [ # test won't work in nix sandbox diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 3042dad31e1..27aaef54643 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "libavif"; - version = "0.11.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs="; + sha256 = "sha256-3zNhKl8REWsRlblXIFD7zn7qvrc/pa4wHZI0oEc3pKE="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libayatana-common/default.nix b/pkgs/development/libraries/libayatana-common/default.nix index aa818a04abe..98cf028a55e 100644 --- a/pkgs/development/libraries/libayatana-common/default.nix +++ b/pkgs/development/libraries/libayatana-common/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libayatana-common"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-common"; rev = finalAttrs.version; - hash = "sha256-5cHFjBQ3NgNaoprPrFytnrwBRL7gDG7QZLWomgGBJMg="; + hash = "sha256-IBLJPgi+dKZKbR0Yjr2aNjCdpY+PE1k9QLSsk++6Wqo="; }; postPatch = '' diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix index 39a6305c6de..0cadea9f990 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libayatana-indicator"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-indicator"; rev = version; - sha256 = "sha256-tOZcrcuZowqDg/LRYTY6PCxKnpEd67k4xAHrIKupunI="; + sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 38f16fa5bb1..3b24089e53c 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; }) + # Fix build with Clang 16. + # https://github.com/libb64/libb64/pull/10 + (fetchpatch { + name = "use-proper-function-prototype-for-main.patch"; + url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch"; + hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ="; + }) ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { name = "0001-example-Do-not-run-the-tests.patch"; url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 0b378c583ad..ebbf02603cb 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -3,20 +3,15 @@ stdenv.mkDerivation { pname = "libbap"; - version = "master-2020-11-25"; + version = "master-2022-07-13"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "3193cb31e1b1f2455406ea0c819dad9dfa2ba10d"; - sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil"; + rev = "4d324dd794f8e022e8eddecbb2ae2e7b28173947"; + hash = "sha256-la47HR+i99ueDEWR91YIXGdKflpE1E0qmmJjeowmGSI="; }; - postPatch = '' - substituteInPlace Makefile.in \ - --replace "-linkpkg" "-thread -linkpkg" - ''; - nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; buildInputs = [ bap ctypes ]; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 937937ae826..ce570b76bc0 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + hardeningDisable = [ "fortify" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch b/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch new file mode 100644 index 00000000000..de40da98162 --- /dev/null +++ b/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch @@ -0,0 +1,15 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 9d22b00..c6848fc 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -198,7 +198,9 @@ libbsd_ctor_a_SOURCES = \ + # Generate a simple libtool symbol export list to be used as a fallback if + # there is no version script support. + libbsd.sym: libbsd.map +- $(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map > $@ ++ $(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map \ ++ | grep -Ev '(group_from_gid|user_from_uid|nlist|__fdnlist|bsd_getopt)' \ ++ > $@ + + if NEED_TRANSPARENT_LIBMD + TRANSPARENT_LIBMD_DEPENDS = format.ld diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch deleted file mode 100644 index c52c64f35ae..00000000000 --- a/pkgs/development/libraries/libbsd/darwin.patch +++ /dev/null @@ -1,309 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5b6d22b..98c449b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -145,7 +145,7 @@ AS_CASE([$host_os], - AM_CONDITIONAL([OS_WINDOWS], [test "x$is_windows" = "xyes"]) - - # Checks for header files. --AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h pwd.h grp.h]) -+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h pwd.h grp.h nlist.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_INLINE -@@ -245,7 +245,9 @@ AC_LINK_IFELSE( - - AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ - getauxval getentropy getexecname getline \ -- pstat_getproc sysconf]) -+ pstat_getproc sysconf \ -+ strlcpy strlcat strnstr strmode fpurge \ -+ user_from_uid group_from_gid]) - AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) - - AC_SUBST([MD5_LIBS]) -diff --git a/include/bsd/grp.h b/include/bsd/grp.h -index b2705e5..c9423a2 100644 ---- a/include/bsd/grp.h -+++ b/include/bsd/grp.h -@@ -44,8 +44,10 @@ - __BEGIN_DECLS - int - gid_from_group(const char *, gid_t *); -+#if !HAVE_GROUP_FROM_GID - const char * - group_from_gid(gid_t, int); -+#endif - __END_DECLS - - #endif -diff --git a/include/bsd/pwd.h b/include/bsd/pwd.h -index 798af4b..6ae5244 100644 ---- a/include/bsd/pwd.h -+++ b/include/bsd/pwd.h -@@ -44,8 +44,10 @@ - __BEGIN_DECLS - int - uid_from_user(const char *, uid_t *); -+#if !HAVE_USER_FROM_UID - const char * - user_from_uid(uid_t, int); -+#endif - __END_DECLS - - #endif -diff --git a/include/bsd/string.h b/include/bsd/string.h -index f987fee..a1e17ed 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -41,10 +41,21 @@ - #include <sys/types.h> - - __BEGIN_DECLS -+#if !HAVE_STRLCPY - size_t strlcpy(char *dst, const char *src, size_t siz); -+#endif -+ -+#if !HAVE_STRLCAT - size_t strlcat(char *dst, const char *src, size_t siz); -+#endif -+ -+#if !HAVE_STRNSTR - char *strnstr(const char *str, const char *find, size_t str_len); -+#endif -+ -+#if !HAVE_STRMODE - void strmode(mode_t mode, char *str); -+#endif - - #if !defined(__GLIBC__) || \ - (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) -diff --git a/src/fpurge.c b/src/fpurge.c -index 350f364..ff7f01e 100644 ---- a/src/fpurge.c -+++ b/src/fpurge.c -@@ -26,9 +26,10 @@ - - #include <errno.h> - #include <stdio.h> --#include <stdio_ext.h> - - #ifdef HAVE___FPURGE -+#include <stdio_ext.h> -+ - int - fpurge(FILE *fp) - { -@@ -41,6 +42,36 @@ fpurge(FILE *fp) - - return 0; - } -+/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ -+#elif HAVE_FPURGE -+int -+fpurge(FILE *fp) -+{ -+ if (fp == NULL || fileno(fp) < 0) { -+ errno = EBADF; -+ return EOF; -+ } -+ -+ /* Call the system's fpurge function. */ -+#undef fpurge -+#if !HAVE_DECL_FPURGE -+ extern int fpurge (FILE *); -+#endif -+ int result = fpurge (fp); -+/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ -+#if defined(__sferror) || defined(__DragonFly__) -+ if (result == 0) -+ /* Correct the invariants that fpurge broke. -+ <stdio.h> on BSD systems says: -+ "The following always hold: if _flags & __SRD, _w is 0." -+ If this invariant is not fulfilled and the stream is read-write but -+ currently reading, subsequent putc or fputc calls will write directly -+ into the buffer, although they shouldn't be allowed to. */ -+ if ((fp->_flags & __SRD) != 0) -+ fp->_w = 0; -+#endif -+ return result; -+} - #else - #error "Function fpurge() needs to be ported." - #endif -diff --git a/src/funopen.c b/src/funopen.c -index 1e6f43a..3a3af6a 100644 ---- a/src/funopen.c -+++ b/src/funopen.c -@@ -143,6 +143,7 @@ funopen(const void *cookie, - * they will not add the needed support to implement it. Just ignore this - * interface there, as it has never been provided anyway. - */ -+#elif defined(__MACH__) - #else - #error "Function funopen() needs to be ported or disabled." - #endif -diff --git a/src/local-link.h b/src/local-link.h -index 6782d9a..fb76098 100644 ---- a/src/local-link.h -+++ b/src/local-link.h -@@ -29,6 +29,12 @@ - - #include <sys/cdefs.h> - -+#ifdef __MACH__ -+#define libbsd_link_warning(symbol, msg) -+#define libbsd_symver_default(alias, symbol, version) -+#define libbsd_symver_variant(alias, symbol, version) -+#define libbsd_symver_weak(alias, symbol, version) -+#else - #define libbsd_link_warning(symbol, msg) \ - static const char libbsd_emit_link_warning_##symbol[] \ - __attribute__((__used__,__section__(".gnu.warning." #symbol))) = msg -@@ -68,3 +74,4 @@ - #endif - - #endif -+#endif -diff --git a/src/nlist.c b/src/nlist.c -index 1cb9d18..b476f1e 100644 ---- a/src/nlist.c -+++ b/src/nlist.c -@@ -41,6 +41,7 @@ - #include <unistd.h> - #include <nlist.h> - -+#if !HAVE_NLIST_H - #include "local-elf.h" - - /* Note: This function is used by libkvm0, so we need to export it. -@@ -277,3 +278,4 @@ nlist(const char *name, struct nlist *list) - (void)close(fd); - return (n); - } -+#endif -diff --git a/src/pwcache.c b/src/pwcache.c -index d54daa0..74fde9f 100644 ---- a/src/pwcache.c -+++ b/src/pwcache.c -@@ -191,6 +191,7 @@ grptb_start(void) - return 0; - } - -+#if !HAVE_USER_FROM_UID - /* - * user_from_uid() - * caches the name (if any) for the uid. If noname clear, we always -@@ -251,7 +252,9 @@ user_from_uid(uid_t uid, int noname) - } - return ptr->name; - } -+#endif - -+#if !HAVE_USER_FROM_UID - /* - * group_from_gid() - * caches the name (if any) for the gid. If noname clear, we always -@@ -312,6 +315,7 @@ group_from_gid(gid_t gid, int noname) - } - return ptr->name; - } -+#endif - - /* - * uid_from_user() -diff --git a/src/readpassphrase.c b/src/readpassphrase.c -index f9f6195..2bc5fb4 100644 ---- a/src/readpassphrase.c -+++ b/src/readpassphrase.c -@@ -36,6 +36,14 @@ - #define TCSASOFT 0 - #endif - -+#ifndef _SIGMAX -+#define _SIGMAX 64 -+#endif -+ -+#ifndef _NSIG -+#define _NSIG (_SIGMAX + 1) -+#endif -+ - static volatile sig_atomic_t signo[_NSIG]; - - static void handler(int); -diff --git a/src/setproctitle.c b/src/setproctitle.c -index d3e1087..0e5f64c 100644 ---- a/src/setproctitle.c -+++ b/src/setproctitle.c -@@ -33,6 +33,10 @@ - #include <string.h> - #include "local-link.h" - -+#ifdef __MACH__ -+extern char **environ; -+#endif -+ - static struct { - /* Original value. */ - const char *arg0; -@@ -291,7 +295,8 @@ libbsd_symver_default(setproctitle, setproctitle_impl, LIBBSD_0.5); - * in 0.5, make the implementation available in the old version as an alias - * for code linking against that version, and change the default to use the - * new version, so that new code depends on the implemented version. */ --#ifdef HAVE_TYPEOF -+#ifdef __MACH__ -+#elif defined(HAVE_TYPEOF) - extern __typeof__(setproctitle_impl) - setproctitle_stub - __attribute__((__alias__("setproctitle_impl"))); -diff --git a/src/strlcat.c b/src/strlcat.c -index 14c53a1..5961c17 100644 ---- a/src/strlcat.c -+++ b/src/strlcat.c -@@ -26,6 +26,7 @@ - * Returns strlen(src) + MIN(dsize, strlen(initial dst)). - * If retval >= dsize, truncation occurred. - */ -+#if !HAVE_STRLCAT - size_t - strlcat(char *dst, const char *src, size_t dsize) - { -@@ -53,3 +54,4 @@ strlcat(char *dst, const char *src, size_t dsize) - - return(dlen + (src - osrc)); /* count does not include NUL */ - } -+#endif -diff --git a/src/strlcpy.c b/src/strlcpy.c -index e9a7fe4..5137acb 100644 ---- a/src/strlcpy.c -+++ b/src/strlcpy.c -@@ -24,6 +24,7 @@ - * chars will be copied. Always NUL terminates (unless dsize == 0). - * Returns strlen(src); if retval >= dsize, truncation occurred. - */ -+#if !HAVE_STRLCPY - size_t - strlcpy(char *dst, const char *src, size_t dsize) - { -@@ -48,3 +49,4 @@ strlcpy(char *dst, const char *src, size_t dsize) - - return(src - osrc - 1); /* count does not include NUL */ - } -+#endif -diff --git a/src/strmode.c b/src/strmode.c -index e6afde5..da680c9 100644 ---- a/src/strmode.c -+++ b/src/strmode.c -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - #include <string.h> - -+#if !HAVE_STRMODE - void - strmode(mode_t mode, char *p) - { -@@ -141,3 +142,4 @@ strmode(mode_t mode, char *p) - *p++ = ' '; /* will be a '+' if ACL's implemented */ - *p = '\0'; - } -+#endif diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 0c8040010e7..5943d697f6f 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,28 +1,53 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, fetchpatch , autoreconfHook , libmd , gitUpdater }: -stdenv.mkDerivation rec { +# Run `./get-version` for the new value when bumping the Git revision. +let gitVersion = "0.11.7-55-g73b2"; in + +stdenv.mkDerivation { pname = "libbsd"; - version = "0.11.7"; + version = "unstable-2023-04-29"; - src = fetchurl { - url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - hash = "sha256-m6oYYFnrvyXAYwjp+ZH9ox9xg8DySTGCbYOqar2KAmE="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libbsd"; + repo = "libbsd"; + rev = "73b25a8f871b3a20f6ff76679358540f95d7dbfd"; + hash = "sha256-LS28taIMjRCl6xqg75eYOIrTDl8PzSa+OvrdiEOP1+U="; }; outputs = [ "out" "dev" "man" ]; - # darwin changes configure.ac which means we need to regenerate - # the configure scripts + enableParallelBuilding = true; + + doCheck = true; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libmd ]; - patches = [ ./darwin.patch ]; + patches = [ + # Fix `{get,set}progname(3bsd)` conditionalization + # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/24 + (fetchpatch { + url = "https://github.com/emilazy/libbsd/commit/0381f8d92873c5a19ced3ff861ee8ffe7825953e.patch"; + hash = "sha256-+RMg5eHLgC4gyX9zXM0ttNf7rd9E3UzJX/7UVCYGXx4="; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Temporary build system hack from upstream maintainer + # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684 + ./darwin-fix-libbsd.sym.patch + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace 'm4_esyscmd([./get-version])' '[${gitVersion}]' + ''; passthru.updateScript = gitUpdater { # No nicer place to find latest release. @@ -33,7 +58,7 @@ stdenv.mkDerivation rec { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; license = with licenses; [ beerware bsd2 bsd3 bsdOriginal isc mit ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index fd5a18f8548..6604bb32229 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libbytesize"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libbytesize"; rev = finalAttrs.version; - hash = "sha256-4jbu8Hmc4I1IYKiWlCQq7ob98HsgDTqJdghj3ZzOuN8="; + hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U="; }; outputs = [ "out" "dev" "devdoc" "man" ]; diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index a502bc0d796..076eccb1c26 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchgit +, fetchpatch , lib , meson , ninja @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + patches = [ + (fetchpatch { + # https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5 + name = "libcamera-sphinx7.0-compat.patch"; + url = "https://git.libcamera.org/libcamera/libcamera.git/patch/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5"; + hash = "sha256-gs0EiT3gWlmRjDim+o2C0VmnoWqEouP5pNTD4XbNSdE="; + }) + ]; + postPatch = '' patchShebangs utils/ ''; diff --git a/pkgs/development/libraries/libcaption/default.nix b/pkgs/development/libraries/libcaption/default.nix new file mode 100644 index 00000000000..78cf5214051 --- /dev/null +++ b/pkgs/development/libraries/libcaption/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, re2c +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libcaption"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "szatmary"; + repo = "libcaption"; + rev = finalAttrs.version; + sha256 = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ re2c ]; + + meta = with lib; { + description = "Free open-source CEA608 / CEA708 closed-caption encoder/decoder"; + homepage = "https://github.com/szatmary/libcaption"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pschmitt ]; + }; +}) diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index fff5f705d7c..efb17eeaf31 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmocka @@ -22,6 +23,19 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg="; }; + outputs = [ "out" "dev" ]; + + patches = [ + # Pull fix pending upstream inclusion to support + # `CMAKE_INSTALL_INCLUDEDIR`: + # https://github.com/PJK/libcbor/pull/297 + (fetchpatch { + name = "includedir.patch"; + url = "https://github.com/PJK/libcbor/commit/d00a63e6d6858a2ed6be9b431b42799ed2c99ad8.patch"; + hash = "sha256-kBCSbAHOCGOs/4Yu6Vh0jcmzA/jYPkkPXPGPrptRfyk="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/development/libraries/libcdada/default.nix index 6fb8caa4746..e78d845cf5b 100644 --- a/pkgs/development/libraries/libcdada/default.nix +++ b/pkgs/development/libraries/libcdada/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - sha256 = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; + hash = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index b3087f0abea..64695aaa55d 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; - homepage = "http://www.freedesktop.org/wiki/Software/libcdr"; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libcdr"; platforms = lib.platforms.all; license = lib.licenses.mpl20; }; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 63c72b7a8ce..2fb83097c02 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0q7bd44zj8m493pqviw3xhnygls5p7dvwafgvsflkwn1jzxjbjgg"; - platforms."x86_64-linux".sha256 = "1gc7rc8x7lrz05dqgzd3yzhvqh4j63495d7b23cwhpyzq2viwgyg"; + platforms."aarch64-linux".sha256 = "12sp58nxa3nv800badv62vpvc30hyb0ykywdaxgv9y8pswp9lq0z"; + platforms."x86_64-linux".sha256 = "0vzzwq1k6bv9d209yg3samvfnfwj7s58y9r3p3pd98wxa9iyzf4j"; - platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; + platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.24"; - gitRevision = "5332865"; - chromiumVersion = "116.0.5845.190"; + version = "117.2.4"; + gitRevision = "5053a95"; + chromiumVersion = "117.0.5938.150"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index ab8f187bf9e..065d412c91e 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { ''; maintainers = teams.gnome.members ++ teams.pantheon.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix index abfcbfe0600..08c35ec9409 100644 --- a/pkgs/development/libraries/libcifpp/default.nix +++ b/pkgs/development/libraries/libcifpp/default.nix @@ -3,19 +3,20 @@ , boost , cmake , fetchFromGitHub +, fetchpatch , eigen , zlib }: stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "5.1.2"; + version = "5.2.4"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-wx5D0kNKetgc/8LFAgNxTAwni+lJb2rajsxh0AASpeY="; + hash = "sha256-AAEk9gDxtlNDEG8B4HmOJ5Nd+GyWibT+yuMccylU8iQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix deleted file mode 100644 index 9148deeee6f..00000000000 --- a/pkgs/development/libraries/libclc/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages, ninja, cmake, python3, llvm_14 }: - -stdenv.mkDerivation rec { - pname = "libclc"; - version = "16.0.3"; - - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = "llvmorg-${version}"; - hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0="; - }; - sourceRoot = "${src.name}/libclc"; - - outputs = [ "out" "dev" ]; - - patches = [ - ./libclc-gnu-install-dirs.patch - ]; - - # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${buildPackages.clang_14.cc}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_AS llvm-as PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_LINK llvm-link PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_OPT opt PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ - --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - substituteInPlace CMakeLists.txt \ - --replace 'COMMAND prepare_builtins' 'COMMAND ${buildPackages.libclc.dev}/bin/prepare_builtins' - ''; - - nativeBuildInputs = [ cmake ninja python3 ]; - buildInputs = [ llvm_14 ]; - strictDeps = true; - - postInstall = '' - install -Dt $dev/bin prepare_builtins - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "http://libclc.llvm.org/"; - description = "Implementation of the library requirements of the OpenCL C programming language"; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch b/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch deleted file mode 100644 index 1e5108a27c3..00000000000 --- a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libclc.pc.in -+++ b/libclc.pc.in -@@ -1,5 +1,5 @@ --includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ --libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+libexecdir=@CMAKE_INSTALL_FULL_DATADIR@/clc - - Name: libclc - Description: Library requirements of the OpenCL C programming language diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index f5a9974f3bc..52da3719991 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcmis"; - version = "0.5.2"; + version = "0.6.2"; src = fetchFromGitHub { owner = "tdf"; repo = pname; rev = "v${version}"; - sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57"; + sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw="; }; nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index d7f60b9ad6b..dae73136c7d 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w0DxZLEuR9m7udmlBQ7TyCoQvGVmJCffKHsxynQV+oo="; + sha256 = "sha256-QvDYdplPhivG4a2otT4MuSY546a2Dw/amWly5aheabQ="; }; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 95d1474c1fb..4f813d74a89 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.3.8"; + version = "3.3.9"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-4484PH2+4uvCSSPw9vecoCeGda8ELxoOW6mtIfuUC+U="; + sha256 = "sha256-dvXRbAdgb1WmKLijYkx6+js60ZxK1Tl2aTFSF7EpN74="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/pkgs/development/libraries/libcpr/default.nix b/pkgs/development/libraries/libcpr/default.nix index 9652b4a67f9..8a4025cf709 100644 --- a/pkgs/development/libraries/libcpr/default.nix +++ b/pkgs/development/libraries/libcpr/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, curl }: -let version = "1.10.4"; in +let version = "1.10.5"; in stdenv.mkDerivation { pname = "libcpr"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "libcpr"; repo = "cpr"; rev = version; - hash = "sha256-8qRNlZgBB71t/FSFPnxFhr02OuD2erLVeoc6wAx3LKk="; + hash = "sha256-mAuU2uF8d+aHvCmotgIrBi/pUp1jkP6G0f98M76zjOw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 0b03ec6ee0b..cdae594d9b6 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bison, flex }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, bison, flex }: stdenv.mkDerivation rec { pname = "libcue"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm"; }; + patches = [ + (fetchpatch { + name = "CVE-2023-43641.patch"; + url = "https://github.com/lipnitsk/libcue/commit/fdf72c8bded8d24cfa0608b8e97f2eed210a920e.patch"; + hash = "sha256-NjnSMUfman/SwLFWDIhtz2jCOLfpXGGGjO3QwRGURNg="; + }) + ]; + nativeBuildInputs = [ cmake bison flex ]; doCheck = false; # fails all the tests (ctest) diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index e981945ccbd..be8be13602a 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "unstable-2022-08-08"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "a0f7f5c139a7daf71de0de201b6c405d852b1dc1"; - sha256 = "6ErOhlD6pOudbTkFTlI2hjBuYT3QuzEiL33/mLnw1aI="; + rev = "03c83f5a57be8c5b1a29a68de5638744f17d28ba"; + sha256 = "ldwE0j9P9h5urWIUCRdY6qrJqKe45hid+NrSNeKEixE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 00fe3520210..5271663a10b 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-jsJTECSR3ptiByfYQ00laeKMKJCv5IDkZmilY3jpRrU="; + hash = "sha256-Cx+AfoeLOcqlrEVNuvMPJaY6K7ufu07p9XdjNwtPYf0="; }; outputs = [ "out" "dev" ]; @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { ]; postFixup = '' - # Fix shared library path that will be incorrect on move to "dev" output - substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" + # Fix include path that will be incorrect due to the "dev" output + substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets.cmake" \ + --replace "\''${_IMPORT_PREFIX}/include" "$dev/include" ''; meta = with lib; { diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix index a6744c23e1d..89ce56fe6bb 100644 --- a/pkgs/development/libraries/libdatovka/default.nix +++ b/pkgs/development/libraries/libdatovka/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libdatovka"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; - sha256 = "sha256-aG7U8jP3pvOeFDetYVOx+cE78ys0uSkKNjSgB09ste8="; + sha256 = "sha256-EqCS77MpjfR0Td07WKB7jWRBxAoKRtbAgyyThFOJXL8="; }; patches = [ diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 6494f16a876..3bbf449d89a 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "sha256-dWSDAYn36GDtkghmouGhHzxpa6EVwCslIPqejlLMZNM="; + sha256 = "sha256-HgZ2an1PCPhiLsd3ZA7tgZ1wVTOdHzDr8FHrqJhEbQw="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 1e9b02504bd..26a8f666646 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -17,9 +17,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -43,31 +43,21 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -89,9 +79,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-tzdata" @@ -125,15 +115,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] @@ -169,7 +159,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.30", ] [[package]] @@ -197,16 +187,29 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] +name = "async-channel" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.0.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] name = "async-compression" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -221,12 +224,12 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8" +checksum = "2e542b1682eba6b85a721daef0c58e79319ffd0c678565c07ac57c8071c548b5" dependencies = [ - "async-channel", - "base64 0.21.2", + "async-channel 2.1.0", + "base64 0.21.5", "bytes", "chrono", "futures", @@ -247,7 +250,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] @@ -281,13 +284,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.70" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -312,13 +315,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.2", + "base64 0.21.5", "bitflags 1.3.2", "bytes", "futures-util", @@ -364,9 +367,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -409,9 +412,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -442,22 +445,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "blake3" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", ] [[package]] @@ -499,9 +501,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -510,9 +512,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -520,9 +522,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -540,27 +542,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "camellia" @@ -574,18 +576,18 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" dependencies = [ "serde", ] @@ -620,9 +622,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfb-mode" @@ -651,17 +656,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -703,18 +707,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.10" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.10" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstyle", "clap_lex", @@ -722,9 +726,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -751,33 +755,33 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -786,9 +790,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -820,9 +824,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -881,16 +885,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -937,9 +931,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -958,16 +952,6 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] name = "curve25519-dalek" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -982,9 +966,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.3" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", "cpufeatures", @@ -999,13 +983,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -1098,22 +1082,22 @@ dependencies = [ "netlink-sys", "once_cell", "system-configuration", - "windows 0.32.0", + "windows", ] [[package]] name = "deltachat" -version = "1.121.0" +version = "1.131.1" dependencies = [ "ansi_term", "anyhow", - "async-channel", + "async-channel 2.1.0", "async-imap", "async-native-tls", "async-smtp", "async_zip", "backtrace", - "base64 0.21.2", + "base64 0.21.5", "brotli", "chrono", "criterion", @@ -1122,10 +1106,12 @@ dependencies = [ "encoded-words", "escaper", "fast-socks5", + "fd-lock", "format-flowed", "futures", "futures-lite", "hex", + "hickory-resolver", "humansize", "image", "iroh", @@ -1135,13 +1121,14 @@ dependencies = [ "log", "mailparse", "mime", - "num-derive 0.4.0", + "num-derive", "num-traits", "num_cpus", "once_cell", "parking_lot", "percent-encoding", "pgp", + "pin-project", "pretty_assertions", "pretty_env_logger", "proptest", @@ -1157,7 +1144,7 @@ dependencies = [ "serde", "serde_json", "sha-1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "strum", "strum_macros", @@ -1172,19 +1159,18 @@ dependencies = [ "tokio-tar", "tokio-util", "toml", - "trust-dns-resolver", "url", "uuid", ] [[package]] name = "deltachat-jsonrpc" -version = "1.121.0" +version = "1.131.1" dependencies = [ "anyhow", - "async-channel", + "async-channel 2.1.0", "axum", - "base64 0.21.2", + "base64 0.21.5", "deltachat", "env_logger", "futures", @@ -1203,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.121.0" +version = "1.131.1" dependencies = [ "ansi_term", "anyhow", @@ -1218,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.121.0" +version = "1.131.1" dependencies = [ "anyhow", "deltachat", @@ -1238,12 +1224,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "deltachat_ffi" -version = "1.121.0" +version = "1.131.1" dependencies = [ "anyhow", "deltachat", @@ -1273,9 +1259,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "pem-rfc7468 0.7.0", @@ -1309,6 +1295,15 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[package]] name = "derive_builder" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1416,7 +1411,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1438,7 +1433,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -1466,9 +1461,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "ecdsa" @@ -1484,13 +1479,13 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "der 0.7.7", + "der 0.7.8", "digest 0.10.7", - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.6", "rfc6979 0.4.0", "signature 2.1.0", "spki 0.7.2", @@ -1508,9 +1503,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8 0.10.2", "signature 2.1.0", @@ -1533,22 +1528,22 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0-rc.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa8e9049d5d72bfc12acbc05914731b5322f79b5e2f195e9f2d705fca22ab4c" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ - "curve25519-dalek 4.0.0-rc.3", - "ed25519 2.2.1", + "curve25519-dalek 4.1.1", + "ed25519 2.2.3", "serde", - "sha2 0.10.7", + "sha2 0.10.8", "zeroize", ] [[package]] name = "educe" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", "proc-macro2", @@ -1558,9 +1553,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -1583,12 +1578,12 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.2", + "crypto-bigint 0.5.3", "digest 0.10.7", "ff 0.13.0", "generic-array", @@ -1597,7 +1592,7 @@ dependencies = [ "pem-rfc7468 0.7.0", "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.2", + "sec1 0.7.3", "subtle", "zeroize", ] @@ -1605,7 +1600,7 @@ dependencies = [ [[package]] name = "email" version = "0.0.21" -source = "git+https://github.com/deltachat/rust-email?branch=master#25702df99254d059483b41417cd80696a258df8e" +source = "git+https://github.com/deltachat/rust-email?branch=master#37778c89d5eb5a94b7983f3f37ff67769bde3cf9" dependencies = [ "base64 0.11.0", "chrono", @@ -1618,6 +1613,12 @@ dependencies = [ ] [[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] name = "encoded-words" version = "0.2.0" source = "git+https://github.com/async-email/encoded-words?branch=master#d55366b36f96e383f39c432aedce42ee8b43f796" @@ -1697,9 +1698,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1718,34 +1719,34 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "enum-ordinalize" -version = "3.1.13" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1756,29 +1757,18 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", "libc", + "windows-sys", ] [[package]] @@ -1807,10 +1797,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.0.1", + "pin-project-lite", +] + +[[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fallible-streaming-iterator" @@ -1842,12 +1853,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" @@ -1856,15 +1864,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.2", - "windows-sys 0.48.0", + "rustix", + "windows-sys", ] [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -1891,27 +1899,27 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "redox_syscall 0.3.5", + "windows-sys", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1966,9 +1974,9 @@ version = "1.0.0" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1981,9 +1989,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1991,15 +1999,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2008,15 +2016,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" dependencies = [ "fastrand", "futures-core", @@ -2024,37 +2032,36 @@ dependencies = [ "memchr", "parking", "pin-project-lite", - "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2092,9 +2099,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -2115,9 +2122,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "group" @@ -2143,9 +2150,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -2171,27 +2178,24 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash", "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -2202,9 +2206,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2213,6 +2217,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hickory-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "once_cell", + "rand 0.8.5", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] name = "hkdf" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2236,7 +2285,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2252,9 +2301,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150" dependencies = [ "bytes", "fnv", @@ -2280,15 +2329,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.1.5" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a841f87949b0dd751864e769a870be79dc34abcee1cf31d737a61d498b22b6" +checksum = "7a79a67745be0cb8dd2771f03b24c2f25df98d5471fe7a595d668cfa2e6f843d" dependencies = [ "backtrace", "os_info", @@ -2330,7 +2379,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2352,16 +2401,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -2390,17 +2439,6 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" @@ -2411,9 +2449,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2427,9 +2465,9 @@ dependencies = [ [[package]] name = "imap-proto" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73b1b63179418b20aa81002d616c5f21b4ba257da9bca6989ea64dc573933e0" +checksum = "305c25c6e69416059e3396c4a062b84dc7b0a782cd4c84d82bab268eb0421ec7" dependencies = [ "nom", ] @@ -2446,12 +2484,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -2464,52 +2502,31 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] name = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.5", "widestring", - "windows-sys 0.48.0", - "winreg 0.50.0", + "windows-sys", + "winreg", ] [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546" +source = "git+https://github.com/deltachat/iroh?branch=0.4-update-quic#36ca9ca017a101c00dfdf74a917b92bdc505ddbd" dependencies = [ "abao", "anyhow", - "base64 0.21.2", + "base64 0.21.5", "blake3", "bytes", "default-net", @@ -2526,8 +2543,9 @@ dependencies = [ "quinn", "rand 0.7.3", "rcgen", - "ring", + "ring 0.16.20", "rustls", + "rustls-webpki", "serde", "serde-error", "ssh-key", @@ -2540,20 +2558,19 @@ dependencies = [ "tracing-futures", "tracing-subscriber", "walkdir", - "webpki", "x509-parser", "zeroize", ] [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.2", - "windows-sys 0.48.0", + "rustix", + "windows-sys", ] [[package]] @@ -2567,9 +2584,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jpeg-decoder" @@ -2579,9 +2596,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2639,21 +2656,32 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "openssl-sys", @@ -2669,21 +2697,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2691,9 +2713,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru-cache" @@ -2727,27 +2749,22 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] name = "matchit" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] @@ -2759,9 +2776,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2796,13 +2813,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2817,7 +2834,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -2898,14 +2915,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "static_assertions", ] [[package]] @@ -2939,9 +2955,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -2968,24 +2984,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -3022,9 +3027,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3042,9 +3047,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3078,11 +3083,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -3099,7 +3104,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -3110,18 +3115,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.26.0+1.1.1u" +version = "300.1.6+3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3148,15 +3153,6 @@ dependencies = [ ] [[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - -[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3170,7 +3166,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3179,10 +3175,10 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "ecdsa 0.16.7", - "elliptic-curve 0.13.5", + "ecdsa 0.16.8", + "elliptic-curve 0.13.6", "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3193,7 +3189,7 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -3202,17 +3198,17 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ - "ecdsa 0.16.7", - "elliptic-curve 0.13.5", + "ecdsa 0.16.8", + "elliptic-curve 0.13.6", "primeorder", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3226,22 +3222,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", - "windows-targets 0.48.1", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pem" @@ -3278,12 +3274,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pgp" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0" +checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132" dependencies = [ "aes", - "base64 0.21.2", + "base64 0.21.5", "bitfield", "block-padding", "blowfish", @@ -3296,11 +3292,12 @@ dependencies = [ "chrono", "cipher", "crc24", + "curve25519-dalek 4.1.1", "derive_builder", "des", "digest 0.10.7", - "ed25519-dalek 2.0.0-rc.3", - "elliptic-curve 0.13.5", + "ed25519-dalek 2.0.0", + "elliptic-curve 0.13.6", "flate2", "generic-array", "hex", @@ -3309,15 +3306,15 @@ dependencies = [ "md-5", "nom", "num-bigint-dig", - "num-derive 0.3.3", + "num-derive", "num-traits", "p256 0.13.2", "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.0-pre.2", + "rsa 0.9.3", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "sha3", "signature 2.1.0", "smallvec", @@ -3329,29 +3326,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3377,7 +3374,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ - "der 0.7.7", + "der 0.7.8", "pkcs8 0.10.2", "spki 0.7.2", ] @@ -3398,7 +3395,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.7", + "der 0.7.8", "spki 0.7.2", ] @@ -3410,9 +3407,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "3.0.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "plotters" @@ -3444,9 +3441,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3457,18 +3454,19 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "postcard" -version = "1.0.4" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", "const_format", + "embedded-io", "postcard-derive", "serde", ] @@ -3485,6 +3483,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3492,13 +3496,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -3514,11 +3516,11 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4" dependencies = [ - "elliptic-curve 0.13.5", + "elliptic-curve 0.13.6", ] [[package]] @@ -3547,27 +3549,26 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.4.1", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax 0.8.2", "unarray", ] @@ -3579,11 +3580,12 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quic-rpc" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d453504fc3e456160ae3b9ebe4d83c1f6477af167aa9b67e2d7bf11a096f179d" +checksum = "6d60c2fc2390baad4b9d41ae9957ae88c3095496f88e252ef50722df8b5b78d7" dependencies = [ "bincode", + "educe", "flume", "futures", "pin-project", @@ -3603,18 +3605,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quinn" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "pin-project-lite", @@ -3625,17 +3627,17 @@ dependencies = [ "thiserror", "tokio", "tracing", - "webpki", ] [[package]] name = "quinn-proto" -version = "0.9.2" -source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "rustls-native-certs", @@ -3643,26 +3645,26 @@ dependencies = [ "thiserror", "tinyvec", "tracing", - "webpki", ] [[package]] name = "quinn-udp" -version = "0.3.2" -source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ + "bytes", "libc", - "quinn-proto", - "socket2 0.4.9", + "socket2 0.5.5", "tracing", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3742,7 +3744,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -3769,9 +3771,9 @@ version = "1.0.0" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3779,14 +3781,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3796,49 +3796,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.22", + "ring 0.16.20", + "time 0.3.30", "yasna", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.8.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3851,6 +3852,17 @@ dependencies = [ ] [[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] name = "regex-syntax" version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3858,17 +3870,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.2", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -3889,6 +3901,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -3896,7 +3909,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.10.1", + "winreg", ] [[package]] @@ -3940,12 +3953,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.11", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + +[[package]] name = "ripemd" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3977,32 +4004,31 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.0-pre.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65db0998ad35adcaca498b7358992e088ee16cc783fe6fb899da203e113a63e5" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1 0.7.5", "pkcs8 0.10.2", "rand_core 0.6.4", "signature 2.1.0", + "spki 0.7.2", "subtle", "zeroize", ] [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4048,40 +4074,26 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.22" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" -dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "linux-raw-sys", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ - "ring", + "ring 0.17.5", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -4098,18 +4110,28 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "base64 0.21.2", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" @@ -4117,7 +4139,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.1", "cfg-if", "clipboard-win", "fd-lock", @@ -4136,9 +4158,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safemem" @@ -4157,9 +4179,9 @@ dependencies = [ [[package]] name = "sanitize-filename" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" dependencies = [ "lazy_static", "regex", @@ -4171,14 +4193,14 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "dyn-clone", "schemars_derive", @@ -4188,9 +4210,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -4200,18 +4222,18 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -4230,12 +4252,12 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.7", + "der 0.7.8", "generic-array", "pkcs8 0.10.2", "subtle", @@ -4244,9 +4266,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4257,9 +4279,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -4267,24 +4289,24 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.166" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -4300,22 +4322,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.10" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -4331,9 +4353,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -4342,9 +4364,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" dependencies = [ "itoa", "serde", @@ -4352,9 +4374,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -4384,9 +4406,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -4408,9 +4430,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -4429,9 +4451,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -4467,36 +4489,36 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -4504,12 +4526,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4544,7 +4566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.7", + "der 0.7.8", ] [[package]] @@ -4555,7 +4577,7 @@ checksum = "19cfdc32e0199062113edf41f344fbf784b8205a94600233c84eb838f45191e1" dependencies = [ "base64ct", "pem-rfc7468 0.6.0", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -4570,25 +4592,19 @@ dependencies = [ "rand_core 0.6.4", "rsa 0.7.2", "sec1 0.3.0", - "sha2 0.10.7", + "sha2 0.10.8", "signature 1.6.4", "ssh-encoding", "zeroize", ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] name = "stop-token" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" dependencies = [ - "async-channel", + "async-channel 1.9.0", "cfg-if", "futures-core", "pin-project-lite", @@ -4614,15 +4630,15 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum_macros" -version = "0.25.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -4644,9 +4660,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4708,38 +4724,37 @@ dependencies = [ [[package]] name = "tagger" -version = "4.3.4" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aaa6f5d645d1dae4cd0286e9f8bf15b75a31656348e5e106eb1a940abd34b63" +checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "autocfg", "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.22", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "rustix", + "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "testdir" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b7965698cfb3d1ac1e6e54b4b45f5caa9e89bda223c8cf723d9cf53d7cefa7" +checksum = "480060a2e7e1d3c779d3dea588a81c0df78b6a6322b7ce25c0d2ec14a0d5d869" dependencies = [ "anyhow", "backtrace", @@ -4762,22 +4777,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.41" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.41" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -4803,11 +4818,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ + "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -4815,15 +4832,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -4855,11 +4872,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -4868,9 +4884,9 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.5", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -4885,13 +4901,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] @@ -4947,9 +4963,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", @@ -4959,9 +4975,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4973,9 +4989,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -4985,20 +5001,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -5035,11 +5051,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -5048,20 +5063,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -5079,12 +5094,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -5107,51 +5122,6 @@ dependencies = [ ] [[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - -[[package]] name = "try-lock" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5159,13 +5129,13 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", @@ -5187,15 +5157,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript-type-def" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6b74ffbd5684d318252bb7182051df8c4ecc098b542f63fddf792e7f42aa02" +checksum = "356e00027bd9ef773605a353070dc87684b25561a59087ea3ee3dd5fe8854e83" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -5203,9 +5173,9 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10a4f5dd87c279f90beef31edb7055bfd1ceb66e73148de107a5c9005e9f864" +checksum = "c4e696c28431595138cc53892104528152cbcf26653ae0aa655e4eaede5b9f69" dependencies = [ "darling 0.13.4", "ident_case", @@ -5229,19 +5199,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown 0.12.3", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" @@ -5260,9 +5226,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -5277,13 +5243,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna", "percent-encoding", ] @@ -5301,11 +5273,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "serde", ] @@ -5328,16 +5300,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5372,9 +5338,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5382,24 +5348,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -5409,9 +5375,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5419,44 +5385,34 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "weezl" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5496,9 +5452,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -5523,21 +5479,12 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.42.1", + "windows-targets", ] [[package]] @@ -5546,50 +5493,29 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.48.5", ] [[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -5599,15 +5525,9 @@ checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -5617,15 +5537,9 @@ checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -5635,15 +5549,9 @@ checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" [[package]] name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5653,27 +5561,15 @@ checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5683,52 +5579,38 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.1.1", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -5747,7 +5629,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.30", ] [[package]] @@ -5771,17 +5653,17 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.22", + "time 0.3.30", ] [[package]] name = "yerpc" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96" +checksum = "75b5547af776328f66a5476ea3b7c0789e6fed164eb32d1a2122cfb39ffa505d" dependencies = [ "anyhow", - "async-channel", + "async-channel 1.9.0", "async-mutex", "async-trait", "axum", @@ -5799,9 +5681,9 @@ dependencies = [ [[package]] name = "yerpc_derive" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94" +checksum = "f321bb5f728fb066af06c5a994e4375f1f8b054ee6d650766f0bd68dfa4faefe" dependencies = [ "convert_case 0.5.0", "darling 0.14.4", @@ -5811,6 +5693,26 @@ dependencies = [ ] [[package]] +name = "zerocopy" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "zeroize" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5827,5 +5729,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.39", ] diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 395764d955e..d62e8bf245c 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cargo , cmake +, deltachat-repl , openssl , perl , pkg-config @@ -17,30 +18,32 @@ , libiconv }: -stdenv.mkDerivation rec { +let + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; + "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; + "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo="; + "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; + }; + }; +in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.121.0"; + version = "1.131.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA="; + hash = "sha256-JXSZrlekvPVGKR+ritxk3Eru2DhtUN9UBtqUZ7G9/gg="; }; patches = [ ./no-static-lib.patch ]; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY="; - "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; - "quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg="; - }; - }; + cargoDeps = rustPlatform.importCargoLock cargoLock; nativeBuildInputs = [ cmake @@ -67,8 +70,12 @@ stdenv.mkDerivation rec { cargoCheckHook ]; - passthru.tests = { - python = python3.pkgs.deltachat; + passthru = { + inherit cargoLock; + tests = { + inherit deltachat-repl; + python = python3.pkgs.deltachat; + }; }; meta = with lib; { @@ -76,7 +83,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deltachat/deltachat-core-rust/"; changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda srapenne ]; + maintainers = with maintainers; [ dotlambda ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdovi/default.nix b/pkgs/development/libraries/libdovi/default.nix index e8b4bbc88bf..c70a217f6fc 100644 --- a/pkgs/development/libraries/libdovi/default.nix +++ b/pkgs/development/libraries/libdovi/default.nix @@ -5,9 +5,7 @@ , rust , stdenv }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in + rustPlatform.buildRustPackage rec { pname = "libdovi"; version = "3.1.2"; @@ -28,19 +26,19 @@ rustPlatform.buildRustPackage rec { buildPhase = '' runHook preBuild - cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postBuild ''; installPhase = '' runHook preInstall - cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postInstall ''; checkPhase = '' runHook preCheck - cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postCheck ''; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 7b7721197f8..63a8522bd07 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils , libpthreadstubs, libpciaccess , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light +, gitUpdater }: stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.115"; + version = "2.4.117"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VUz7/gVCvds5G04+Bb+7/D4oK5Vb1WIY0hwGFkgfZes="; + hash = "sha256-ooiNaePrHIp3rcCKdaYPuuAfDSCNJvA00aEuNiNhJCs="; }; outputs = [ "out" "dev" "bin" ]; @@ -29,6 +30,16 @@ stdenv.mkDerivation rec { "-Detnaviv=disabled" ]; + passthru = { + updateScript = gitUpdater { + url = "https://gitlab.freedesktop.org/mesa/drm.git"; + rev-prefix = "libdrm-"; + # Skip versions like libdrm-2_0_2 that happen to go last when + # sorted. + ignoredVersions = "_"; + }; + }; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/drm"; downloadPage = "https://dri.freedesktop.org/libdrm/"; diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index 55191fff899..49c2ab1bdfa 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3"; }; - # This fixes an undefined symbol: _sched_setscheduler error on compile. - # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section - LDFLAGS = lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"; + # Disable priority scheduling on Darwin because it doesn’t support sched_setscheduler. + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace encodedv/dvconnect.c \ + --replace '#ifdef _SC_PRIORITY_SCHEDULING' '#if 0' + ''; configureFlags = [ "--disable-asm" diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 9755d0977c8..a2822eae8d5 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,30 +1,51 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }: +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, intltool +, gtk-doc +, glib +, avahi +, gnutls +, libuuid +, libsoup +, gtk3 +, gnome +}: -let - avahiWithGtk = avahi.override { gtk3Support = true; }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libepc"; version = "0.4.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libepc/${lib.versions.majorMinor finalAttrs.version}/libepc-${finalAttrs.version}.tar.xz"; sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; }; + patches = [ + # Remove dependency that is only needed by uninstalled examples. + ./no-avahi-ui.patch + ]; + nativeBuildInputs = [ + autoreconfHook + gnome.gnome-common pkg-config intltool gtk-doc ]; + buildInputs = [ glib libuuid gtk3 ]; + propagatedBuildInputs = [ - avahiWithGtk + avahi gnutls libsoup ]; @@ -33,7 +54,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libepc"; versionPolicy = "odd-unstable"; }; }; @@ -45,4 +66,4 @@ in stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/libepc/no-avahi-ui.patch b/pkgs/development/libraries/libepc/no-avahi-ui.patch new file mode 100644 index 00000000000..4649ecbe27c --- /dev/null +++ b/pkgs/development/libraries/libepc/no-avahi-ui.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile.am b/Makefile.am +index acf0d25..13022d1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,8 +32,6 @@ noinst_PROGRAMS = \ + examples/lookup-resource \ + examples/service-browser \ + examples/simple-publisher \ +- examples/consumer-ui \ +- examples/publisher-ui \ + examples/server-credentials \ + $(TESTS) + TESTS = \ +@@ -155,10 +153,6 @@ examples_service_browser_LDADD = $(example_epc_libs) + examples_simple_publisher_CFLAGS = $(example_epc_cflags) + examples_simple_publisher_LDADD = $(example_epc_libs) + +-examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) +-examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +-examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic +-examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) + examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) + examples_server_credentials_LDADD = $(example_epc_ui_libs) + +diff --git a/configure.ac b/configure.ac +index d68bf94..89bd471 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([$GIO_REQUIREMENT], + GIO=$GIO_REQUIREMENT], + [AC_MSG_RESULT([no])]) + +-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6]) + PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6 + avahi-glib >= 0.6 + glib-2.0 >= 2.36 diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 6c7b5591429..cd98e2229fe 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -31,6 +31,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" + '' + # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) + + lib.optionalString stdenv.isDarwin '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; outputs = [ "out" "dev" ]; @@ -55,15 +64,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; - # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) - preCheck = lib.optionalString stdenv.isDarwin '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" - ''; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 572c90b27b4..1f7f52c70ab 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -10,20 +10,53 @@ stdenv.mkDerivation rec { owner = "dinhviethoa"; repo = "libetpan"; rev = version; - sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"; + hash = "sha256-lukeWURNsRPTuFk2q2XVnwkKz5Y+PRiPba5GPQCw6jw="; }; + outputs = [ "out" "dev" ]; + patches = [ - # The following two patches are fixing CVE-2020-15953, as reported in the - # issue tracker: https://github.com/dinhvh/libetpan/issues/386 - # They might be removed for the next version bump. + # The following patches are security and/or reliability fixes. + # They all must be removed for the next version bump. + + # Fix potential null pointer deference + # https://github.com/dinhvh/libetpan/pull/348 + (fetchpatch { + name = "pr-348-null-pointer-deference.patch"; + url = "https://github.com/dinhvh/libetpan/commit/720e92e5752e562723a9730f8e604cb78f3a9163.patch"; + hash = "sha256-/bA/ekeMhLE3OyREHIanlrb+uuSxwur+ZloeaX9AyyM="; + }) + + # Fix potential null pointer deference + # https://github.com/dinhvh/libetpan/pull/361 + (fetchpatch { + name = "pr-361-null-pointer-deference.patch"; + url = "https://github.com/dinhvh/libetpan/commit/0cdefb017fcfd0fae56a151dc14c8439a38ecc44.patch"; + hash = "sha256-qbWisOCPI91AIXzg3n7mceSVbBKHZXd8Z0z1u/SrIG8="; + }) + + # Fix potential null pointer deference + # https://github.com/dinhvh/libetpan/pull/363 + (fetchpatch { + name = "pr-363-null-pointer-deference.patch"; + url = "https://github.com/dinhvh/libetpan/commit/68bde8b12b40a680c29d228f0b8fe4dfbf2d8d0b.patch"; + hash = "sha256-dUbnh2RoeELk/usHeFsdGC+J198jcudx3rb6/3sUAX0="; + }) + + # Missing boundary fix + # https://github.com/dinhvh/libetpan/pull/384 + (fetchpatch { + name = "pr-384-missing-boundary-fix.patch"; + url = "https://github.com/dinhvh/libetpan/commit/24c485495216c00076b29391591f46b61fcb3dac.patch"; + hash = "sha256-6ry8EfiYgbMtQYtT7L662I1A7N7N6OOy9T2ECgR7+cI="; + }) # CVE-2020-15953: Detect extra data after STARTTLS response and exit # https://github.com/dinhvh/libetpan/pull/387 (fetchpatch { name = "cve-2020-15953-imap.patch"; url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch"; - sha256 = "1h9ds2z4jii40a0i3z6hsnzx1ldmd2jqidsxp2y2ksyp1ijcgabn"; + hash = "sha256-dqnHZAzX6ym8uF23iKVotdHQv9XQ/BGBAiRGSb7QLcE="; }) # CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit @@ -31,7 +64,23 @@ stdenv.mkDerivation rec { (fetchpatch { name = "cve-2020-15953-pop3-smtp.patch"; url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch"; - sha256 = "0lq829djar7nb3fai3vdzirmks3w2lfagzqc809lx2lln6y213a0"; + hash = "sha256-QI0gvLGUik4TQAz/pxwVfOhZc/xtj6jcWPZkJVsSCFM="; + }) + + # Fix buffer overwrite for empty string in remove_trailing_eol + # https://github.com/dinhvh/libetpan/pull/408 + (fetchpatch { + name = "pr-408-fix-buffer-overwrite.patch"; + url = "https://github.com/dinhvh/libetpan/commit/078b924c7f49ac435b10b0f53a73f1bbc4717064.patch"; + hash = "sha256-lBRS+bv/7IK7yat2p3mc0SRYn/wRB/spjE7ungj6DT0="; + }) + + # CVE-2022-4121: Fixed crash when st_info_list is NULL. + # https://github.com/dinhvh/libetpan/issues/420 + (fetchpatch { + name = "cve-2022-4121.patch"; + url = "https://github.com/dinhvh/libetpan/commit/5c9eb6b6ba64c4eb927d7a902317410181aacbba.patch"; + hash = "sha256-O+LUkI91oej7MFg4Pg6/xq1uhSanweH81VzPXBdiPh4="; }) ]; @@ -43,9 +92,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail Framework for the C Language"; - homepage = "http://www.etpan.org/libetpan.html"; + homepage = "https://www.etpan.org/libetpan.html"; license = licenses.bsd3; maintainers = with maintainers; [ oxzi ]; - platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 90853d5f2db..c8db600dce8 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Wrapper library for evdev devices"; - homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html"; + homepage = "https://www.freedesktop.org/software/libevdev/doc/latest/index.html"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.amorsillo ]; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 5029e84d9c4..272cd3d9aa3 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, substituteAll , libtool, gettext, zlib, bzip2, flac, libvorbis -, exiv2, libgsf, rpm, pkg-config +, exiv2, libgsf, pkg-config +, rpmSupport ? stdenv.isLinux, rpm , gstreamerSupport ? true, gst_all_1 # ^ Needed e.g. for proper id3 and FLAC support. # Set to `false` to decrease package closure size by about 87 MB (53%). @@ -52,8 +53,9 @@ stdenv.mkDerivation rec { buildInputs = [ libtool gettext zlib bzip2 flac libvorbis exiv2 - libgsf rpm - ] ++ lib.optionals gstreamerSupport + libgsf + ] ++ lib.optionals rpmSupport [ rpm ] + ++ lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ lib.optionals gtkSupport [ glib gtk3 ] ++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ]; @@ -68,7 +70,7 @@ stdenv.mkDerivation rec { # Checks need to be run after "make install", otherwise plug-ins are not in # the search path, etc. doCheck = false; - doInstallCheck = true; + doInstallCheck = !stdenv.isDarwin; installCheckPhase = "make check"; meta = with lib; { @@ -98,6 +100,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.jorsn ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix index 66a0b7ddbae..ab2da122da7 100644 --- a/pkgs/development/libraries/libfabric/default.nix +++ b/pkgs/development/libraries/libfabric/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-7VOhdZOPBe1qh8OK8OTNKA5I4A5whl6aOubAzsUDSRw="; }; + outputs = [ "out" "dev" "man" ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optionals enablePsm2 [ libpsm2 ]; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 681f9cbfb22..5bfa335314f 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" - - # Causes issues in downstream packages which misuse ffi_closure_alloc - # Reenable once these issues are fixed and merged: - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 - # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 - "--disable-exec-static-tramp" ]; preCheck = '' diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index d789aafbcb4..f5fbf21f94f 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -10,6 +10,7 @@ , libpng , boost , guile +, python , qtbase , darwin }: @@ -25,8 +26,8 @@ stdenv.mkDerivation { hash = "sha256-OITy3fJx+Z6856V3D/KpSQRJztvOdJdqUv1c65wNgCc="; }; - nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; - buildInputs = [ eigen zlib libpng boost guile qtbase ] + nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; + buildInputs = [ eigen zlib libpng boost guile python qtbase ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ]; preConfigure = '' @@ -42,6 +43,14 @@ stdenv.mkDerivation { --replace "LIBFIVE_STDLIB_DIR=$<TARGET_FILE_DIR:libfive-stdlib>" \ "LIBFIVE_STDLIB_DIR=$out/lib" + substituteInPlace libfive/bind/python/CMakeLists.txt \ + --replace ' ''${PYTHON_SITE_PACKAGES_DIR}' \ + " $out/${python.sitePackages}" \ + + substituteInPlace libfive/bind/python/libfive/ffi.py \ + --replace "os.path.join('libfive', folder)" \ + "os.path.join('$out/${python.sitePackages}/libfive', folder)" \ + export XDG_CACHE_HOME=$(mktemp -d)/.cache ''; @@ -63,12 +72,29 @@ stdenv.mkDerivation { '' + '' # Link "Studio" binary to "libfive-studio" to be more obvious: ln -s "$out/bin/Studio" "$out/bin/libfive-studio" + + # Create links since libfive looks for the library in a specific path. + mkdir -p "$out/${python.sitePackages}/libfive/src" + ln -s "$out"/lib/libfive.* "$out/${python.sitePackages}/libfive/src/" + mkdir -p "$out/${python.sitePackages}/libfive/stdlib" + ln -s "$out"/lib/libfive-stdlib.* "$out/${python.sitePackages}/libfive/stdlib/" + + # Create links so Studio can find the bindings. + mkdir -p "$out/libfive/bind" + ln -s "$out/${python.sitePackages}" "$out/libfive/bind/python" ''; + pythonImportsCheck = [ + "libfive" + "libfive.runner" + "libfive.shape" + "libfive.stdlib" + ]; + meta = with lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; homepage = "https://libfive.com/"; - maintainers = with maintainers; [ hodapp kovirobi ]; + maintainers = with maintainers; [ hodapp kovirobi wulfsta ]; license = with licenses; [ mpl20 gpl2Plus ]; platforms = with platforms; all; }; diff --git a/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix b/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix new file mode 100644 index 00000000000..3e7253a4017 --- /dev/null +++ b/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix @@ -0,0 +1,53 @@ +{ stdenvNoCC +, lib +, fetchzip +, libfprint-tod +, openssl +, gusb +, glib +, autoPatchelfHook +}: + +stdenvNoCC.mkDerivation { + pname = "libfprint-2-tod1-elan"; + version = "0.0.8"; + + src = fetchzip { + url = "https://download.lenovo.com/pccbbs/mobiles/r1slf01w.zip"; + hash = "sha256-GD/BebPto1fFLgyvpiitt+ngwEtdsnKsvdFNeSmVDmw="; + # .so is in a subzip + postFetch = '' + unpackFile $out/* + rm $out/*.zip + mv * $out/ + ''; + }; + + nativeBuildInputs = [ autoPatchelfHook]; + + buildInputs = [ + libfprint-tod + openssl + gusb + glib + ]; + + installPhase = '' + runHook preInstall + + install -Dm444 libfprint-2-tod1-elan.so -t "$out/lib/libfprint-2/tod-1/" + + runHook postInstall + ''; + + passthru.driverPath = "/lib/libfprint-2/tod-1"; + + meta = with lib; { + description = "Elan(04f3:0c4b) driver module for libfprint-2-tod Touch OEM Driver"; + homepage = "https://support.lenovo.com/us/en/downloads/ds560939-elan-fingerprint-driver-for-ubuntu-2204-thinkpad-e14-gen-4-e15-gen-4"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ qdlmcfresh ]; + }; +} diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 75c9beea9b9..1e35d412461 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "-DPYTHON_BINDINGS=${onOff pythonSupport}" "-DDOCUMENTATION=${onOff docSupport}" ] ++ lib.optionals pythonSupport [ - "-DPYTHON_EXECUTABLE=${python3.pythonForBuild.interpreter}" + "-DPYTHON_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}" "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}" ]; diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix index 6fe2f398b25..f594d64095c 100644 --- a/pkgs/development/libraries/libfyaml/default.nix +++ b/pkgs/development/libraries/libfyaml/default.nix @@ -1,31 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libfyaml"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "pantoniou"; - repo = pname; - rev = "v${version}"; - hash = "sha256-b/jRKe23NIVSydoczI+Ax2VjBJLfAEwF8SW61vIDTwA="; + repo = "libfyaml"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Id5pdFzjA9q67okfESO3LZH8jIz93mVgIEEuBbPjuGI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; outputs = [ "bin" "dev" "out" "man" ]; + configureFlags = [ "--disable-network" ]; + doCheck = true; preCheck = '' patchShebangs test ''; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = with lib; { - homepage = "https://github.com/pantoniou/libfyaml"; description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite"; + homepage = "https://github.com/pantoniou/libfyaml"; + changelog = "https://github.com/pantoniou/libfyaml/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + pkgConfigModules = [ "libfyaml" ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index fa9562947f8..b7ccb7085fb 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "sha256-p/vLxagN9nCYw1JpUmZetgctQbrp3Wo33OVFrtvmnjQ="; + sha256 = "sha256-2U9JtpGyP4lbxtVJeP5GUgh5XthloPvFIw28+nldYx8="; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v${version}"; license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; platforms = platforms.unix; + # https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/212 + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/development/libraries/libgnome-games-support/2.0.nix index a5f1c2576b9..03166a423c3 100644 --- a/pkgs/development/libraries/libgnome-games-support/2.0.nix +++ b/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , glib +, gobject-introspection , gtk4 , libgee , gettext @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + gobject-introspection meson ninja pkg-config diff --git a/pkgs/development/libraries/libgnome-games-support/default.nix b/pkgs/development/libraries/libgnome-games-support/default.nix index e63d7f8fe65..edfd21a4696 100644 --- a/pkgs/development/libraries/libgnome-games-support/default.nix +++ b/pkgs/development/libraries/libgnome-games-support/default.nix @@ -2,6 +2,7 @@ , fetchurl , pkg-config , glib +, gobject-introspection , gtk3 , libgee , gettext @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + gobject-introspection meson ninja pkg-config diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index bc9a09ab926..f2d3d15f9e8 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "A fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.curl; }; } diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 6a6e21662ec..a5f914b39a9 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "2.0.1"; + version = "2.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk="; + hash = "sha256-/W7UssZ0/mzDtIGID2zeHup54pbpWhObhUAequpt4/w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index a508593bc49..37c5efc5d06 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pkg-config gettext glib - (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gi-docgen gobject-introspection diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index 2ad7539ef1f..0f7859be9db 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { "EXEDIR=$(bin)/bin" "DOCDIR=$(doc)/share/doc/libhugetlbfs" "MANDIR=$(man)/share/man" + ] ++ lib.optionals (stdenv.buildPlatform.system != stdenv.hostPlatform.system) [ + # The ARCH logic defaults to querying `uname`, which will return build platform arch + "ARCH=${stdenv.hostPlatform.uname.processor}" ]; # Default target builds tests as well, and the tests want a static @@ -40,10 +43,13 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-docs" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "library and utilities for Linux hugepages"; maintainers = with maintainers; [ qyliss ]; license = licenses.lgpl21Plus; platforms = platforms.linux; + badPlatforms = flatten [ + systems.inspect.platformPatterns.isStatic + systems.inspect.patterns.isMusl + ]; }; } diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix index b118890949f..5975502f315 100644 --- a/pkgs/development/libraries/libhv/default.nix +++ b/pkgs/development/libraries/libhv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libhv"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "ithewei"; repo = "libhv"; rev = "v${finalAttrs.version}"; - hash = "sha256-hzqU06Gc/vNqRKe3DTdP4AihJqeuNpt2mn4GlLuGU6U="; + hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/development/libraries/libhwy/default.nix index 4373f747433..b2f32cbe725 100644 --- a/pkgs/development/libraries/libhwy/default.nix +++ b/pkgs/development/libraries/libhwy/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, cmake, ninja, gtest, fetchFromGitHub, fetchpatch }: +{ lib +, stdenv +, cmake +, ninja +, gtest +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "libhwy"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "google"; repo = "highway"; rev = version; - hash = "sha256-Gym2iHq5ws9kuG4HWSQndD8hVugV4USZt6dUFnEkLwY="; + hash = "sha256-Z+mAR9nSAbCskUvo6oK79Yd85bu0HtI2aR5THS1EozM="; }; - patches = [ - # backport for compilation issue on aarch64 - # https://github.com/google/highway/issues/1613 - (fetchpatch { - url = "https://github.com/google/highway/commit/7ad89efa911cb906ccf3f78fe510db415e921801.diff"; - hash = "sha256-hTSkeCh2QLMqeIKG/CAqJXaPqD/66Z02gjGXk591f+U="; - }) - ]; nativeBuildInputs = [ cmake ninja ]; @@ -53,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Performance-portable, length-agnostic SIMD with runtime dispatch"; homepage = "https://github.com/google/highway"; - license = licenses.asl20; + license = with licenses; [ asl20 bsd3 ]; platforms = platforms.unix; maintainers = with maintainers; [ zhaofengli ]; }; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 2cb8642ca87..243c26af8e5 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.16"; + version = "3.0.17"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-3D/0leI3LLKDFOXkKSrmMamLoaXdi/2Z4iPUXqgwtg8="; + sha256 = "sha256-GqPCjI40kkqNv9zTnLdJgZVBxS4eZRHl+k/BN9vGnDo="; }; strictDeps = true; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; nativeInstallCheckInputs = [ # running libical-glib tests - (python3.pythonForBuild.withPackages (pkgs: with pkgs; [ + (python3.pythonOnBuildForHost.withPackages (pkgs: with pkgs; [ pygobject3 ])) ]; @@ -105,6 +105,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; + changelog = "https://github.com/libical/libical/raw/v${version}/ReleaseNotes.txt"; license = licenses.mpl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 6dd6654b35a..fc2fa9b6648 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -1,24 +1,18 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, libpng, openjpeg, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libicns"; - version = "0.8.1"; + version = "0.8.1-unstable-2022-04-10"; - src = fetchurl { - url = "mirror://sourceforge/icns/${pname}-${version}.tar.gz"; - sha256 = "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk"; + src = fetchgit { + name = "libicns"; + url = "https://git.code.sf.net/p/icns/code"; + rev = "921f972c461c505e5ac981aaddbdfdde97e8bb2b"; + hash = "sha256-YeO0rlTujDNmrdJ3DRyl3TORswF2KFKA+wVUxJo8Dno"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/libi/libicns/0.8.1-3.1/debian/patches/support-libopenjp2.patch"; - sha256 = "0ss298lyzvydxvaxsadi6kbbjpwykd86jw3za76brcsg2dpssgas"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libpng openjpeg ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libpng openjpeg zlib ]; meta = with lib; { description = "Library for manipulation of the Mac OS icns resource format"; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 83f69cfaa02..9e1d9e55c16 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,13 @@ -{ fetchurl, lib, stdenv, libiconv }: +{ fetchurl, lib, stdenv, libiconv +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libidn"; version = "1.41"; src = fetchurl { - url = "mirror://gnu/libidn/${pname}-${version}.tar.gz"; + url = "mirror://gnu/libidn/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-iE1wY2S4Gr3Re+6Whtj/KudDHFoUZRBHxorfizH9iUU="; }; @@ -15,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.isDarwin libiconv; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { homepage = "https://www.gnu.org/software/libidn/"; description = "Library for internationalized domain names"; @@ -36,7 +40,8 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.lgpl2Plus; + pkgConfigModules = [ "libidn" ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ lsix ]; }; -} +}) diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 98ca22d2e90..8adc0151204 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "-DOSX_PACKAGE=off" "-DOSX_FRAMEWORK=off" ] ++ lib.optionals pythonSupport [ - "-DPython_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPython_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" "-DPYTHON_BINDINGS=on" ] ++ lib.optionals (!avahiSupport) [ "-DHAVE_DNS_SD=OFF" diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock index d85dfcde626..fdad112994a 100644 --- a/pkgs/development/libraries/libimagequant/Cargo.lock +++ b/pkgs/development/libraries/libimagequant/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" @@ -33,15 +33,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "c_test" @@ -53,9 +53,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -73,16 +76,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -95,9 +88,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -108,33 +101,33 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "fallible_collections" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9acf77205554f3cfeca94a4b910e159ad9824e8c2d164de02b3f12495cc1074d" +checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" dependencies = [ "hashbrown", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -150,21 +143,11 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] name = "imagequant" -version = "4.2.0" +version = "4.2.2" dependencies = [ "arrayvec", "lodepng", - "num_cpus", "once_cell", "rayon", "rgb", @@ -173,7 +156,7 @@ dependencies = [ [[package]] name = "imagequant-sys" -version = "4.0.1" +version = "4.0.3" dependencies = [ "bitflags", "imagequant", @@ -182,15 +165,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "lodepng" -version = "3.7.2" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" dependencies = [ "crc32fast", "fallible_collections", @@ -201,9 +184,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -218,26 +201,16 @@ dependencies = [ ] [[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -245,14 +218,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -266,9 +237,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "thread_local" diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 08893611507..f60a1c7cab7 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, fetchurl, rust, rustPlatform, cargo-c, python3 }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.2.0"; + version = "4.2.2"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - hash = "sha256-51xTCymZKLuw1Xeje6EyKqHdbmqBV1Fdhx+OsO3bZ6Q="; + hash = "sha256-cZgnJOmj+xJDcewsxH2Jp5AAnFZKVuYxKPtoGeN03g4="; }; cargoLock = { @@ -26,13 +23,13 @@ rustPlatform.buildRustPackage rec { postBuild = '' pushd imagequant-sys - cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; postInstall = '' pushd imagequant-sys - cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 6a7b3f489af..d10020fa992 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -7,6 +7,7 @@ , boost , python3 , fcitx5 +, zstd }: let @@ -27,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-r1Px93Ly7FzcRaPUNTHNcedzHPHocnUj8t8VMZqXkFM="; + sha256 = "sha256-C34hcea0htc9ayytjqy/t08yA2xMC18sAkDc9PK/Hhc="; fetchSubmodules = true; }; @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + zstd boost fcitx5 ]; diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index 806a9729c57..826593b9d66 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; }; + postPatch = '' + substituteInPlace lib/socket.c \ + --replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" + ''; + nativeBuildInputs = [ autoreconfHook ]; # This problem is gone on libiscsi master. diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 900146f6b01..8b70a3b715f 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.5.3"; + version = "2.6.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "sha256-orxmd6yItB6XLj650RQb0CP/EnN9563v+P9xz9LEJkY="; + sha256 = "sha256-q1NoHSiPmFPwkTJqg3L5fEBXF/JjRWvA9e4d532ILE8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index d7f5aa24c15..9b1716ecc6d 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libksba"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - hash = "sha256-P3LGjbMJceu/FDZ1J3GUI/Ck1fgQP8n0ocAan6RA3lw="; + hash = "sha256-u7Q/AyuRZNhseB/+QiE6g79PL+6RRV7fpGVFIbiwO2s="; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/liblinphone/backport-cpp17.patch b/pkgs/development/libraries/liblinphone/backport-cpp17.patch new file mode 100644 index 00000000000..d9eb75fa276 --- /dev/null +++ b/pkgs/development/libraries/liblinphone/backport-cpp17.patch @@ -0,0 +1,98 @@ +From 9ece6e77dcf6545c3b8104068302c6243e3a5e88 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= + <mickael.turnel@belledonne-communications.com> +Date: Wed, 1 Mar 2023 09:14:53 +0100 +Subject: [PATCH] Set c++ version 17 and fix compilation errors + +Backported-by: Lorenz Brun <lorenz@brun.one> + +--- + CMakeLists.txt | 2 +- + daemon/daemon.cc | 2 +- + libxsd/xsd/cxx/config.hxx | 2 +- + src/conference/session/streams-group.cpp | 10 +++++----- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 475ff16a8..a771e4595 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,7 +92,7 @@ cmake_dependent_option(ENABLE_QRCODE "Enable QRCode support" YES "ENABLE_VIDEO" + # * DISABLE_BC_PACKAGE_SEARCH: skip find_package() for every BC package (bctoolbox, ortp, etc.) + # * DISABLE_SOCI_PACKAGE_SEARCH: skip find_package() for Soci. + +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_EXTENSIONS NO) + + if(NOT CMAKE_BUILD_TYPE) +diff --git a/daemon/daemon.cc b/daemon/daemon.cc +index 197fc22ef..fd09edb26 100644 +--- a/daemon/daemon.cc ++++ b/daemon/daemon.cc +@@ -628,7 +628,7 @@ void Daemon::execCommand(const string &command) { + ist.get(argsbuf); + string args = argsbuf.str(); + if (!args.empty() && (args[0] == ' ')) args.erase(0, 1); +- list<DaemonCommand*>::iterator it = find_if(mCommands.begin(), mCommands.end(), bind2nd(mem_fun(&DaemonCommand::matches), name)); ++ list<DaemonCommand*>::iterator it = find_if(mCommands.begin(), mCommands.end(), [&name](const DaemonCommand *dc) { return dc->matches(name); }); + if (it != mCommands.end()) { + ms_mutex_lock(&mMutex); + (*it)->exec(this, args); +diff --git a/libxsd/xsd/cxx/config.hxx b/libxsd/xsd/cxx/config.hxx +index 076b107f5..385841731 100644 +--- a/libxsd/xsd/cxx/config.hxx ++++ b/libxsd/xsd/cxx/config.hxx +@@ -19,7 +19,7 @@ + # endif + #else + # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L +-# ifdef __GNUC__ ++# if defined(__GNUC__) && !defined(__clang__) + # if (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 + # define XSD_CXX11_NULLPTR + # endif +diff --git a/src/conference/session/streams-group.cpp b/src/conference/session/streams-group.cpp +index bff739dda..84277a6b7 100644 +--- a/src/conference/session/streams-group.cpp ++++ b/src/conference/session/streams-group.cpp +@@ -447,11 +447,11 @@ float StreamsGroup::computeOverallQuality(_functor func){ + } + + float StreamsGroup::getAverageQuality(){ +- return computeOverallQuality(mem_fun(&Stream::getAverageQuality)); ++ return computeOverallQuality(mem_fn(&Stream::getAverageQuality)); + } + + float StreamsGroup::getCurrentQuality(){ +- return computeOverallQuality(mem_fun(&Stream::getCurrentQuality)); ++ return computeOverallQuality(mem_fn(&Stream::getCurrentQuality)); + } + + int StreamsGroup::getAvpfRrInterval()const{ +@@ -481,11 +481,11 @@ bool StreamsGroup::avpfEnabled() const{ + } + + void StreamsGroup::refreshSockets(){ +- forEach<Stream>(mem_fun(&Stream::refreshSockets)); ++ forEach<Stream>(mem_fn(&Stream::refreshSockets)); + } + + void StreamsGroup::computeAndReportBandwidth(){ +- forEach<Stream>(mem_fun(&Stream::updateBandwidthReports)); ++ forEach<Stream>(mem_fn(&Stream::updateBandwidthReports)); + + if (!bctbx_log_level_enabled(BCTBX_LOG_DOMAIN, BCTBX_LOG_MESSAGE)) return; + +@@ -540,7 +540,7 @@ void StreamsGroup::finish(){ + mIceService->finish(); // finish ICE first, as it has actions on the streams. + for (auto & ss : mSharedServices) ss.second->checkDestroy(); + mSharedServices.clear(); +- forEach<Stream>(mem_fun(&Stream::finish)); ++ forEach<Stream>(mem_fn(&Stream::finish)); + mFinished = true; + } + +-- +2.41.0 + diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 33220f193b5..c4b792e673f 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -1,7 +1,7 @@ -{ bctoolbox +{ lib +, bc-soci , belcard , belle-sip -, belr , cmake , doxygen , fetchFromGitLab @@ -10,9 +10,7 @@ , lime , mediastreamer , python3 -, bc-soci , sqlite -, lib , stdenv , xercesc , zxing-cpp @@ -31,6 +29,12 @@ stdenv.mkDerivation rec { hash = "sha256-kQZePMa7MTaSJLEObM8khfSFYLqhlgTcVyKfTPLwKYU="; }; + patches = [ + # zxing-cpp 2.0+ requires C++ 17 + # Manual backport as upstream ran formatters in the meantime + ./backport-cpp17.patch + ]; + postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace "jsoncpp_object" "jsoncpp" \ diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index df27688e105..2623e65f68b 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, pkg-config -, systemd ? null +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemd }: stdenv.mkDerivation rec { @@ -12,12 +13,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ systemd ]; + buildInputs = lib.optionals withSystemd [ systemd ]; configureFlags = [ "--enable-rfc3195" "--enable-stdlog" - (if systemd != null then "--enable-journal" else "--disable-journal") + (if withSystemd then "--enable-journal" else "--disable-journal") "--enable-man-pages" ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index d87309111d5..32d1522fb68 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblouis"; - version = "3.26.0"; + version = "3.27.0"; outputs = [ "out" "dev" "info" "doc" ] # configure: WARNING: cannot generate manual pages while cross compiling @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "liblouis"; repo = "liblouis"; rev = "v${finalAttrs.version}"; - hash = "sha256-Kko9qBWdNiZ61Wbb7lUYoSNU1hhRUexPcU3pADv0UHo="; + hash = "sha256-5umpIscs4Y8MSaoY7yKtBFmlIa8QDQtjBxoysZ+GTm8="; }; strictDeps = true; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 0bc649780c8..a9e18f40232 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -7,7 +7,7 @@ , vala , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 896c8b8fe4e..9965771c153 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -12,7 +12,7 @@ , bash-completion , bash , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , withDocs ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection }: diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index ad3d8f0cce4..bf156fb1c55 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,35 +1,30 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmd"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { urls = [ - "https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz" - "https://libbsd.freedesktop.org/releases/libmd-${version}.tar.xz" + "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.tar.xz" + "https://libbsd.freedesktop.org/releases/libmd-${finalAttrs.version}.tar.xz" ]; - sha256 = "sha256-9RySEELjS+3e3tS3VVdlZVnPWx8kSAM7TB7sEcB+Uw8="; + sha256 = "sha256-G9aqQidTE68xQcfPLluWTosf1IgCXK8vlx9DsAd2szI="; }; - patches = [ - # Drop aliases for SHA384 functions, because such aliases are not supported on Darwin. - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/8332f5dbcaf05a02bc31fbd4ccf735e7d5c9a5b0/devel/libmd/files/patch-symbol-alias.diff"; - sha256 = "sha256-py5hMpKYKwtBzhWn01lFc2a6+OZN72YCYXyhg1qe6rg="; - extraPrefix = ""; - }) - ]; + enableParallelBuilding = true; + + doCheck = true; nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { - homepage = "https://www.hadrons.org/software/${pname}/"; - changelog = "https://archive.hadrons.org/software/libmd/libmd-${version}.announce"; + homepage = "https://www.hadrons.org/software/libmd/"; + changelog = "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.announce"; # Git: https://git.hadrons.org/cgit/libmd.git description = "Message Digest functions from BSD systems"; license = with licenses; [ bsd3 bsd2 isc beerware publicDomain ]; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index edbaf20690f..86cf8dfb9e8 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "23.07"; + version = "23.10"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-YEVsiyq4dppggdlv176G20/jJSDkoCI5fLIsrPR86CA="; + hash = "sha256-duvlAuDzELVZ1d2Qcn2ar9X6uq7KNELzjmKd/AfaDSI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix index 69c36dc718c..334dfa9d801 100644 --- a/pkgs/development/libraries/libmodplug/default.nix +++ b/pkgs/development/libraries/libmodplug/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; }; + # Unfortunately, upstream appears inactive and the patches from the fork don’t apply cleanly. + # Modify `src/fastmix.cpp` to remove usage of the register storage class, which is + # not allowed in C++17 and is an error in clang 16. + prePatch = "substituteInPlace src/fastmix.cpp --replace 'register ' ''"; + outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/pkgs/development/libraries/libmongocrypt/default.nix b/pkgs/development/libraries/libmongocrypt/default.nix index d2d22f4cf8c..f45d41fed62 100644 --- a/pkgs/development/libraries/libmongocrypt/default.nix +++ b/pkgs/development/libraries/libmongocrypt/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { mongoc openssl ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk_11_0.frameworks.Security ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 23cb0061805..52d92840a34 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { feature is the possibility setting style properties from a CSS format file.''; license = licenses.lgpl21; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 5569fdf9025..e0ee93c1628 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-zqtPBxjTJ+/XxVpfVpyFIwvlj5xCcnTrUv2RGzP8UQc="; + sha256 = "sha256-BIEe3DhPqyK+vAAk/6x8Ui+4t+IUyvtHf5Lk2AZVuC8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index a125d10481c..31104b262af 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - hash = "sha256-Tkd46NxLvGe+RpCSFdCsYrFWc3PAtXI1aCq8177jla0="; + hash = "sha256-srJyd32eCIthoncvM9JQEKCWEOZxxc3YntaV4Ay8kZ8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index af3c7f82aef..b835844491f 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnet"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "sam-github"; repo = "libnet"; rev = "v${version}"; - sha256 = "sha256-Y/wd9c4whUbfpvWvKzJV6vJN3AlA14XBejchRG6wBc4="; + hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index e94ce7e12b1..589703f574c 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -9,19 +9,19 @@ , gdk-pixbuf , gnome , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection }: stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.8.2"; + version = "0.8.3"; outputs = [ "out" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xfTtPR+G5bEYx2QVqsuGGHPtPm8MazGBuCjPWE/FxhY="; + hash = "sha256-7o8++UYVatNAb99F/u29zZMtvSEatPFvdeuk82+y9sA="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 4f9d7d09caa..59e16071ce7 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnsl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f9kNzzR8baf5mLgrh+bKO/rBRZA5ZYc1tJdyLE7Bi1w="; + sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index a9c1d2008af..672d298f144 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgcrypt, autoreconfHook }: +{ lib, stdenv, fetchurl, pkgsHostTarget, libgcrypt, autoreconfHook }: stdenv.mkDerivation rec { pname = "libotr"; @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + pkgsHostTarget.libgcrypt.dev # for libgcrypt-config + ]; propagatedBuildInputs = [ libgcrypt ]; meta = with lib; { diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index a345ac704bc..70d33d86ad1 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 8618986195e..0598fd6451e 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,16 +1,30 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , enableShared ? !stdenv.hostPlatform.isStatic +, windows }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation (finalAttrs: { version = "4.13.0"; pname = "libpfm"; src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/perfmon2/libpfm4/libpfm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-0YuXdkx1VSjBBR03bjNUXQ62DG6/hWgENoE/pbBMw9E="; }; + # Don't install libpfm.so on windows as it doesn't exist + # This target is created only if `ifeq ($(SYS),Linux)` passes + patches = [ ./fix-windows.patch ]; + + # Upstream uses "WINDOWS" instead of "Windows" which is incorrect + # See: https://github.com/NixOS/nixpkgs/pull/252982#discussion_r1314346216 + postPatch = '' + substituteInPlace config.mk examples/Makefile \ + --replace '($(SYS),WINDOWS)' '($(SYS),Windows)' + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "LDCONFIG=true" @@ -19,6 +33,9 @@ stdenv.mkDerivation (rec { ]; env.NIX_CFLAGS_COMPILE = "-Wno-error"; + env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n"; + + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.libgnurx; meta = with lib; { description = "Helper library to program the performance monitoring events"; @@ -29,11 +46,7 @@ stdenv.mkDerivation (rec { (PMU) of modern processors. ''; license = licenses.gpl2; - maintainers = [ maintainers.pierron ]; - platforms = platforms.linux; + maintainers = with maintainers; [ pierron t4ccer ]; + platforms = platforms.linux ++ platforms.windows; }; -} // lib.optionalAttrs ( ! enableShared ) -{ - CONFIG_PFMLIB_SHARED = "n"; -} -) +}) diff --git a/pkgs/development/libraries/libpfm/fix-windows.patch b/pkgs/development/libraries/libpfm/fix-windows.patch new file mode 100644 index 00000000000..584b9ba6eb8 --- /dev/null +++ b/pkgs/development/libraries/libpfm/fix-windows.patch @@ -0,0 +1,18 @@ +diff --git a/lib/Makefile b/lib/Makefile +index 5ca71e3..cd0717f 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -428,11 +428,13 @@ install: + -mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 $(ALIBPFM) $(DESTDIR)$(LIBDIR) + ifeq ($(CONFIG_PFMLIB_SHARED),y) ++ifeq ($(SYS),Linux) + $(INSTALL) $(SLIBPFM) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) $(VLIBPFM) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) libpfm.$(SOLIBEXT) + -$(LDCONFIG) + endif ++endif + + tags: + $(CTAGS) -o $(TOPDIR)/tags --tag-relative=yes $(SRCS) $(INCDEP) diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index ce0b396eed1..2ae333d61ad 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -29,11 +29,16 @@ stdenv.mkDerivation rec { tar -xzf ${modelData} -C $sourceRoot/data ''; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook + pkg-config + ]; + + buildInputs = [ glib db - pkg-config ]; meta = with lib; { diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index a76a1ada6c8..e94bd026a7a 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib +, testers +}: assert stdenv.hostPlatform == stdenv.buildPlatform -> zlib != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libpng"; version = "1.2.59"; src = fetchurl { - url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; + url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; sha256 = "1izw9ybm27llk8531w6h4jp4rk2rxy2s9vil16nwik5dp0amyqxl"; }; @@ -15,18 +17,23 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - passthru = { inherit zlib; }; - configureFlags = [ "--enable-static" ]; postInstall = ''mv "$out/bin" "$dev/bin"''; + passthru = { + inherit zlib; + + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = with lib; { description = "The official reference implementation for the PNG file format"; homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng; maintainers = [ ]; branch = "1.2"; + pkgConfigModules = [ "libpng" "libpng12" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index b757d20b71d..e1d412b5006 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenv, fetchurl, zlib, apngSupport ? true }: +{ lib, stdenv, fetchurl, zlib, apngSupport ? true +, testers +}: assert zlib != null; let - patchVersion = "1.6.39"; + patchVersion = "1.6.40"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-SsS26roAzeISxI22XLlCkQc/68oixcef2ocJFQLoDP0="; + hash = "sha256-CjykZIKTjY1sciZivtLH7gxlobViRESzztIa2NNW2y8="; }; whenPatched = lib.optionalString apngSupport; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.39"; + version = "1.6.40"; src = fetchurl { - url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - hash = "sha256-H0aWznC07l+F8eFiPcEimyEAKfpLeu5XPfPiunsDaTc="; + url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; + hash = "sha256-U1tHmyRn/yMaPsbZKlJZBvuO8nl4vk9m2+BdPzoBs6E="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -27,14 +29,19 @@ in stdenv.mkDerivation rec { doCheck = true; - passthru = { inherit zlib; }; + passthru = { + inherit zlib; + + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; - changelog = "https://github.com/glennrp/libpng/blob/v1.6.39/CHANGES"; + changelog = "https://github.com/glennrp/libpng/blob/v1.6.40/CHANGES"; license = licenses.libpng2; + pkgConfigModules = [ "libpng" "libpng16" ]; platforms = platforms.all; maintainers = with maintainers; [ vcunat ]; }; -} +}) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 62ddcd67390..5c7a3162502 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; - homepage = "http://libproxy.github.io/libproxy/"; + homepage = "https://libproxy.github.io/libproxy/"; description = "A library that provides automatic proxy configuration management"; }; } diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 62aa346e002..6f7583d563b 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -17,7 +17,7 @@ , libmbim , libqrtr-glib , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , withMan ? stdenv.buildPlatform.canExecute stdenv.hostPlatform }: diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 4a17bd951aa..afae47c96d3 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -4,7 +4,6 @@ , extra-cmake-modules , qtbase , qtmultimedia -, qtquick1 , qttools , libGL , libX11 @@ -25,7 +24,6 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia - qtquick1 libGL libX11 libass diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 2dd4cc6663a..e154ab8eafe 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "libquotient"; version = "0.8.1.2"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; @@ -11,10 +13,10 @@ stdenv.mkDerivation rec { hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8="; }; - buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ]; - nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ qtbase qtkeychain olm openssl qtmultimedia ]; + cmakeFlags = [ "-DQuotient_ENABLE_E2EE=ON" ]; @@ -28,9 +30,14 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postInstall = '' + # causes cyclic dependency but is not used + rm $out/share/ndk-modules/Android.mk + ''; + meta = with lib; { description = "A Qt5/Qt6 library to write cross-platform clients for Matrix"; - homepage = "https://matrix.org/docs/projects/sdk/quotient"; + homepage = "https://quotient-im.github.io/libQuotient/"; license = licenses.lgpl21; maintainers = with maintainers; [ colemickens matthiasbeyer ]; }; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index bfcdb2d5287..9a86643061c 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,16 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, zlib, openssl -, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, zlib +, openssl +, cmake +, SystemConfiguration +}: stdenv.mkDerivation rec { - version = "2.9.0"; + version = "3.6.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-YNAfHmohMqGGF8N/VdndJJ32PF/GMBoNtjo/t2lt6HA="; + sha256 = "sha256-pFtrmrNRSL1lw10LjayOoNFrW/tTPXwmUipwC5v1MZs="; }; - buildInputs = [ zlib openssl ]; + + buildInputs = [ + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + SystemConfiguration + ]; + nativeBuildInputs = [ cmake ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index 58a701bc15c..9f530271771 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { in '' # avoid git dependency cp ${printVersion} build-aux/git-version-gen + # failing to build otherwise since glibc-2.38 + sed '1i#include <string.h>' -i programs/dwg2SVG.c ''; preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index a9dc9f349ff..613f7d3a2b3 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -100,4 +100,9 @@ in { version = "3.7.3"; hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM="; }; + + libressl_3_8 = generic { + version = "3.8.2"; + hash = "sha256-bUuNW7slofgzZjnlbsUIgFLUOpUlZpeoXEzpEyPCWVQ="; + }; } diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 3c0fb1fdff0..8bbcb7af80a 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Rime Input Method Engine, the core library"; license = licenses.bsd3; maintainers = with maintainers; [ vonfry ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/librist/darwin.patch b/pkgs/development/libraries/librist/darwin.patch new file mode 100644 index 00000000000..f9571fd434f --- /dev/null +++ b/pkgs/development/libraries/librist/darwin.patch @@ -0,0 +1,14 @@ +--- a/tools/srp_shared.c ++++ b/tools/srp_shared.c +@@ -173,7 +173,11 @@ void user_verifier_lookup(char * username, + if (stat(srpfile, &buf) != 0) + return; + ++#if defined(__APPLE__) ++ *generation = (buf.st_mtimespec.tv_sec << 32) | buf.st_mtimespec.tv_nsec; ++#else + *generation = (buf.st_mtim.tv_sec << 32) | buf.st_mtim.tv_nsec; ++#endif + #endif + + if (!lookup_data || !hashversion) diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/development/libraries/librist/default.nix index 134b3acf205..c8835309070 100644 --- a/pkgs/development/libraries/librist/default.nix +++ b/pkgs/development/libraries/librist/default.nix @@ -11,16 +11,21 @@ stdenv.mkDerivation rec { pname = "librist"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "rist"; repo = "librist"; rev = "v${version}"; - sha256 = "sha256-qQG2eRAPAQgxghMeUZk3nwyacX6jDl33F8BWW63nM3c="; + hash = "sha256-E12TS+N47UQapkF6oO0Lx66Z3lHAyP0R4tVnx/uKBwQ="; }; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/257020 + ./darwin.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index d5738153f0a..7ba6f1963e7 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,14 +15,13 @@ , libobjc , rustPlatform , rustc -, rust , cargo-auditable-cargo-wrapper , gi-docgen , python3Packages , gnome , vala , writeScript -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages , gobject-introspection , _experimental-update-script-combinators @@ -106,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix index c7e9b3895d9..dabb5e62e45 100644 --- a/pkgs/development/libraries/librtprocess/default.nix +++ b/pkgs/development/libraries/librtprocess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages }: stdenv.mkDerivation rec { pname = "librtprocess"; @@ -6,18 +6,20 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "CarVac"; - repo = pname; + repo = "librtprocess"; rev = version; - sha256 = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w="; + hash = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w="; }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ llvmPackages.openmp ]; + meta = with lib; { - homepage = "https://github.com/CarVac/librtprocess"; description = "Highly optimized library for processing RAW images"; - license = licenses.gpl3; + homepage = "https://github.com/CarVac/librtprocess"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ hjones2199 ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/development/libraries/librttopo/default.nix index 690417c3e73..5d768db366d 100644 --- a/pkgs/development/libraries/librttopo/default.nix +++ b/pkgs/development/libraries/librttopo/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "RT Topology Library"; homepage = "https://git.osgeo.org/gitea/rttopo/librttopo"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index f4293952b9f..92f3853b5f7 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libsass"; version = "3.6.5"; # also check sassc for updates src = fetchFromGitHub { owner = "sass"; - repo = pname; - rev = version; + repo = finalAttrs.pname; + rev = finalAttrs.version; sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. @@ -17,16 +19,19 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export LIBSASS_VERSION=${version} + export LIBSASS_VERSION=${finalAttrs.version} ''; nativeBuildInputs = [ autoreconfHook ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "A C/C++ implementation of a Sass compiler"; homepage = "https://github.com/sass/libsass"; license = licenses.mit; maintainers = with maintainers; [ codyopel offline ]; + pkgConfigModules = [ "libsass" ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 29cb7616a9a..3dfb0c295b1 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -13,7 +13,7 @@ , libgcrypt , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , vala , gi-docgen , gnome diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 75fc2afbf18..e9547cc2af9 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, fetchpatch, pkg-config , libvorbis, libtheora, speex }: # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc @@ -12,6 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-OcvU8O/f3cl1XYghfkf48tcQj6dn+dWKK6JqFtj3yRA="; }; + patches = [ + # Fixes building libshout with clang. Can be dropped once the following MR is merged: + # https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4. + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/600fa105a799986efcccddfedfdfd3e9a1988cd0.patch"; + hash = "sha256-XjogfcQJBPZX9MPAbNJyXaFZNekL1pabvtTT7N+cz+s="; + }) + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/8ab2de318d55c9d0987ffae7d9b94b365af732c1.patch"; + hash = "sha256-0+Wp2Xu59ESCJfoDcwAJHuAJyzMsaBe7f8Js3/ren2g="; + }) + ]; + outputs = [ "out" "dev" "doc" ]; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix deleted file mode 100644 index 2e8b788ecc2..00000000000 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, m4}: - -stdenv.mkDerivation rec { - pname = "libsigc++"; - version = "1.2.7"; - - src = fetchurl { - url = "mirror://gnome/sources/libsigc++/1.2/libsigc++-${version}.tar.bz2"; - sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ m4]; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; - description = "A typesafe callback system for standard C++"; - branch = "1.2"; - platforms = platforms.unix; - license = licenses.lgpl3; - }; -} diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index c9f6e11d411..b5919d62d44 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "libsigcxx"; versionPolicy = "odd-unstable"; - freeze = true; + freeze = "2.99.1"; }; }; diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 9b71a91efed..14139d849dc 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1lslaxr2qcj6hf4naq5n5mparfhmswsgq4wa7zm2icqvvgdcq6pj"; }; + env.NIX_CFLAGS_COMPILE = "-std=gnu90"; + meta = with lib; { description = "A Library to Access SMI MIB Information"; homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 14e730d69e5..b3a00d89a5d 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; - patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch; + patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; - nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; - hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector"; + hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector"; # FIXME: the hardeingDisable attr above does not seems effective, so # the need to disable stackprotector via configureFlags - configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp"; + configureFlags = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "--disable-ssp"; doCheck = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A modern and easy-to-use crypto library"; - homepage = "http://doc.libsodium.org/"; + homepage = "https://doc.libsodium.org/"; license = licenses.isc; maintainers = with maintainers; [ raskin ]; pkgConfigModules = [ "libsodium" ]; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 7e912a6bcad..4b40eacaa03 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -16,14 +16,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.24"; + version = "0.7.26"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-UTVnGJO/9mQF9RwK75hh6IkoP1MwAlFaLCtdYU8uS34="; + sha256 = "sha256-NGybpl/Fd46pmSYMNGocStQQCXr5pX34PCmN/hFKeyk="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 13c7ccc3028..ba4d1b0cd8a 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -11,7 +11,7 @@ , glib-networking , buildPackages , gobject-introspection -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , vala , libpsl , python3 @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { # HSTS tests fail. doCheck = false; + separateDebugInfo = true; postPatch = '' patchShebangs libsoup/ diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index eb99010fb85..6d5b0183cdd 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -16,7 +16,7 @@ , sqlite , glib-networking , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages }: stdenv.mkDerivation rec { @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-lpthread"; doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) + separateDebugInfo = true; postPatch = '' # fixes finding vapigen when cross-compiling diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 455d42c3bb4..16c98abf441 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; license = licenses.mit; + maintainers = teams.geospatial.members; platforms = platforms.unix; }; }) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 372f0c479c8..b8d1fe45e44 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index b7bef297352..997e89b8239 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -1,23 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libspf2"; - version = "2.2.12"; + version = "2.2.13"; src = fetchFromGitHub { owner = "helsinki-systems"; repo = "libspf2"; rev = "v${version}"; - sha256 = "03iiaafdcwh220pqignk407h6klrakwz0zkb8iwk6nkwipkwvhsx"; + hash = "sha256-tkCHP3B1sBb0+scHBjX5lCvaeSrZryfaGKye02LFlYs="; }; - patches = [ - # glibc-2.34 compat - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/dbb8a5c9f749cc11e61cfe558f164b165cbc30cb/mail-filter/libspf2/files/libspf2-1.2.11-undefined-dn_.patch"; - sha256 = "sha256-6JVVkVGCcFJsNeBdVTPcLhW4KoHLY4ai/KXDMliXgPA="; - }) - ]; + nativeBuildInputs = [ autoreconfHook ]; + strictDeps = true; postPatch = '' # disable static bins compilation @@ -28,9 +23,6 @@ stdenv.mkDerivation rec { -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am ''; - # autoreconf necessary because we modified automake files - nativeBuildInputs = [ autoreconfHook ]; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libsv/default.nix b/pkgs/development/libraries/libsv/default.nix index a791bcef482..9c627993756 100644 --- a/pkgs/development/libraries/libsv/default.nix +++ b/pkgs/development/libraries/libsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsv"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "uael"; repo = "sv"; rev = "v${version}"; - sha256 = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY="; + sha256 = "sha256-sc7WTRY8XTm5+J+zlS7tGa2f+2d7apj+XHyBafZXXeE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 3e77d0876be..3674f25b465 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { homepage = "http://roguecentral.org/doryen/libtcod/"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.skeidel ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/development/libraries/libtickit/skipTestMacOS.patch b/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch index 3ecdf75f06f..3ecdf75f06f 100644 --- a/pkgs/development/libraries/libtickit/skipTestMacOS.patch +++ b/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch diff --git a/pkgs/development/libraries/libtickit/default.nix b/pkgs/development/libraries/libtickit/default.nix index 4b5296c8956..54386e57a0a 100644 --- a/pkgs/development/libraries/libtickit/default.nix +++ b/pkgs/development/libraries/libtickit/default.nix @@ -7,9 +7,12 @@ , libtermkey , unibilium }: -stdenv.mkDerivation rec { - pname = "libtickit"; +let version = "0.4.3"; +in +stdenv.mkDerivation { + pname = "libtickit"; + inherit version; src = fetchFromGitHub { owner = "leonerd"; @@ -18,25 +21,33 @@ stdenv.mkDerivation rec { hash = "sha256-QCrym8g5J1qwsFpU/PB8zZIWdM3YzOySknISSbQE4Sc="; }; - makeFlags = [ - "PREFIX=$(out)" - "LIBTOOL=${lib.getExe libtool}" + patches = [ + # Disabled on darwin, since test assumes TERM=linux + ./001-skip-test-18term-builder-on-macos.patch ]; nativeBuildInputs = [ pkg-config libtool ]; + buildInputs = [ libtermkey unibilium ]; + nativeCheckInputs = [ perl ]; - patches = [ - ./skipTestMacOS.patch + makeFlags = [ + "LIBTOOL=${lib.getExe libtool}" ]; + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + enableParallelBuilding = true; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 4fc6449230d..8055704b089 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; }; patches = [ diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch index e0ef9f3478a..933e06f3232 100644 --- a/pkgs/development/libraries/libtiff/headers.patch +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -1,9 +1,8 @@ -diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am -index 44522b62..d66e5948 100644 +export private headers for freeimage --- i/libtiff/Makefile.am +++ w/libtiff/Makefile.am @@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in + tif_win32_versioninfo.rc libtiffinclude_HEADERS = \ + tif_config.h \ diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch index ddd33ad4904..04fa1bfc88c 100644 --- a/pkgs/development/libraries/libtiff/rename-version.patch +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -1,3 +1,4 @@ +fix case-insensitive build --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ docfiles = \ @@ -6,15 +7,15 @@ TODO \ - VERSION + VERSION.txt - + EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - + placeholder.h \ +@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) + @(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---) + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - ++ (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h) + pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 4ec70464e1a..83c84fac602 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -42,6 +42,11 @@ in stdenv.mkDerivation { moveToOutput "lib/${python.libPrefix}" "$python" ''; + postFixup = '' + substituteInPlace "$dev/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" + ''; + outputs = [ "out" "dev" "python" ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 7c0868509f0..c8e00cf4a94 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal-emulator State Machine"; - homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; + homepage = "https://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 389aa7c283f..14bf7f7c09c 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Mozilla's Universal Charset Detector C/C++ API"; homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 1feafabfd4d..c1e0881bf3f 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libunarr"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/selmf/unarr/releases/download/v${version}/unarr-${version}.tar.xz"; - hash = "sha256-5wCnhjoj+GTmaeDTCrUnm1Wt9SsWAbQcPSYM//FNeOA="; + hash = "sha256-Mo76BOqZbdOJFrEkeozxdqwpuFyvkhdONNMZmN5BdNI="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 5779389dda1..a42aab3d59e 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,25 +1,15 @@ -{ lib, stdenv, fetchgit, fetchpatch }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "liburing"; - version = "2.4"; + version = "2.5"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; + sha256 = "sha256-hPyEZ0P1rfos53OCNd2OYFiqmv6TgpWaj5/xPLccCvM="; }; - patches = [ - # Pull upstream fix for parallel build failures: - # https://github.com/axboe/liburing/pull/891 - (fetchpatch { - name = "parallel.patch"; - url = "https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371.patch"; - hash = "sha256-RZSgHdQy5d7mXtMvkMyr+/kMhp1w+S5v9cqk5NSii5o="; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 326ee302815..1f768a2cb26 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ , fetchpatch , autoreconfHook , pkg-config -, enableUdev ? stdenv.isLinux && !stdenv.targetPlatform.isStatic +, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic , udev , libobjc , IOKit diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/development/libraries/libusbsio/default.nix index 1982311919b..090683898a1 100644 --- a/pkgs/development/libraries/libusbsio/default.nix +++ b/pkgs/development/libraries/libusbsio/default.nix @@ -1,7 +1,13 @@ -{ lib, stdenv, fetchzip, pkg-config, libusb1, systemdMinimal }: -let - binDirPrefix = if stdenv.isDarwin then "osx_" else "linux_"; -in +{ lib +, stdenv +, fetchzip +, pkg-config +, fixDarwinDylibNames +, libusb1 +, systemdMinimal +, darwin +}: + stdenv.mkDerivation rec { pname = "libusbsio"; version = "2.1.11"; @@ -15,15 +21,30 @@ stdenv.mkDerivation rec { rm -r bin/* ''; - nativeBuildInputs = [ pkg-config ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "BINDIR=" + ]; + + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; + buildInputs = [ libusb1 + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit + CoreFoundation + IOKit + ]) ++ lib.optionals stdenv.isLinux [ systemdMinimal # libudev ]; installPhase = '' runHook preInstall - install -D bin/${binDirPrefix}${stdenv.hostPlatform.parsed.cpu.name}/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} + install -D bin/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} runHook postInstall ''; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 113f83c1fc9..d8b7cbdab52 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoconf , automake , libtool @@ -33,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-Lrsyh4qd3OkTw1cSPfahzfSGNt6+pRN1X21iiv1SsFo="; }; + patches = [ + # Disable io_uring close on selected kernels. Remove on next release + # https://github.com/libuv/libuv/pull/4141 + (fetchpatch { + url = "https://github.com/libuv/libuv/commit/c811169f91b2101f7302e96de3d2dc366ade3a25.patch"; + hash = "sha256-7vk6XGXwJcwYUQPqIJ3JPd/fPIGrjE5WRDSJCMQfKeU="; + }) + ]; + outputs = [ "out" "dev" ]; postPatch = let @@ -93,7 +103,9 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/NixOS/nixpkgs/issues/219466 separateDebugInfo = !stdenv.hostPlatform.isStatic; - doCheck = true; + doCheck = + # routinely hangs on powerpc64le + !stdenv.hostPlatform.isPower64; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -113,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ marsam ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 7796ec25158..43fe69af2b0 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-M6mAHvGl4d9EqdkDBSxSbpZUCUcrkpnf+hfo16L3eHs="; + sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index f0e4eab164d..eb2a6598cf6 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-/juTlK7iRu8XN4kbB1VhmOcKjFD8iBwuIIAJsmF5ihU="; + sha256 = "sha256-oW4vIGgSs5lzmuloCFJPXTmsfH9Djz2KTlsjrOkaT5I="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/libvarlink/default.nix b/pkgs/development/libraries/libvarlink/default.nix index 9e4b96a9d79..941ee900edb 100644 --- a/pkgs/development/libraries/libvarlink/default.nix +++ b/pkgs/development/libraries/libvarlink/default.nix @@ -19,18 +19,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-oUy9HhybNMjRBWoqqal1Mw8cC5RddgN4izxAl0cgnKE="; }; - nativeBuildInputs = [ meson ninja ]; + nativeBuildInputs = [ meson ninja python3 ]; postPatch = '' - substituteInPlace varlink-wrapper.py \ - --replace "/usr/bin/env python3" "${python3}/bin/python3" - # test-object: ../lib/test-object.c:129: main: Assertion `setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0' failed. # PR that added it https://github.com/varlink/libvarlink/pull/27 substituteInPlace lib/test-object.c \ --replace 'assert(setlocale(LC_NUMERIC, "de_DE.UTF-8") != 0);' "" - patchShebangs lib/test-symbols.sh + patchShebangs lib/test-symbols.sh varlink-wrapper.py ''; doCheck = true; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index f1a9fbe9b2c..bb855ac767e 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -11,7 +11,7 @@ , libvirt , libxml2 , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection , withDocs ? stdenv.hostPlatform == stdenv.buildPlatform , gtk-doc diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 658a24b8d81..4c3740e4ba7 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> - version = "9.7.0"; + version = "9.9.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-7huo2UsbNG/HG2dpdVT5qcJuFmYZE6Jdave8Gb1kHME="; + sha256 = "sha256-8Tmn99wDkRoA+pnOjeCzHoCeR3P3MwCA1kqY6SZpkqw="; fetchSubmodules = true; }; @@ -155,16 +155,12 @@ stdenv.mkDerivation rec { src/storage/storage_backend_disk.c \ src/storage/storage_util.c '' + lib.optionalString isDarwin '' - sed -i '/qemucapabilitiestest/d' tests/meson.build - sed -i '/vircryptotest/d' tests/meson.build - sed -i '/domaincapstest/d' tests/meson.build + # Darwin doesn’t support -fsemantic-interposition, but the problem doesn’t seem to affect Mach-O. + # See https://gitlab.com/libvirt/libvirt/-/merge_requests/235 + sed -i "s/not supported_cc_flags.contains('-fsemantic-interposition')/false/" meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build - '' + lib.optionalString (isDarwin && isx86_64) '' - sed -i '/qemucaps2xmltest/d' tests/meson.build - sed -i '/qemuhotplugtest/d' tests/meson.build - sed -i '/virnetdaemontest/d' tests/meson.build ''; strictDeps = true; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 2a77677680d..eb5b320b317 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -75,13 +75,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IH+ZWbBUlU5fbciYe+dNGnTFFCte2BXxAlLcvmzdAeY="; + hash = "sha256-KTbzZ5/qCH+bCvatYZhFiWcT+L2duD40E2w/BUaRorQ="; }; postPatch = '' diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 27ce41d20f6..0e92d28046a 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libvterm-neovim"; # Releases are not tagged, look at commit history to find latest release - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"; - sha256 = "sha256-ketQiAafTm7atp4UxCEvbaAZLmVpWVbcBIAWoNq4vPY="; + url = "https://launchpad.net/libvterm/trunk/v${lib.versions.majorMinor version}/+download/libvterm-${version}.tar.gz"; + hash = "sha256-CRVvQ90hKL00fL7r5Q2aVx0yxk4M8Y0hEZeUav9yJuA="; }; nativeBuildInputs = [ perl libtool ]; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index c03dd99a125..254769349b1 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.7.0"; + version = "2.8.0"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-NNfhZMshM5U/EfJHuNgkDe5NEkEGKtJ56vSpXyGf/xw="; + hash = "sha256-VjFZBlOIG1L4dXPJ8DWxrbfVqdQC+X7zVXFryo43FFc="; }; postPatch = '' diff --git a/pkgs/development/libraries/libwebp/CVE-2023-4863.patch b/pkgs/development/libraries/libwebp/CVE-2023-4863.patch deleted file mode 100644 index c01b8a48667..00000000000 --- a/pkgs/development/libraries/libwebp/CVE-2023-4863.patch +++ /dev/null @@ -1,361 +0,0 @@ -From 4de93ac70c3292fc944e4587101a52a29f8b0c9c Mon Sep 17 00:00:00 2001 -From: Vincent Rabaud <vrabaud@google.com> -Date: Thu, 7 Sep 2023 21:16:03 +0200 -Subject: [PATCH] Fix OOB write in BuildHuffmanTable. - -First, BuildHuffmanTable is called to check if the data is valid. -If it is and the table is not big enough, more memory is allocated. - -This will make sure that valid (but unoptimized because of unbalanced -codes) streams are still decodable. - -Bug: chromium:1479274 -Change-Id: I31c36dbf3aa78d35ecf38706b50464fd3d375741 -(cherry picked from commit 902bc9190331343b2017211debcec8d2ab87e17a) ---- - src/dec/vp8l_dec.c | 46 ++++++++++--------- - src/dec/vp8li_dec.h | 2 +- - src/utils/huffman_utils.c | 97 +++++++++++++++++++++++++++++++-------- - src/utils/huffman_utils.h | 27 +++++++++-- - 4 files changed, 129 insertions(+), 43 deletions(-) - -diff --git a/src/dec/vp8l_dec.c b/src/dec/vp8l_dec.c -index c0ea0181..7995313f 100644 ---- a/src/dec/vp8l_dec.c -+++ b/src/dec/vp8l_dec.c -@@ -253,11 +253,11 @@ static int ReadHuffmanCodeLengths( - int symbol; - int max_symbol; - int prev_code_len = DEFAULT_CODE_LENGTH; -- HuffmanCode table[1 << LENGTHS_TABLE_BITS]; -+ HuffmanTables tables; - -- if (!VP8LBuildHuffmanTable(table, LENGTHS_TABLE_BITS, -- code_length_code_lengths, -- NUM_CODE_LENGTH_CODES)) { -+ if (!VP8LHuffmanTablesAllocate(1 << LENGTHS_TABLE_BITS, &tables) || -+ !VP8LBuildHuffmanTable(&tables, LENGTHS_TABLE_BITS, -+ code_length_code_lengths, NUM_CODE_LENGTH_CODES)) { - goto End; - } - -@@ -277,7 +277,7 @@ static int ReadHuffmanCodeLengths( - int code_len; - if (max_symbol-- == 0) break; - VP8LFillBitWindow(br); -- p = &table[VP8LPrefetchBits(br) & LENGTHS_TABLE_MASK]; -+ p = &tables.curr_segment->start[VP8LPrefetchBits(br) & LENGTHS_TABLE_MASK]; - VP8LSetBitPos(br, br->bit_pos_ + p->bits); - code_len = p->value; - if (code_len < kCodeLengthLiterals) { -@@ -300,6 +300,7 @@ static int ReadHuffmanCodeLengths( - ok = 1; - - End: -+ VP8LHuffmanTablesDeallocate(&tables); - if (!ok) dec->status_ = VP8_STATUS_BITSTREAM_ERROR; - return ok; - } -@@ -307,7 +308,8 @@ static int ReadHuffmanCodeLengths( - // 'code_lengths' is pre-allocated temporary buffer, used for creating Huffman - // tree. - static int ReadHuffmanCode(int alphabet_size, VP8LDecoder* const dec, -- int* const code_lengths, HuffmanCode* const table) { -+ int* const code_lengths, -+ HuffmanTables* const table) { - int ok = 0; - int size = 0; - VP8LBitReader* const br = &dec->br_; -@@ -362,8 +364,7 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - VP8LMetadata* const hdr = &dec->hdr_; - uint32_t* huffman_image = NULL; - HTreeGroup* htree_groups = NULL; -- HuffmanCode* huffman_tables = NULL; -- HuffmanCode* huffman_table = NULL; -+ HuffmanTables* huffman_tables = &hdr->huffman_tables_; - int num_htree_groups = 1; - int num_htree_groups_max = 1; - int max_alphabet_size = 0; -@@ -372,6 +373,10 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - int* mapping = NULL; - int ok = 0; - -+ // Check the table has been 0 initialized (through InitMetadata). -+ assert(huffman_tables->root.start == NULL); -+ assert(huffman_tables->curr_segment == NULL); -+ - if (allow_recursion && VP8LReadBits(br, 1)) { - // use meta Huffman codes. - const int huffman_precision = VP8LReadBits(br, 3) + 2; -@@ -434,16 +439,15 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - - code_lengths = (int*)WebPSafeCalloc((uint64_t)max_alphabet_size, - sizeof(*code_lengths)); -- huffman_tables = (HuffmanCode*)WebPSafeMalloc(num_htree_groups * table_size, -- sizeof(*huffman_tables)); - htree_groups = VP8LHtreeGroupsNew(num_htree_groups); - -- if (htree_groups == NULL || code_lengths == NULL || huffman_tables == NULL) { -+ if (htree_groups == NULL || code_lengths == NULL || -+ !VP8LHuffmanTablesAllocate(num_htree_groups * table_size, -+ huffman_tables)) { - dec->status_ = VP8_STATUS_OUT_OF_MEMORY; - goto Error; - } - -- huffman_table = huffman_tables; - for (i = 0; i < num_htree_groups_max; ++i) { - // If the index "i" is unused in the Huffman image, just make sure the - // coefficients are valid but do not store them. -@@ -468,19 +472,20 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - int max_bits = 0; - for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; ++j) { - int alphabet_size = kAlphabetSize[j]; -- htrees[j] = huffman_table; - if (j == 0 && color_cache_bits > 0) { - alphabet_size += (1 << color_cache_bits); - } -- size = ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_table); -+ size = -+ ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_tables); -+ htrees[j] = huffman_tables->curr_segment->curr_table; - if (size == 0) { - goto Error; - } - if (is_trivial_literal && kLiteralMap[j] == 1) { -- is_trivial_literal = (huffman_table->bits == 0); -+ is_trivial_literal = (htrees[j]->bits == 0); - } -- total_size += huffman_table->bits; -- huffman_table += size; -+ total_size += htrees[j]->bits; -+ huffman_tables->curr_segment->curr_table += size; - if (j <= ALPHA) { - int local_max_bits = code_lengths[0]; - int k; -@@ -515,14 +520,13 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - hdr->huffman_image_ = huffman_image; - hdr->num_htree_groups_ = num_htree_groups; - hdr->htree_groups_ = htree_groups; -- hdr->huffman_tables_ = huffman_tables; - - Error: - WebPSafeFree(code_lengths); - WebPSafeFree(mapping); - if (!ok) { - WebPSafeFree(huffman_image); -- WebPSafeFree(huffman_tables); -+ VP8LHuffmanTablesDeallocate(huffman_tables); - VP8LHtreeGroupsFree(htree_groups); - } - return ok; -@@ -1358,7 +1362,7 @@ static void ClearMetadata(VP8LMetadata* const hdr) { - assert(hdr != NULL); - - WebPSafeFree(hdr->huffman_image_); -- WebPSafeFree(hdr->huffman_tables_); -+ VP8LHuffmanTablesDeallocate(&hdr->huffman_tables_); - VP8LHtreeGroupsFree(hdr->htree_groups_); - VP8LColorCacheClear(&hdr->color_cache_); - VP8LColorCacheClear(&hdr->saved_color_cache_); -@@ -1673,7 +1677,7 @@ int VP8LDecodeImage(VP8LDecoder* const dec) { - - if (dec == NULL) return 0; - -- assert(dec->hdr_.huffman_tables_ != NULL); -+ assert(dec->hdr_.huffman_tables_.root.start != NULL); - assert(dec->hdr_.htree_groups_ != NULL); - assert(dec->hdr_.num_htree_groups_ > 0); - -diff --git a/src/dec/vp8li_dec.h b/src/dec/vp8li_dec.h -index 72b2e861..32540a4b 100644 ---- a/src/dec/vp8li_dec.h -+++ b/src/dec/vp8li_dec.h -@@ -51,7 +51,7 @@ typedef struct { - uint32_t* huffman_image_; - int num_htree_groups_; - HTreeGroup* htree_groups_; -- HuffmanCode* huffman_tables_; -+ HuffmanTables huffman_tables_; - } VP8LMetadata; - - typedef struct VP8LDecoder VP8LDecoder; -diff --git a/src/utils/huffman_utils.c b/src/utils/huffman_utils.c -index 90c2fbf7..cf73abd4 100644 ---- a/src/utils/huffman_utils.c -+++ b/src/utils/huffman_utils.c -@@ -177,21 +177,24 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits, - if (num_open < 0) { - return 0; - } -- if (root_table == NULL) continue; - for (; count[len] > 0; --count[len]) { - HuffmanCode code; - if ((key & mask) != low) { -- table += table_size; -+ if (root_table != NULL) table += table_size; - table_bits = NextTableBitSize(count, len, root_bits); - table_size = 1 << table_bits; - total_size += table_size; - low = key & mask; -- root_table[low].bits = (uint8_t)(table_bits + root_bits); -- root_table[low].value = (uint16_t)((table - root_table) - low); -+ if (root_table != NULL) { -+ root_table[low].bits = (uint8_t)(table_bits + root_bits); -+ root_table[low].value = (uint16_t)((table - root_table) - low); -+ } -+ } -+ if (root_table != NULL) { -+ code.bits = (uint8_t)(len - root_bits); -+ code.value = (uint16_t)sorted[symbol++]; -+ ReplicateValue(&table[key >> root_bits], step, table_size, code); - } -- code.bits = (uint8_t)(len - root_bits); -- code.value = (uint16_t)sorted[symbol++]; -- ReplicateValue(&table[key >> root_bits], step, table_size, code); - key = GetNextKey(key, len); - } - } -@@ -211,25 +214,83 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits, - ((1 << MAX_CACHE_BITS) + NUM_LITERAL_CODES + NUM_LENGTH_CODES) - // Cut-off value for switching between heap and stack allocation. - #define SORTED_SIZE_CUTOFF 512 --int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits, -+int VP8LBuildHuffmanTable(HuffmanTables* const root_table, int root_bits, - const int code_lengths[], int code_lengths_size) { -- int total_size; -+ const int total_size = -+ BuildHuffmanTable(NULL, root_bits, code_lengths, code_lengths_size, NULL); - assert(code_lengths_size <= MAX_CODE_LENGTHS_SIZE); -- if (root_table == NULL) { -- total_size = BuildHuffmanTable(NULL, root_bits, -- code_lengths, code_lengths_size, NULL); -- } else if (code_lengths_size <= SORTED_SIZE_CUTOFF) { -+ if (total_size == 0 || root_table == NULL) return total_size; -+ -+ if (root_table->curr_segment->curr_table + total_size >= -+ root_table->curr_segment->start + root_table->curr_segment->size) { -+ // If 'root_table' does not have enough memory, allocate a new segment. -+ // The available part of root_table->curr_segment is left unused because we -+ // need a contiguous buffer. -+ const int segment_size = root_table->curr_segment->size; -+ struct HuffmanTablesSegment* next = -+ (HuffmanTablesSegment*)WebPSafeMalloc(1, sizeof(*next)); -+ if (next == NULL) return 0; -+ // Fill the new segment. -+ // We need at least 'total_size' but if that value is small, it is better to -+ // allocate a big chunk to prevent more allocations later. 'segment_size' is -+ // therefore chosen (any other arbitrary value could be chosen). -+ next->size = total_size > segment_size ? total_size : segment_size; -+ next->start = -+ (HuffmanCode*)WebPSafeMalloc(next->size, sizeof(*next->start)); -+ if (next->start == NULL) { -+ WebPSafeFree(next); -+ return 0; -+ } -+ next->curr_table = next->start; -+ next->next = NULL; -+ // Point to the new segment. -+ root_table->curr_segment->next = next; -+ root_table->curr_segment = next; -+ } -+ if (code_lengths_size <= SORTED_SIZE_CUTOFF) { - // use local stack-allocated array. - uint16_t sorted[SORTED_SIZE_CUTOFF]; -- total_size = BuildHuffmanTable(root_table, root_bits, -- code_lengths, code_lengths_size, sorted); -- } else { // rare case. Use heap allocation. -+ BuildHuffmanTable(root_table->curr_segment->curr_table, root_bits, -+ code_lengths, code_lengths_size, sorted); -+ } else { // rare case. Use heap allocation. - uint16_t* const sorted = - (uint16_t*)WebPSafeMalloc(code_lengths_size, sizeof(*sorted)); - if (sorted == NULL) return 0; -- total_size = BuildHuffmanTable(root_table, root_bits, -- code_lengths, code_lengths_size, sorted); -+ BuildHuffmanTable(root_table->curr_segment->curr_table, root_bits, -+ code_lengths, code_lengths_size, sorted); - WebPSafeFree(sorted); - } - return total_size; - } -+ -+int VP8LHuffmanTablesAllocate(int size, HuffmanTables* huffman_tables) { -+ // Have 'segment' point to the first segment for now, 'root'. -+ HuffmanTablesSegment* const root = &huffman_tables->root; -+ huffman_tables->curr_segment = root; -+ // Allocate root. -+ root->start = (HuffmanCode*)WebPSafeMalloc(size, sizeof(*root->start)); -+ if (root->start == NULL) return 0; -+ root->curr_table = root->start; -+ root->next = NULL; -+ root->size = size; -+ return 1; -+} -+ -+void VP8LHuffmanTablesDeallocate(HuffmanTables* const huffman_tables) { -+ HuffmanTablesSegment *current, *next; -+ if (huffman_tables == NULL) return; -+ // Free the root node. -+ current = &huffman_tables->root; -+ next = current->next; -+ WebPSafeFree(current->start); -+ current->start = NULL; -+ current->next = NULL; -+ current = next; -+ // Free the following nodes. -+ while (current != NULL) { -+ next = current->next; -+ WebPSafeFree(current->start); -+ WebPSafeFree(current); -+ current = next; -+ } -+} -diff --git a/src/utils/huffman_utils.h b/src/utils/huffman_utils.h -index 13b7ad1a..98415c53 100644 ---- a/src/utils/huffman_utils.h -+++ b/src/utils/huffman_utils.h -@@ -43,6 +43,29 @@ typedef struct { - // or non-literal symbol otherwise - } HuffmanCode32; - -+// Contiguous memory segment of HuffmanCodes. -+typedef struct HuffmanTablesSegment { -+ HuffmanCode* start; -+ // Pointer to where we are writing into the segment. Starts at 'start' and -+ // cannot go beyond 'start' + 'size'. -+ HuffmanCode* curr_table; -+ // Pointer to the next segment in the chain. -+ struct HuffmanTablesSegment* next; -+ int size; -+} HuffmanTablesSegment; -+ -+// Chained memory segments of HuffmanCodes. -+typedef struct HuffmanTables { -+ HuffmanTablesSegment root; -+ // Currently processed segment. At first, this is 'root'. -+ HuffmanTablesSegment* curr_segment; -+} HuffmanTables; -+ -+// Allocates a HuffmanTables with 'size' contiguous HuffmanCodes. Returns 0 on -+// memory allocation error, 1 otherwise. -+int VP8LHuffmanTablesAllocate(int size, HuffmanTables* huffman_tables); -+void VP8LHuffmanTablesDeallocate(HuffmanTables* const huffman_tables); -+ - #define HUFFMAN_PACKED_BITS 6 - #define HUFFMAN_PACKED_TABLE_SIZE (1u << HUFFMAN_PACKED_BITS) - -@@ -78,9 +101,7 @@ void VP8LHtreeGroupsFree(HTreeGroup* const htree_groups); - // the huffman table. - // Returns built table size or 0 in case of error (invalid tree or - // memory error). --// If root_table is NULL, it returns 0 if a lookup cannot be built, something --// > 0 otherwise (but not the table size). --int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits, -+int VP8LBuildHuffmanTable(HuffmanTables* const root_table, int root_bits, - const int code_lengths[], int code_lengths_size); - - #ifdef __cplusplus --- -2.41.0 - diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 287c0b6b18b..2605dabf125 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,23 +27,15 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-Q94avvKjPdwdGt5ADo30cf2V4T7MCTubDHJxTtbG4xQ="; + hash = "sha256-UYO2Fmm8nzQR8VBC26wEwWd3qZTD+6MHKcmKBoNcpEE="; }; - patches = [ - # Commit 902bc919 from upstream, mangled slightly to apply onto 1.3.1. - # There is currently (2023-09-12) no confirmation that this is the fix for - # CVE-2023-4863, but it is linked to the right crbug, and matches the - # description of that (critical sev, exploited in the wild) CVE. - ./CVE-2023-4863.patch - ]; - configureFlags = [ (lib.enableFeature threadingSupport "threading") (lib.enableFeature openglSupport "gl") diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index ff47a3881e0..b3f20d02c53 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { --replace "PROPERTIES TIMEOUT 1" "PROPERTIES TIMEOUT 30" ''; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ perl cmake gfortran ]; preConfigure = '' diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix deleted file mode 100644 index 6b375978a4b..00000000000 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, flex, xkeyboard_config, libxcb, libX11 }: - -stdenv.mkDerivation rec { - pname = "libxkbcommon"; - version = "0.7.2"; - - src = fetchurl { - url = "http://xkbcommon.org/download/libxkbcommon-${version}.tar.xz"; - sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ bison flex xkeyboard_config libxcb ]; - - configureFlags = [ - "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb" - "--with-x-locale-root=${libX11.out}/share/X11/locale" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - - preBuild = lib.optionalString stdenv.isDarwin '' - sed -i 's/,--version-script=.*$//' Makefile - ''; - - meta = with lib; { - description = "A library to handle keyboard descriptions"; - homepage = "https://xkbcommon.org"; - license = licenses.mit; - maintainers = with maintainers; [ ttuegel ]; - mainProgram = "xkbcli"; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 8ba48e15f22..4c9b77d7c38 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -30,5 +30,13 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar ]; mainProgram = "xls2csv"; platforms = platforms.unix; + knownVulnerabilities = [ + "CVE-2023-38851" + "CVE-2023-38852" + "CVE-2023-38853" + "CVE-2023-38854" + "CVE-2023-38855" + "CVE-2023-38856" + ]; }; } diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index bc9e2c8c2c1..3f8e27789b8 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -83,7 +83,7 @@ libxml = stdenv.mkDerivation rec { (lib.enableFeature enableShared "shared") (lib.withFeature icuSupport "icu") (lib.withFeature pythonSupport "python") - (lib.optionalString pythonSupport "PYTHON=${python.pythonForBuild.interpreter}") + (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") ]; installFlags = lib.optionals pythonSupport [ diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 3a5c8955745..356f87ff264 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "--without-mem-debug" "--without-debugger" (lib.withFeature pythonSupport "python") - (lib.optionalString pythonSupport "PYTHON=${python.pythonForBuild.interpreter}") + (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}") ] ++ lib.optionals (!cryptoSupport) [ "--without-crypto" ]; diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 893fb4697ac..6530ee7f67a 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-PpMiD/PeQ0pe5hqFG6VFHWpR8y3wnO2z1dJfHHeItlQ="; }; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ gfortran python3 @@ -34,6 +35,13 @@ stdenv.mkDerivation rec { "STATIC=${static}" ]; + postInstall = '' + mkdir -p $dev/lib/pkgconfig + mv $out/lib/*.pc $dev/lib/pkgconfig + + moveToOutput "share/libxsmm" "$doc" + ''; + prePatch = '' patchShebangs . ''; diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index 9102286746b..d220bcee1e6 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.111"; + version = "2.1.128"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-CJAIlEPbrjc2juYiPOQuQ0y7ggOxb/fHb7Yoo6/dYQc="; + sha256 = "sha256-qwEHGUizjsWQZSwQkh7Clevd1OQfj1mse7Q8YiRCMyQ="; }; nativeBuildInputs = [ @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_BUILD_TYPE:String=Release" ]; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 44f82f15852..4b691ba3d88 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -33,14 +33,16 @@ stdenv.mkDerivation rec { python ]; + env.CXXFLAGS = toString (lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); + postBuild = '' - pushd /build/source/api/python + pushd ../api/python ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES popd ''; postInstall = '' - pushd /build/source/api/python + pushd ../api/python ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py popd ''; diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index 25cb21a314c..55d04fb4f37 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -1,6 +1,8 @@ { config, stdenv, lib, fetchFromGitHub, cmake, gtest, doCheck ? true -, cudaSupport ? config.cudaSupport, openclSupport ? false, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false -, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages }: +, cudaSupport ? config.cudaSupport or false, openclSupport ? false +, mpiSupport ? false, javaWrapper ? false, hdfsSupport ? false, pythonLibrary ? false +, rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost +, llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages, pandoc }: assert doCheck -> mpiSupport != true; assert openclSupport -> cudaSupport != true; @@ -21,14 +23,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ lgbm ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "3.3.5"; + version = "4.1.0"; src = fetchFromGitHub { owner = "microsoft"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-QRuBbMVtD5J5ECw+bAp57bWaRc/fATMcTq+AKikhj1I="; + hash = "sha256-AhXe/Mlor/i0y84wI9jVPKSnyVbSyAV52Y4yiNm7yLQ="; }; nativeBuildInputs = [ cmake ] @@ -38,13 +40,14 @@ stdenv.mkDerivation rec { ++ lib.optionals hdfsSupport [ hadoop ] ++ lib.optionals (hdfsSupport || javaWrapper) [ openjdk ] ++ lib.optionals javaWrapper [ swig ] - ++ lib.optionals rLibrary [ R ]; + ++ lib.optionals rLibrary [ R pandoc ]; buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit; propagatedBuildInputs = lib.optionals rLibrary [ rPackages.data_table + rPackages.rmarkdown rPackages.jsonlite rPackages.Matrix rPackages.R6 @@ -62,6 +65,7 @@ stdenv.mkDerivation rec { external_libs/compute/include/boost/compute/cl_ext.hpp \ --replace "include <OpenCL/" "include <CL/" substituteInPlace build_r.R \ + --replace "shQuote(normalizePath" "shQuote(type = 'cmd', string = normalizePath" \ --replace "file.path(getwd(), \"lightgbm_r\")" "'$out/tmp'" \ --replace \ "install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", tarball)" \ @@ -74,10 +78,14 @@ stdenv.mkDerivation rec { ++ lib.optionals mpiSupport [ "-DUSE_MPI=ON" ] ++ lib.optionals hdfsSupport [ "-DUSE_HDFS=ON" - "-DHDFS_LIB=${hadoop}/lib/hadoop-3.3.1/lib/native/libhdfs.so" - "-DHDFS_INCLUDE_DIR=${hadoop}/lib/hadoop-3.3.1/include" ] - ++ lib.optionals javaWrapper [ "-DUSE_SWIG=ON" ] - ++ lib.optionals rLibrary [ "-D__BUILD_FOR_R=ON" ]; + "-DHDFS_LIB=${hadoop}/lib/hadoop-${hadoop.version}/lib/native/libhdfs.so" + "-DHDFS_INCLUDE_DIR=${hadoop}/lib/hadoop-${hadoop.version}/include" ] + ++ lib.optionals javaWrapper [ + "-DUSE_SWIG=ON" + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ] + ++ lib.optionals rLibrary [ "-D__BUILD_FOR_R=ON" ] + ++ lib.optionals pythonLibrary [ "-D__BUILD_FOR_PYTHON=ON" ]; configurePhase = lib.optionals rLibrary '' export R_LIBS_SITE="$out/library:$R_LIBS_SITE''${R_LIBS_SITE:+:}" @@ -98,28 +106,28 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r ../include $out install -Dm755 ../lib_lightgbm.so $out/lib/lib_lightgbm.so + '' + lib.optionalString (!rLibrary && !pythonLibrary) '' install -Dm755 ../lightgbm $out/bin/lightgbm '' + lib.optionalString javaWrapper '' cp -r java $out cp -r com $out cp -r lightgbmlib.jar $out '' + '' - '' + lib.optionalString javaWrapper '' - cp -r java $out - cp -r com $out - cp -r lightgbmlib.jar $out '' + lib.optionalString rLibrary '' mkdir $out mkdir $out/tmp mkdir $out/library mkdir $out/library/lightgbm '' + lib.optionalString (rLibrary && (!openclSupport)) '' - Rscript build_r.R + Rscript build_r.R \ + -j$NIX_BUILD_CORES rm -rf $out/tmp '' + lib.optionalString (rLibrary && openclSupport) '' Rscript build_r.R --use-gpu \ --opencl-library=${ocl-icd}/lib/libOpenCL.so \ - --boost-librarydir=${boost} + --opencl-include-dir=${opencl-headers}/include \ + --boost-librarydir=${boost} \ + -j$NIX_BUILD_CORES rm -rf $out/tmp '' + '' runHook postInstall diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix deleted file mode 100644 index 8ef4513a18d..00000000000 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, cmake -, opentracing-cpp, protobuf -, enableGrpc ? false, grpc, openssl -}: - -stdenv.mkDerivation rec { - pname = "lightstep-tracer-cpp"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "lightstep"; - repo = pname; - rev = "v${version}"; - sha256 = "1xr11dm94qpbx3nxb7si7zy7hzg2akj01pyxkd8pzzbvmkmic16j"; - }; - - nativeBuildInputs = [ - cmake pkg-config - ]; - - buildInputs = [ - opentracing-cpp protobuf - ] ++ lib.optionals enableGrpc [ - grpc openssl - ]; - - cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ]; - - meta = with lib; { - description = "Distributed tracing system built on top of the OpenTracing standard"; - homepage = "https://lightstep.com/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; - }; -} diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index d19d6748147..27675682274 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/arangodb/linenoise-ng"; description = "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; - maintainers = with lib.maintainers; [ cstrahan ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 1e1ec46739e..b98f5066dae 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -18,7 +18,7 @@ }: let - pythonEnv = python3.pythonForBuild.withPackages (p: with p; [ pyyaml setuptools ]); + pythonEnv = python3.pythonOnBuildForHost.withPackages (p: with p; [ pyyaml setuptools ]); in stdenv.mkDerivation rec { pname = "lirc"; diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/development/libraries/llhttp/default.nix index 39b1e0bf260..fbf7198f1d5 100644 --- a/pkgs/development/libraries/llhttp/default.nix +++ b/pkgs/development/libraries/llhttp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "llhttp"; - version = "9.1.2"; + version = "9.1.3"; src = fetchFromGitHub { owner = "nodejs"; repo = "llhttp"; rev = "release/v${finalAttrs.version}"; - hash = "sha256-kW6u9ETZJcJBh150chfE3SEwFpT7evZ0cqz8caM7fbQ="; + hash = "sha256-QacjukWkRCuQA4qzUq45521YOBLPuOSKNR1pVxgxe9o="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 21f07337fab..99296b63a72 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { patches = [ ./hardcoded-compiler.patch ./bin-ext.patch ]; patchFlags = [ "-p3" ]; + # Don't attempt the .so if static, as it would fail. + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + sed 's/^ILIBS\>.*/ILIBS = liblmdb.a/' -i Makefile + ''; + outputs = [ "bin" "out" "dev" ]; buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/development/libraries/lzlib/default.nix index 4e28fc3a5b0..b8c86221b48 100644 --- a/pkgs/development/libraries/lzlib/default.nix +++ b/pkgs/development/libraries/lzlib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '-Wl,--soname=' '-Wl,-install_name,$(out)/lib/' ''; - makeFlags = [ "CC:=$(CC)" ]; + makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; doCheck = true; configureFlags = [ "--enable-shared" ]; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 65e35217f80..77e7669c0e1 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { description = "A simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; homepage = "http://libmailcore.com"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 3711e2d2b4f..18793114c21 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.4"; - hash = "sha256-88Lnj9NgS5PWg2hydvb9cwi6s6BG3UMvkUH2Ny1jmtE="; + version = "2.28.5"; + hash = "sha256-Gl4UQMSvAwYbOi2b/AUMz+zgkOl1o0UA2VveF/3ek8o="; } diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index 01df03bbbad..ca069cca1ea 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "3.4.1"; - hash = "sha256-NIjyRcVbg6lT6+RlTz5Jt6V9T85mvta5grOSLIAK9Ts="; + version = "3.5.0"; + hash = "sha256-uHHQmaAmFS8Vd7PrAfRpK+aNi3pJ76XBC7rFWcd16NU="; } diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 23059b91e7c..ea60c32a08c 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mdds"; - version = "2.0.3"; + version = "2.1.1"; src = fetchFromGitLab { owner = "mdds"; repo = "mdds"; rev = finalAttrs.version; - hash = "sha256-Y9uBJKM34UTEj/3c1w69QHhvwFcMNlAohEco0O0B+xI="; + hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 34082407c21..49357dc02bb 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.2.98"; + version = "5.2.109"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-02e1nGSwlhEHwQH6WqBSKBlWQWAYa7lKdZaZ8/0SAxs="; + hash = "sha256-uiuT53mM/dUw5tOYKsBEqEbvYRFKEyyTDKCLYaQvMAs="; }; patches = [ diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index b583eb93153..dac12db94b6 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices +{ lib, stdenv, fetchurl +, meson, ninja +, pkg-config, libGL, ApplicationServices , testers +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "glu"; - version = "9.0.2"; + version = "9.0.3"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bnKA/1hcah2d/N8vykiSUWNLM3e/wzwp5AAkZqONAtQ="; + hash = "sha256-vUP+EvN0sRkusV/iDkX/RWubwmq1fw7ukZ+Wyg+KMw8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; propagatedBuildInputs = [ libGL ] ++ lib.optional stdenv.isDarwin ApplicationServices; @@ -21,7 +24,16 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru = { + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://gitlab.freedesktop.org/mesa/glu"; + rev-prefix = "glu-"; + }; + }; meta = { description = "OpenGL utility library"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index b7bec7e8930..173cc2016e5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl, fetchpatch, buildPackages , meson, pkg-config, ninja , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages_15, libffi, libomxil-bellagio, libva-minimal +, llvmPackages_16, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau , libglvnd, libunwind, lm_sensors , vulkan-loader, glslang @@ -64,10 +64,8 @@ , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , enablePatentEncumberedCodecs ? true -, libclc , jdupes , rustc -, rust-bindgen , spirv-llvm-translator , zstd , directx-headers @@ -86,8 +84,8 @@ */ let - version = "23.1.7"; - hash = "sha256-QJZB6t8O0cd5R5em9aCwGVtVgLKCFm5exWKca82mrNM="; + version = "23.1.9"; + hash = "sha256-KVuifCgUbtCSFOjOea+hZZ7fnRQt7MPJH4BFUtZPdRA="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -95,13 +93,13 @@ let withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; - llvmPackages = llvmPackages_15; + 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' = rust-bindgen.override { - rust-bindgen-unwrapped = rust-bindgen.unwrapped.override { - clang = llvmPackages.clang; + 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 { @@ -202,7 +200,8 @@ self = stdenv.mkDerivation { "-Dglvnd=true" # Enable RT for Intel hardware - "-Dintel-clc=enabled" + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/9080 + (lib.mesonEnable "intel-clc" (stdenv.buildPlatform == stdenv.hostPlatform)) ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend "-Dgallium-opencl=icd" @@ -218,26 +217,29 @@ self = stdenv.mkDerivation { ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; buildInputs = with xorg; [ - expat llvmPackages.libllvm libglvnd xorgproto + expat glslang llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ zstd libunwind + python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] - ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' 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; - depsBuildBuild = [ pkg-config ]; + depsBuildBuild = [ pkg-config ] + ++ lib.optional enableOpenCL buildPackages.stdenv.cc; nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file python3Packages.python python3Packages.mako python3Packages.ply jdupes glslang - ] ++ lib.optional haveWayland wayland-scanner; + ] ++ lib.optionals enableOpenCL [ rust-bindgen' rustc ] + ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm @@ -320,6 +322,9 @@ self = stdenv.mkDerivation { fi done + # Don't depend on build python + patchShebangs --host --update $out/bin/* + # NAR doesn't support hard links, so convert them to symlinks to save space. jdupes --hard-links --link-soft --recurse "$drivers" diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/development/libraries/microsoft-gsl/default.nix index f0bd76ab4fb..298aec48db7 100644 --- a/pkgs/development/libraries/microsoft-gsl/default.nix +++ b/pkgs/development/libraries/microsoft-gsl/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gtest ]; + # error: unsafe buffer access + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage"; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/migraphx/default.nix b/pkgs/development/libraries/migraphx/default.nix deleted file mode 100644 index 3b32b86f41a..00000000000 --- a/pkgs/development/libraries/migraphx/default.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, pkg-config -, cmake -, rocm-cmake -, hip -, clang-tools-extra -, openmp -, rocblas -, rocmlir -, miopengemm -, miopen -, protobuf -, half -, nlohmann_json -, msgpack -, sqlite -, oneDNN_2 -, blaze -, texlive -, doxygen -, sphinx -, docutils -, ghostscript -, python3Packages -, buildDocs ? false -, buildTests ? false -}: - -let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small - latexmk - tex-gyre - fncychap - wrapfig - capt-of - framed - needspace - tabulary - varwidth - titlesec - epstopdf; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "migraphx"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ] ++ lib.optionals buildTests [ - "test" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "AMDMIGraphX"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UDhm+j9qs4Rk81C1PE4kkacytfY2StYbfsCOtFL+p6s="; - }; - - nativeBuildInputs = [ - pkg-config - cmake - rocm-cmake - hip - clang-tools-extra - python3Packages.python - ] ++ lib.optionals buildDocs [ - latex - doxygen - sphinx - docutils - ghostscript - python3Packages.sphinx-rtd-theme - python3Packages.breathe - ]; - - buildInputs = [ - openmp - rocblas - rocmlir - miopengemm - miopen - protobuf - half - nlohmann_json - msgpack - sqlite - oneDNN_2 - blaze - python3Packages.pybind11 - python3Packages.onnx - ]; - - cmakeFlags = [ - "-DCMAKE_POLICY_DEFAULT_CMP0079=NEW" - # "-DCMAKE_C_COMPILER=hipcc" - # "-DCMAKE_CXX_COMPILER=hipcc" - "-DMIGRAPHX_ENABLE_GPU=OFF" # GPU compilation is broken, don't know why - "-DMIGRAPHX_ENABLE_CPU=ON" - "-DMIGRAPHX_ENABLE_FPGA=ON" - "-DMIGRAPHX_ENABLE_MLIR=ON" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - postPatch = '' - patchShebangs tools - - substituteInPlace src/targets/gpu/CMakeLists.txt \ - --replace "CMAKE_CXX_COMPILER MATCHES \".*clang\\\+\\\+\$\"" "TRUE" - '' + lib.optionalString (!buildDocs) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(doc)" "" - '' + lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - ''; - - # Unfortunately, it seems like we have to call make on this manually - preInstall = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - make -j$NIX_BUILD_CORES doc - cd ../doc/pdf - make -j$NIX_BUILD_CORES - cd - - ''; - - postInstall = lib.optionalString buildDocs '' - mv ../doc/html $out/share/doc/migraphx - mv ../doc/pdf/MIGraphX.pdf $out/share/doc/migraphx - '' + lib.optionalString buildTests '' - mkdir -p $test/bin - mv bin/test_* $test/bin - patchelf $test/bin/test_* --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "AMD's graph optimization engine"; - homepage = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix index f49a17a67f9..2df349b83dc 100644 --- a/pkgs/development/libraries/miniaudio/default.nix +++ b/pkgs/development/libraries/miniaudio/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.17"; + version = "0.11.18"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; rev = version; - hash = "sha256-nPQ53+9CDEn91LZgF5RkVur+XckTDcS38FHomPXbtMI="; + hash = "sha256-y0o33hnKoZ8gWWFNFIOUJcXMWENaYzMLZzeTOoVETOY="; }; installPhase = '' diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 33126eeb60d..2606edc7609 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-3bCGZupdJWcwp2d+XeqKZG3GxzXFm1UftV/PiN0u5iA="; + hash = "sha256-aJ6KYR9DazVQoPuc4w/gClKH9ditNE1JDU/F9dCJOsw="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 5619fe7039e..74493a06b52 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, zlib, autoreconfHook }: +{ lib, stdenv, zlib, autoreconfHook, fetchpatch }: stdenv.mkDerivation { pname = "minizip"; inherit (zlib) src version; + patches = [ + (fetchpatch { + name = "CVE-2023-45853.patch"; + url = "https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch"; + hash = "sha256-yayfe1g9HsvgMN28WF/MYkH7dGMX4PsK53FcnfL3InM="; + }) + ]; + + patchFlags = [ "-p3" ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/miopen/default.nix b/pkgs/development/libraries/miopen/default.nix deleted file mode 100644 index 1b24d8bfec7..00000000000 --- a/pkgs/development/libraries/miopen/default.nix +++ /dev/null @@ -1,190 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, rocmUpdateScript -, pkg-config -, cmake -, rocm-cmake -, rocblas -, rocmlir -, hip -, clang-tools-extra -, clang-ocl -, llvm -, miopengemm -, composable_kernel -, half -, boost -, sqlite -, bzip2 -, nlohmann_json -, texlive -, doxygen -, sphinx -, zlib -, gtest -, rocm-comgr -, python3Packages -, buildDocs ? true -, buildTests ? false -, fetchKDBs ? true -, useOpenCL ? false -}: - -let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small - latexmk - tex-gyre - fncychap - wrapfig - capt-of - framed - needspace - tabulary - varwidth - titlesec; - }; - - kdbs = lib.optionalAttrs fetchKDBs import ./deps.nix { - inherit fetchurl; - mirror = "https://repo.radeon.com/rocm/miopen-kernel/rel-5.0"; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "miopen"; - version = "5.4.2"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ] ++ lib.optionals buildTests [ - "test" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "MIOpen"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-GfXPCXiVJVve3d8sQCQcFLb/vEnKkVEn7xYUhHkEEVI="; - }; - - nativeBuildInputs = [ - pkg-config - cmake - rocm-cmake - hip - clang-tools-extra - ]; - - buildInputs = [ - llvm - rocblas - rocmlir - clang-ocl - miopengemm - composable_kernel - half - boost - sqlite - bzip2 - nlohmann_json - ] ++ lib.optionals buildDocs [ - latex - doxygen - sphinx - python3Packages.sphinx-rtd-theme - python3Packages.breathe - python3Packages.myst-parser - ] ++ lib.optionals buildTests [ - zlib - ]; - - cmakeFlags = [ - "-DMIOPEN_USE_MIOPENGEMM=ON" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals (!useOpenCL) [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DMIOPEN_BACKEND=HIP" - ] ++ lib.optionals useOpenCL [ - "-DMIOPEN_BACKEND=OpenCL" - ] ++ lib.optionals buildTests [ - "-DBUILD_TESTS=ON" - "-DMIOPEN_TEST_ALL=ON" - "-DMIOPEN_TEST_GFX900=ON" - "-DMIOPEN_TEST_GFX906=ON" - "-DMIOPEN_TEST_GFX908=ON" - "-DMIOPEN_TEST_GFX90A=ON" - "-DMIOPEN_TEST_GFX103X=ON" - "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "enable_testing()" "" \ - --replace "MIOPEN_HIP_COMPILER MATCHES \".*clang\\\\+\\\\+$\"" "true" \ - --replace "set(MIOPEN_TIDY_ERRORS ALL)" "" # error: missing required key 'key' - '' + lib.optionalString buildTests '' - substituteInPlace test/gtest/CMakeLists.txt \ - --replace "enable_testing()" "" - '' + lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - '' + lib.optionalString fetchKDBs '' - ln -sf ${kdbs.gfx1030_36} src/kernels/gfx1030_36.kdb - ln -sf ${kdbs.gfx900_56} src/kernels/gfx900_56.kdb - ln -sf ${kdbs.gfx900_64} src/kernels/gfx900_64.kdb - ln -sf ${kdbs.gfx906_60} src/kernels/gfx906_60.kdb - ln -sf ${kdbs.gfx906_64} src/kernels/gfx906_64.kdb - ln -sf ${kdbs.gfx90878} src/kernels/gfx90878.kdb - ln -sf ${kdbs.gfx90a68} src/kernels/gfx90a68.kdb - ln -sf ${kdbs.gfx90a6e} src/kernels/gfx90a6e.kdb - ''; - - # Unfortunately, it seems like we have to call make on these manually - postBuild = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - make -j$NIX_BUILD_CORES doc - '' + lib.optionalString buildTests '' - make -j$NIX_BUILD_CORES check - ''; - - postInstall = '' - rm $out/bin/install_precompiled_kernels.sh - '' + lib.optionalString buildDocs '' - mv ../doc/html $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} - mv ../doc/pdf/miopen.pdf $out/share/doc/miopen-${if useOpenCL then "opencl" else "hip"} - '' + lib.optionalString buildTests '' - mkdir -p $test/bin - mv bin/test_* $test/bin - patchelf --set-rpath $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ - [ hip rocm-comgr ])} $test/bin/* - '' + lib.optionalString fetchKDBs '' - # Apparently gfx1030_40 wasn't generated so the developers suggest just renaming gfx1030_36 to it - # Should be fixed in the next miopen kernel generation batch - ln -s ${kdbs.gfx1030_36} $out/share/miopen/db/gfx1030_40.kdb - ''; - - requiredSystemFeatures = [ "big-parallel" ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Machine intelligence library for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/miopen/deps.nix b/pkgs/development/libraries/miopen/deps.nix deleted file mode 100644 index e88b61ad974..00000000000 --- a/pkgs/development/libraries/miopen/deps.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl -, mirror -}: - -{ - gfx1030_36 = fetchurl { - sha256 = "sha256-zEXDLkRWAHS15LDA5IRyqG5rO7HHPBiVgPlQ8JjSqNc="; - url = "${mirror}/gfx1030_36.kdb"; - }; - - gfx900_56 = fetchurl { - sha256 = "sha256-ZTqUPhVKcQzjO6bxykvZMJk1VZh31dRVs+XqcxEtmeI="; - url = "${mirror}/gfx900_56.kdb"; - }; - - gfx900_64 = fetchurl { - sha256 = "sha256-ZTqUPhVKcQzjO6bxykvZMJk1VZh31dRVs+XqcxEtmeI="; - url = "${mirror}/gfx900_64.kdb"; - }; - - gfx906_60 = fetchurl { - sha256 = "sha256-U6pDo8ICfs6fVIEqRziWeE5/4Vzvu41JkcRVn3ou1e4="; - url = "${mirror}/gfx906_60.kdb"; - }; - - gfx906_64 = fetchurl { - sha256 = "sha256-U6pDo8ICfs6fVIEqRziWeE5/4Vzvu41JkcRVn3ou1e4="; - url = "${mirror}/gfx906_64.kdb"; - }; - - gfx90878 = fetchurl { - sha256 = "sha256-r7DRhNH+jHUXAu64b9vWsZzGD4w5oSHnxH0l2RN0qlQ="; - url = "${mirror}/gfx90878.kdb"; - }; - - gfx90a68 = fetchurl { - sha256 = "sha256-NT//zIPTbzsPJyaVycxwU6BcMTzGc/d+Z4Ab9FImDko="; - url = "${mirror}/gfx90a68.kdb"; - }; - - gfx90a6e = fetchurl { - sha256 = "sha256-ENZHbf+/MGYgSTpALKh2meuZPNhH5bG+WrW/jzvGpBs="; - url = "${mirror}/gfx90a6e.kdb"; - }; -} diff --git a/pkgs/development/libraries/miopengemm/default.nix b/pkgs/development/libraries/miopengemm/default.nix deleted file mode 100644 index f288cfda545..00000000000 --- a/pkgs/development/libraries/miopengemm/default.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocm-opencl-runtime -, texlive -, doxygen -, sphinx -, openblas -, python3Packages -, buildDocs ? true -, buildTests ? false -, buildBenchmarks ? false -}: - -let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small - latexmk - tex-gyre - fncychap - wrapfig - capt-of - framed - needspace - tabulary - varwidth - titlesec; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "miopengemm"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "MIOpenGEMM"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-AiRzOMYRA/0nbQomyq4oOEwNZdkPYWRA2W6QFlctvFc="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - buildInputs = [ - rocm-opencl-runtime - ] ++ lib.optionals buildDocs [ - latex - doxygen - sphinx - python3Packages.sphinx-rtd-theme - python3Packages.breathe - ] ++ lib.optionals buildTests [ - openblas - ]; - - cmakeFlags = [ - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DOPENBLAS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DAPI_BENCH_MIOGEMM=ON" - # Needs https://github.com/CNugteren/CLBlast - # "-DAPI_BENCH_CLBLAST=ON" - # Needs https://github.com/openai/triton - # "-DAPI_BENCH_ISAAC=ON" - ]; - - # Unfortunately, it seems like we have to call make on these manually - postBuild = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - make doc - '' + lib.optionalString buildTests '' - make check - '' + lib.optionalString buildBenchmarks '' - make examples - ''; - - postInstall = lib.optionalString buildDocs '' - mv ../doc/html $out/share/doc/miopengemm - mv ../doc/pdf/miopengemm.pdf $out/share/doc/miopengemm - '' + lib.optionalString buildTests '' - mkdir -p $test/bin - find tests -executable -type f -exec mv {} $test/bin \; - patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $test/bin/* - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - find examples -executable -type f -exec mv {} $benchmark/bin \; - patchelf --set-rpath ${lib.makeLibraryPath finalAttrs.buildInputs}:$out/lib $benchmark/bin/* - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "OpenCL general matrix multiplication API for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index a13b3655066..ed803772f73 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.18.0"; + version = "7.20.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-3qvMuBr2w/gedTDIjG6ezatleXuQSnKX4SkBShzj6aw="; + hash = "sha256-5yELGA3U/YkINEtRyr/tb3HjWMQjqKIWjUbH7ZFMgLU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 225ce967080..a8afd6e038f 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl +, bash , gnome , meson , python3 @@ -15,12 +17,20 @@ stdenv.mkDerivation rec { sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; }; + strictDeps = true; + nativeBuildInputs = [ meson python3 ninja ]; + # for shebangs + buildInputs = [ + python3 + bash + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 07a14e86225..b1c88a5b752 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.24.3"; + version = "1.24.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-zEIdK994aebLeKe4g6/ByWvaoGNBB0ODXRpczrCEkB8="; + hash = "sha256-cOPZ4o9q/cOBtGXFv6mOenTSyU/L2U6DZB4UmMnhtes="; }; postPatch = '' diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix index ef6134c3e49..b5963e12384 100644 --- a/pkgs/development/libraries/mongocxx/default.nix +++ b/pkgs/development/libraries/mongocxx/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mongocxx"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-cxx-driver"; rev = "refs/tags/r${finalAttrs.version}"; - hash = "sha256-7pMVBWMIGV6k04/0rKULwNcl0NMO4hqMnOzWv+0/DrA="; + hash = "sha256-fBZg69jsvXzhllpcPBGXkjYyvUQImnGNkb2Ek5Oi0p4="; }; postPatch = '' diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/development/libraries/monocypher/default.nix index 7ce84cbba83..b37cfffabc0 100644 --- a/pkgs/development/libraries/monocypher/default.nix +++ b/pkgs/development/libraries/monocypher/default.nix @@ -2,23 +2,13 @@ stdenv.mkDerivation rec { pname = "monocypher"; - version = "3.1.3"; + version = "4.0.2"; src = fetchurl { url = "https://monocypher.org/download/monocypher-${version}.tar.gz"; - hash = "sha256-tEK1d98o+MNsqgHZrpARtd2ccX2UvlIBaKBONtf1AW4="; + hash = "sha256-ONBxeXOMDJBnfbo863p7hJa8/qdYuhpT6AP+0wrgh5w="; }; - patches = [ - # Fix cross-compilation - (fetchpatch { - url = "https://github.com/LoupVaillant/Monocypher/commit/376715e1c0ebb375e50dfa757bc89486c9a7b404.patch"; - hash = "sha256-tuwSUaU4w+jkaj10ChMgUmOQmoKYnv5JgJ1og8EXxFk="; - }) - ]; - - makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; - installFlags = [ "PREFIX=$(out)" ]; doCheck = true; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index a505dd73fa0..622ee233f9c 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-NJLpitq2K1l+8NKS+yRZthI7yABwqKoKML5pYgdaEvA="; }; + outputs = [ "out" "doc" "man" ]; + configureFlags = [ "--enable-shared" "--enable-sharedlib" diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 6298a1dfef6..3cc6d9ce351 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, autoreconfHook, sqlite }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, sqlite +}: stdenv.mkDerivation rec { pname = "mps"; - version = "1.117.0"; + version = "1.118.0"; - src = fetchurl { - url = "https://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; - sha256 = "04ix4l7lk6nxxk9sawpnxbybvqb82lks5606ym10bc1qbc2kqdcz"; + src = fetchFromGitHub { + owner = "Ravenbrook"; + repo = "mps"; + rev = "refs/tags/release-${version}"; + hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -21,7 +28,6 @@ stdenv.mkDerivation rec { meta = { - broken = true; description = "A flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; license = lib.licenses.sleepycat; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index dcba45f41c3..13816faefce 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.targetPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 45b0abdee71..89665f2efc9 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib - mv lib*${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/ + mv lib*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ mkdir -p $out/include mv *.h $out/include/ diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index 2b3d2853d13..8a7d2c8f364 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - doCheck = true; checkPhase = '' echo "***Muparserx self-test***" diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 987f4022f51..2182c408337 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-w5pEkvS+UN9hAHhXSLoolOI85FCpQSgYHVFtpXV3Ua4="; }; + outputs = [ "out" "doc" "man" ]; + nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; propagatedBuildInputs = [ numactl rdma-core zlib opensm ]; buildInputs = with lib; [ @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10 ] ++ optional useSlurm "--with-pm=slurm" ++ optional (network == "ethernet") "--with-device=ch3:sock" - ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" ] + ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ] ++ optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"]; doCheck = true; @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { # /tmp/nix-build... ends up in the RPATH, fix it manually for entry in $out/bin/mpichversion $out/bin/mpivars; do echo "fix rpath: $entry" - patchelf --set-rpath "$out/lib" $entry + patchelf --allowed-rpath-prefixes ${builtins.storeDir} --shrink-rpath $entry done # Ensure the default compilers are the ones mvapich was built with diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 585dd4072b2..ef4e423d059 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-CdIZ0ql8QBM7UcEyTmt4P9gZyO8jrkLipAOsJUkpG8g="; + hash = "sha256-ASZyvcP9XVFPf7nTsBx5E+D/7fWzUslPZrmhhNY5DzQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index cb8333704ff..9c1c8b422a9 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , buildPackages +, ncurses , pkg-config , abiVersion ? "6" , enableStatic ? stdenv.hostPlatform.isStatic @@ -48,20 +49,20 @@ stdenv.mkDerivation (finalAttrs: { "/usr/share/terminfo" # upstream default, probably all FHS-based distros "/run/current-system/sw/share/terminfo" # NixOS ]}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; strictDeps = true; - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.ncurses + # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`. + ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 0b4426f1a2a..f5efbdcc082 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3hNdgfAJGJkMXdB86+u3bKwrvXoMei1YCFXDG4ObkU4="; + sha256 = "sha256-bRlz5RW+NUSTgzjRM9alZjSrzmF8/7p4IIXqK/HEcJo="; }; strictDeps = true; diff --git a/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch b/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch new file mode 100644 index 00000000000..7d1723c3ef9 --- /dev/null +++ b/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 60c699d..606b972 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -402,7 +402,7 @@ ELSE(MSVC) + FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) + ENDIF(MSVC) + +-CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY) ++CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARIES} H5free_memory "" HAVE_H5FREE_MEMORY) + IF(NOT HAVE_H5FREE_MEMORY) + MESSAGE(STATUS "Plugin support requires libhdf5 with H5Free support. Your libhdf5 install does not provide H5Free. Please install a newer version of libhdf5 if you require plugin compression support.") + SET(NC_HAS_DEF_VAR_FILTER "") diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 5f0fade2566..945eb219229 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY="; }; + patches = [ + # This fix is included upstream, remove with next upgrade + ./cmake-h5free.patch + ]; + preConfigure = '' cmakeFlags+="-Dabs_top_srcdir=$(readlink -f ./)" ''; @@ -28,5 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = lib.licenses.free; platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index e26fe4fa003..b208607f7b1 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.54.0"; + version = "1.57.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-nZ0esJm0kvr6Gtn31pZZU3WP3vmtDPZaTQvcI3OAPa0="; + sha256 = "sha256-xjdnfLrESU6q+LDgOGFzFGhFgw76/+To3JL7O0KOWtI="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index a81b43ae790..21e0cff3b87 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.14.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-DqqT8rgGlbV0upe0E37AR8bk3SIsoyCXt8xJzIkz9xc="; + hash = "sha256-mw0zI7528lvEZlv+/KuST7PWjuu37p/+EGGsjIEto2Q="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 9bfd3324242..1d716704c10 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.17.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-vY3RooC8ttezru6vAqbG1MU5uZhD8fLnlEYVYS3pFRk="; + hash = "sha256-dnYIRcNGTIzETu2OjTJa0IWB1+xttdGFKRBmMkTwrXk="; }; outputs = [ "out" "dev" "doc" ]; @@ -27,13 +27,6 @@ stdenv.mkDerivation rec { "-DENABLE_STATIC_LIB=OFF" ]; - preConfigure = '' - # https://github.com/ngtcp2/ngtcp2/issues/858 - # Fix ngtcp2_crypto_openssl remnants. - substituteInPlace crypto/includes/CMakeLists.txt \ - --replace 'ngtcp2/ngtcp2_crypto_openssl.h' 'ngtcp2/ngtcp2_crypto_quictls.h' - ''; - doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index 45f7d9d67db..851d687077c 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.19.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-agiQRy/e5VS+ANxajXYi5huRjQQ2M8eddH/AzmwnHdQ="; + hash = "sha256-Z8rMujmshdes5SLU5GpXu6QzAHl957sFDK+QSdGYCOc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index 65ba691e120..cb5aa49ec61 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; - rev = "8e1836f57e8bcdb228dd5baadc71dfbf30b544e0"; - sha256 = "sha256-Q08/Oxv9DLCHp7Hf3NqNa0sHq7qwM6TfGT8gNyiwin8="; + rev = "a54820ff0e1b74554c7f649e8386ee8c4ecd98f5"; + sha256 = "sha256-4Vj8nf3c45Y8LJ79YUOrNAAGMmfygdPtAJrs+JuFiUM="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index db0ad2efad5..c4d619e7714 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.93"; - hash = "sha256-FfVLtyBI6xBfjA6TagS4medMPbmhm7weAKzuKvlHaoo="; + version = "3.94"; + hash = "sha256-RjrhgO6eXunjrU9ikyZlfiNngMyGVXKpMKFlIKutndg="; } diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 9335bec35ce..8fa37141628 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "TUNE=${ if tune then "auto" - else if stdenv.targetPlatform.isx86 then + else if stdenv.hostPlatform.isx86 then "x86" # "chooses options that should be well suited for most x86 platforms" else "generic" # "chooses options that should be OK for most platforms" diff --git a/pkgs/development/libraries/numcpp/default.nix b/pkgs/development/libraries/numcpp/default.nix index 56713f2a6a5..6b0b0304d42 100644 --- a/pkgs/development/libraries/numcpp/default.nix +++ b/pkgs/development/libraries/numcpp/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "numcpp"; - version = "2.11.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "dpilger26"; repo = "NumCpp"; rev = "Version_${finalAttrs.version}"; - hash = "sha256-IAku1bcaMkawZxpQbvxcS6VX07ogw4UGo1DX2Wa8xwU="; + hash = "sha256-1LGyDvT+PiGRXn7NorcYUjSPzNuRv/YXhQWIaOa7xdo="; }; nativeCheckInputs = [gtest python3]; diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch b/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch new file mode 100644 index 00000000000..05de63806fb --- /dev/null +++ b/pkgs/development/libraries/nvidia-vaapi-driver/0001-hardcode-install_dir.patch @@ -0,0 +1,34 @@ +From 4e8bd61c216969615a492043092bd8298dcd1410 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Mon, 6 Nov 2023 09:33:45 -0500 +Subject: [PATCH] hardcode install_dir + +partially revert https://github.com/elFarto/nvidia-vaapi-driver/commit/60ab79608ae35bd929d3e1387d226547d18e6bed +--- + meson.build | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 990c2b2..f5e63d7 100644 +--- a/meson.build ++++ b/meson.build +@@ -71,7 +71,6 @@ if gst_codecs_deps.found() + endif + + nvidia_incdir = include_directories('nvidia-include') +-nvidia_install_dir = libva_deps.get_variable(pkgconfig: 'driverdir') + + shared_library( + 'nvidia_drv_video', +@@ -80,7 +79,7 @@ shared_library( + dependencies: deps, + include_directories: nvidia_incdir, + install: true, +- install_dir: nvidia_install_dir, ++ install_dir: get_option('libdir') / 'dri', + gnu_symbol_visibility: 'hidden', + ) + +-- +2.42.0 + diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 4a1976be291..60ef649ec5a 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -14,15 +14,19 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j6AIleVZCgV7CD7nP/dKz5we3sUW9pldy0QKi8xwXB0="; + sha256 = "sha256-mVVRpCyT374P1Vql0yPY0e5tNktHNJ8XHoixvxp3b20="; }; + patches = [ + ./0001-hardcode-install_dir.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index aee255fd961..047711e5659 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "5.0.0"; + version = "5.0.1"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-ZRkXd7D4weCfP6R7UZD2+saNiNa+XXVhfiWIlxBObmU="; + sha256 = "sha256-XSQ2TLozbmofpzagbqcGSxAx0jpR68Gr6so/KKwZhbY="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/development/libraries/omorfi/default.nix index d6d0f1741d1..6002ea46467 100644 --- a/pkgs/development/libraries/omorfi/default.nix +++ b/pkgs/development/libraries/omorfi/default.nix @@ -3,6 +3,7 @@ , autoreconfHook , cg3 , fetchFromGitHub +, fetchpatch , hfst , hfst-ospell , icu @@ -24,6 +25,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; }; + patches = [ + # allow building with python311. + # patch is incorporated upstream and should be removed on the next update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/flammie/omorfi/commit/9736452ae6624060dbea0876a722c3731e776357.patch"; + hash = "sha256-Q4fi5HMmO0fq8YI833vgv2EYp//9Um/xFoRk28WrUMk="; + }) + ]; + # Fix for omorfi-hyphenate.sh file not found error postInstall = '' ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 7448a99439d..2518cecb9b6 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.2.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8="; + hash = "sha256-br2ssI4MRk9O6u+5voBmxBZtmTFPKoJJe3ZEN2blq7Y="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 3062c3cb4e1..a1a9dc87573 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "oniguruma"; - version = "6.9.8"; + version = "6.9.9"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; - sha256 = "sha256-KM1iwUZGI8eRBWX7HMqqAQSy/osSvNZG6B9ztHU1IT4="; + sha256 = "sha256-YBYr07n8b0iG1MegeSX/03QWdzL1Xc6MSRv9nNgYps8="; }; outputs = [ "dev" "lib" "out" ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 1b955b57de4..7a8b8570f62 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -17,7 +17,7 @@ , microsoft-gsl , iconv , gtest -, protobuf3_21 +, protobuf_21 , pythonSupport ? true }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { cmake pkg-config python3Packages.python - protobuf3_21 + protobuf_21 ] ++ lib.optionals pythonSupport (with python3Packages; [ setuptools wheel @@ -133,7 +133,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DABSL_ENABLE_INSTALL=ON" - "-DCMAKE_BUILD_TYPE=RELEASE" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DFETCHCONTENT_QUIET=OFF" "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}" @@ -155,6 +154,13 @@ stdenv.mkDerivation rec { "-Donnxruntime_ENABLE_PYTHON=ON" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" + "-Wno-error=unused-but-set-variable" + ]; + }; + doCheck = true; postPatch = '' @@ -178,7 +184,7 @@ stdenv.mkDerivation rec { ''; passthru = { - protobuf = protobuf3_21; + protobuf = protobuf_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 3732103d73a..70b80e3a84d 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -1,19 +1,16 @@ { lib , stdenv +, applyPatches , fetchFromGitHub , fetchpatch , cmake , git -, llvmPackages_11 +, llvmPackages_14 , spirv-llvm-translator , buildWithPatches ? true }: let - llvmPkgs = llvmPackages_11 // { - inherit spirv-llvm-translator; - }; - addPatches = component: pkg: pkg.overrideAttrs (oldAttrs: { postPatch = oldAttrs.postPatch or "" + '' for p in ${passthru.patchesOut}/${component}/*; do @@ -22,8 +19,13 @@ let ''; }); + llvmPkgs = llvmPackages_14; + inherit (llvmPkgs) llvm; + spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; + libclang = if buildWithPatches then passthru.libclang else llvmPkgs.libclang; + passthru = rec { - spirv-llvm-translator = llvmPkgs.spirv-llvm-translator.override { llvm = llvmPackages_11.llvm; }; + spirv-llvm-translator = spirv-llvm-translator'; llvm = addPatches "llvm" llvmPkgs.llvm; libclang = addPatches "clang" llvmPkgs.libclang; @@ -34,7 +36,7 @@ let patchesOut = stdenv.mkDerivation { pname = "opencl-clang-patches"; - inherit (library) version src patches; + inherit version src; # Clang patches assume the root is the llvm root dir # but clang root in nixpkgs is the clang sub-directory postPatch = '' @@ -52,56 +54,66 @@ let }; }; - library = let - inherit (llvmPackages_11) llvm; - inherit (if buildWithPatches then passthru else llvmPkgs) libclang spirv-llvm-translator; - in - stdenv.mkDerivation { - pname = "opencl-clang"; - version = "unstable-2022-03-16"; - - - src = fetchFromGitHub { - owner = "intel"; - repo = "opencl-clang"; - rev = "bbdd1587f577397a105c900be114b56755d1f7dc"; - sha256 = "sha256-qEZoQ6h4XAvSnJ7/gLXBb1qrzeYa6Jp6nij9VFo8MwQ="; - }; - - patches = [ - # Build script tries to find Clang OpenCL headers under ${llvm} - # Work around it by specifying that directory manually. - ./opencl-headers-dir.patch - ]; + version = "unstable-2023-06-12"; + src = applyPatches { + src = fetchFromGitHub { + owner = "intel"; + repo = "opencl-clang"; + # https://github.com/intel/opencl-clang/compare/ocl-open-140 + rev = "cf95b338d14685e4f3402ab1828bef31d48f1fd6"; + hash = "sha256-To1RlQX9IJ+1zAwEXaW7ua3VNfjK9mu7pgsRPsfa8g8="; + }; + patches = [ + # Build script tries to find Clang OpenCL headers under ${llvm} + # Work around it by specifying that directory manually. + ./opencl-headers-dir.patch + + # fix CMake throwing errors + (fetchpatch { + url = "https://github.com/intel/opencl-clang/commit/321e3b99c1a8d54c8475f5ae998452069cc5eb71.patch"; + hash = "sha256-cATbH+AMVtcabhl3EkzAH7w3wGreUV53hQYHVUUEP4g="; + }) + ]; + + postPatch = '' + # fix not be able to find clang from PATH + substituteInPlace cl_headers/CMakeLists.txt \ + --replace " NO_DEFAULT_PATH" "" + '' + lib.optionalString stdenv.isDarwin '' # Uses linker flags that are not supported on Darwin. - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt - substituteInPlace CMakeLists.txt \ - --replace '-Wl,--no-undefined' "" - ''; + sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace '-Wl,--no-undefined' "" + ''; + }; +in - nativeBuildInputs = [ cmake git llvm.dev ]; +stdenv.mkDerivation { + pname = "opencl-clang"; + inherit version src; - buildInputs = [ libclang llvm spirv-llvm-translator ]; + nativeBuildInputs = [ cmake git llvm.dev ]; - cmakeFlags = [ - "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" - "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/" + buildInputs = [ libclang llvm spirv-llvm-translator' ]; - "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" - "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator}" - ]; + cmakeFlags = [ + "-DPREFERRED_LLVM_VERSION=${lib.getVersion llvm}" + "-DOPENCL_HEADERS_DIR=${libclang.lib}/lib/clang/${lib.getVersion libclang}/include/" - inherit passthru; + "-DLLVMSPIRV_INCLUDED_IN_LLVM=OFF" + "-DSPIRV_TRANSLATOR_DIR=${spirv-llvm-translator'}" + ]; - meta = with lib; { - homepage = "https://github.com/intel/opencl-clang/"; - description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; - license = licenses.ncsa; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - }; - }; -in - library + inherit passthru; + + meta = with lib; { + homepage = "https://github.com/intel/opencl-clang/"; + description = "A clang wrapper library with an OpenCL-oriented API and the ability to compile OpenCL C kernels to SPIR-V modules"; + license = licenses.ncsa; + maintainers = with maintainers; [ ]; + platforms = platforms.all; + # error: invalid value 'CL3.0' in '-cl-std=CL3.0' + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch b/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch new file mode 100644 index 00000000000..e60ebc9e1ef --- /dev/null +++ b/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch @@ -0,0 +1,17 @@ +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index c122b013..04f36bf0 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -43,11 +43,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ + # ZLIB_VERSION_STRING is still available for backward compatibility. + # See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html + +- if (@ZLIB_VERSION@) # @ZLIB_VERSION@ +- find_dependency(ZLIB @ZLIB_VERSION@) +- else() +- find_dependency(ZLIB @ZLIB_VERSION_STRING@) +- endif() ++ find_dependency(ZLIB) + endif() + + if (NOT TARGET MINIZIP::minizip-ng) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 40a64077acc..9b5018ef418 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -27,32 +27,25 @@ stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-l5UUysHdP/gb4Mn5A64XEoHOkthl6Mlb95CuI0l4vXQ="; + sha256 = "sha256-E4TmMEFzI3nKqiDFaAkNx44uo84sacvZqjbfWe3A8fE="; }; patches = [ (fetchpatch { - name = "darwin-no-hidden-l.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch"; - revert = true; - sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; - }) - (fetchpatch { - name = "pkg-config-absolute-path.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch"; - sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM="; - }) - (fetchpatch { - name = "minizip-ng-4.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch"; - hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew="; + # Taken from https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1891. + name = "opencolorio-yaml-cpp-8.0-compat.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/e99b4afcf0408d8ec56fdf2b9380327c9284db00.patch"; + sha256 = "sha256-7eIvVWKcpE0lmuYdNqFQFHkW/sSSzQ//LNIMOC28KZg="; }) + # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. + # Needed for zlib >= 1.3 && cmake < 3.27.4. + ./broken-cmake-zlib-version.patch ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -81,14 +74,17 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + "-DOCIO_USE_SSE2NEON=OFF" # GPU test fails with: freeglut (GPU tests): failed to open display '' "-DOCIO_BUILD_GPU_TESTS=OFF" - "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include" + "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # precision issues on non-x86 doCheck = stdenv.isx86_64; + # Tends to fail otherwise. + enableParallelChecking = false; meta = with lib; { homepage = "https://opencolorio.org"; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 26b2715658b..38a50b75027 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "opencore-amr"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; - sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; + url = "mirror://sourceforge/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; + hash = "sha256-SD60BhCI4rNLNY5HVAtdSVqWzUaONhBQ+uYVsYCdxKE="; }; meta = { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 8774c97de3b..e3f458d0d73 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,8 +1,9 @@ { lib, stdenv , fetchFromGitHub , fetchpatch +, callPackage , cmake, pkg-config, unzip, zlib, pcre, hdf5 -, glog, boost, gflags, protobuf3_21 +, glog, boost, gflags, protobuf_21 , config , enableJPEG ? true, libjpeg @@ -14,8 +15,7 @@ , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true -, enableCuda ? config.cudaSupport && - stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport , cudaPackages ? { } , enableUnfree ? false , enableIpp ? false @@ -186,7 +186,7 @@ stdenv.mkDerivation { buildInputs = [ zlib pcre hdf5 glog boost gflags ] - ++ lib.optional useSystemProtobuf protobuf3_21 + ++ lib.optional useSystemProtobuf protobuf_21 ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 @@ -250,6 +250,16 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + + # Disable unnecessary vendoring that's enabled by default only for Darwin. + # Note that the opencvFlag feature flags listed above still take + # precedence, so we can safely list everything here. + "-DBUILD_ZLIB=OFF" + "-DBUILD_TIFF=OFF" + "-DBUILD_JASPER=OFF" + "-DBUILD_JPEG=OFF" + "-DBUILD_PNG=OFF" + "-DBUILD_WEBP=OFF" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ] ++ lib.optionals enableEigen [ @@ -279,7 +289,11 @@ stdenv.mkDerivation { hardeningDisable = [ "bindnow" "relro" ]; - passthru = lib.optionalAttrs enablePython { pythonPath = []; }; + passthru = lib.optionalAttrs enablePython { pythonPath = []; } // { + tests = lib.optionalAttrs enableCuda { + no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv3"; }; + }; + }; meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 2bc3954f8ab..06360449c1b 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , hdf5 , boost , gflags -, protobuf3_21 +, protobuf_21 , config , ocl-icd , buildPackages @@ -37,12 +37,11 @@ , blas , enableContrib ? true -, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda , cudaPackages ? {} -, symlinkJoin , nvidia-optical-flow-sdk , enableLto ? true @@ -83,11 +82,16 @@ , Accelerate , bzip2 , callPackage -}: +}@inputs: let version = "4.7.0"; + # It's necessary to consistently use backendStdenv when building with CUDA + # support, otherwise we get libstdc++ errors downstream + stdenv = throw "Use effectiveStdenv instead"; + effectiveStdenv = if enableCuda then cudaPackages.backendStdenv else inputs.stdenv; + src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; @@ -121,11 +125,11 @@ let sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; } + "/ippicv"; files = let name = platform: "ippicv_2019_${platform}_general_20180723.tgz"; in - if stdenv.hostPlatform.system == "x86_64-linux" then + if effectiveStdenv.hostPlatform.system == "x86_64-linux" then { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; } - else if stdenv.hostPlatform.system == "i686-linux" then + else if effectiveStdenv.hostPlatform.system == "i686-linux" then { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; } - else if stdenv.hostPlatform.system == "x86_64-darwin" then + else if effectiveStdenv.hostPlatform.system == "x86_64-darwin" then { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; @@ -232,35 +236,12 @@ let #https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded openblas_ = blas.provider.override { singleThreaded = true; }; - inherit (cudaPackages) backendStdenv cudaFlags cudaVersion; + inherit (cudaPackages) cudaFlags cudaVersion; inherit (cudaFlags) cudaCapabilities; - cuda-common-redist = with cudaPackages; [ - cuda_cccl # <thrust/*> - libnpp # npp.h - ] ++ lib.optionals enableCublas [ - libcublas # cublas_v2.h - ] ++ lib.optionals enableCudnn [ - cudnn # cudnn.h - ] ++ lib.optionals enableCufft [ - libcufft # cufft.h - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in -stdenv.mkDerivation { +effectiveStdenv.mkDerivation { pname = "opencv"; inherit version src; @@ -317,9 +298,9 @@ stdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = [ zlib pcre boost gflags protobuf3_21 ] + buildInputs = [ zlib pcre boost gflags protobuf_21 ] ++ lib.optional enablePython pythonPackages.python - ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 + ++ lib.optional (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 ++ lib.optional enableVtk vtk @@ -330,7 +311,7 @@ stdenv.mkDerivation { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2000 openjpeg ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) + ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) ++ lib.optional enableOvis ogre @@ -343,11 +324,21 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals effectiveStdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ] - ++ lib.optionals enableCuda [ cuda-redist ]; + ++ lib.optionals enableCuda (with cudaPackages; [ + cuda_cudart + cuda_cccl # <thrust/*> + libnpp # npp.h + ] ++ lib.optionals enableCublas [ + libcublas # cublas_v2.h + ] ++ lib.optionals enableCudnn [ + cudnn # cudnn.h + ] ++ lib.optionals enableCufft [ + libcufft # cufft.h + ]); propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy ++ lib.optionals enableCuda [ nvidia-optical-flow-sdk ]; @@ -357,7 +348,9 @@ stdenv.mkDerivation { pythonPackages.pip pythonPackages.wheel pythonPackages.setuptools - ] ++ lib.optionals enableCuda [ cuda-native-redist ]; + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -369,7 +362,7 @@ stdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=${printEnabled runAccuracyTests}" @@ -400,17 +393,14 @@ stdenv.mkDerivation { (opencvFlag "ENABLE_LTO" enableLto) (opencvFlag "ENABLE_THIN_LTO" ( enableLto && ( - # Only clang supports thin LTO, so we must either be using clang through the stdenv, - stdenv.cc.isClang || - # or through the backend stdenv. - (enableCuda && backendStdenv.cc.isClang) + # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv, + effectiveStdenv.cc.isClang || + # or through the backend effectiveStdenv. + (enableCuda && effectiveStdenv.cc.isClang) ) )) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - # We need to set the C and C++ host compilers for CUDA to the same compiler. - "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc" - "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" # OpenCV respects at least three variables: @@ -421,10 +411,21 @@ stdenv.mkDerivation { "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals effectiveStdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" - ] ++ lib.optionals (!stdenv.isDarwin) [ + + # Disable unnecessary vendoring that's enabled by default only for Darwin. + # Note that the opencvFlag feature flags listed above still take + # precedence, so we can safely list everything here. + "-DBUILD_ZLIB=OFF" + "-DBUILD_TIFF=OFF" + "-DBUILD_OPENJPEG=OFF" + "-DBUILD_JASPER=OFF" + "-DBUILD_JPEG=OFF" + "-DBUILD_PNG=OFF" + "-DBUILD_WEBP=OFF" + ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" @@ -478,14 +479,17 @@ stdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; } - // lib.optionalAttrs (!stdenv.isDarwin) { inherit qimgv; } + // lib.optionalAttrs (!effectiveStdenv.isDarwin) { inherit qimgv; } // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } - // lib.optionalAttrs (stdenv.buildPlatform != "x86_64-darwin") { + // lib.optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { opencv4-tests = callPackage ./tests.nix { inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; inherit opencv4; - }; }; + } + // lib.optionalAttrs (enableCuda) { + no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; }; + }; } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { diff --git a/pkgs/development/libraries/opencv/libstdcxx-test.nix b/pkgs/development/libraries/opencv/libstdcxx-test.nix new file mode 100644 index 00000000000..d8cc483da9a --- /dev/null +++ b/pkgs/development/libraries/opencv/libstdcxx-test.nix @@ -0,0 +1,17 @@ +{ python3Packages, runCommand, attrName }: + +runCommand "${python3Packages.${attrName}.name}-libstdcxx-test" +{ + nativeBuildInputs = [ + (python3Packages.python.withPackages (ps: [ + (ps.${attrName}.override { enableCuda = true; }) + ps.scikit-image + ])) + ]; +} '' + python << EOF + import cv2 + from skimage.transform import pyramid_reduce + EOF + touch $out +'' diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index a5ce27e270e..826c7b2c854 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-cV+qgx3WzdotypgpZhVFxzdKAU2rNVw0KWSdkeN0gLk="; + hash = "sha256-ycn2RbHM/vIDUGGGnfNZ0Zm0qjjKRRNhkMD11PkpGF0="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix index a908b4980da..dd6b0ce10c0 100644 --- a/pkgs/development/libraries/openfec/default.nix +++ b/pkgs/development/libraries/openfec/default.nix @@ -1,12 +1,17 @@ -{ stdenv, lib, fetchzip, cmake }: +{ stdenv +, lib +, fetchzip +, cmake +, gitUpdater +}: stdenv.mkDerivation rec { pname = "openfec"; - version = "1.4.2"; + version = "1.4.2.9"; src = fetchzip { - url = "http://openfec.org/files/openfec_v1_4_2.tgz"; - sha256 = "sha256:0c2lg8afr7lqpzrsi0g44a6h6s7nq4vz7yc9vm2k57ph2y6r86la"; + url = "https://github.com/roc-streaming/openfec/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-A/U9Nh8tspRoT3bYePJLUrNa9jxiL0r2Xaf64wWbmVA="; }; outputs = [ "out" "dev" ]; @@ -33,6 +38,11 @@ stdenv.mkDerivation rec { ln -s libopenfec${so} $out/lib/libopenfec${so}.1 ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/roc-streaming/openfec.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Application-level Forward Erasure Correction codes"; homepage = "https://github.com/roc-streaming/openfec"; diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index 201bf16ad64..2bfb0870858 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.4"; src = fetchFromGitHub { - owner = "ofxa"; + owner = "AcademySoftwareFoundation"; repo = "openfx"; rev = "OFX_Release_1_4_TAG"; sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Image processing plug-in standard"; - homepage = "http://openeffects.org/"; + homepage = "https://openeffects.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 610a458c071..a0f520dcb6c 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; }; + # Workaround broken zlib version detecion in CMake < 3.37. + postPatch = '' + substituteInPlace ./src/cmake/Config.cmake.in \ + --replace " @ZLIB_VERSION@" "" + ''; + outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 50098de03dd..d528e2fc030 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -25,8 +25,10 @@ stdenv.mkDerivation rec { patches = [ # modernise cmake files, also fixes them for multiple outputs + # https://github.com/uclouvain/openjpeg/pull/1424 (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/pull/1424.patch"; + name = "uclouvain-openjpeg-pull-1424.patch"; + url = "https://github.com/uclouvain/openjpeg/compare/52927287402a9f7353de8854c88f931051211e2f...9d4f70cfe99626f82f9c8dcbf45f07709e3511b2.patch"; sha256 = "sha256-CxVRt1u4HVOMUjWiZ2plmZC29t/zshCpSY+N4Wlrlvg="; }) # fix cmake files cross compilation diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 937669fc585..1c4955e2c51 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin -, libpsm2, libfabric, pmix, ucx +, libpsm2, libfabric, pmix, ucx, ucc , config # Enable CUDA support , cudaSupport ? config.cudaSupport, cudatoolkit @@ -25,11 +25,11 @@ let }; in stdenv.mkDerivation rec { pname = "openmpi"; - version = "4.1.5"; + version = "4.1.6"; src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-pkCYa8JXOJ3TeYhv2uYmTIz6VryYtxzjrj372M5h2+M="; + sha256 = "sha256-90CZRIVRbetjtTEa8SLCZRefUyig2FelZ7hdsAsR5BU="; }; postPatch = '' @@ -43,8 +43,10 @@ in stdenv.mkDerivation rec { find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \; ''; + outputs = [ "out" "man" ]; + buildInputs = [ zlib ] - ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ] + ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ucc ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core @@ -56,8 +58,8 @@ in stdenv.mkDerivation rec { configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" ++ lib.optional (!fortranSupport) "--disable-mpi-fortran" ++ lib.optionals stdenv.isLinux [ - "--with-libnl=${libnl.dev}" - "--with-pmix=${pmix}" + "--with-libnl=${lib.getDev libnl}" + "--with-pmix=${lib.getDev pmix}" "--with-pmix-libdir=${pmix}/lib" "--enable-mpi-cxx" ] ++ lib.optional enableSGE "--with-sge" @@ -66,13 +68,13 @@ in stdenv.mkDerivation rec { # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ] - ++ lib.optionals fabricSupport [ "--with-psm2=${libpsm2}" "--with-libfabric=${libfabric}" ] + ++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ] ; enableParallelBuilding = true; postInstall = '' - rm -f $out/lib/*.la + find $out/lib/ -name "*.la" -exec rm -f \{} \; ''; postFixup = '' diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2be34feeaa8..3aeafccb1ed 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,14 +18,14 @@ # files. let - common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: + common = { version, hash, patches ? [], withDocs ? false, extraMeta ? {} }: stdenv.mkDerivation (finalAttrs: { pname = "openssl"; inherit version; src = fetchurl { url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; inherit patches; @@ -219,9 +219,11 @@ let meta = with lib; { homepage = "https://www.openssl.org/"; + changelog = "https://github.com/openssl/openssl/blob/openssl-${version}/CHANGES.md"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; mainProgram = "openssl"; + maintainers = with maintainers; [ thillux ]; pkgConfigModules = [ "libcrypto" "libssl" @@ -238,7 +240,7 @@ in { # and backport this to stable release (23.05). openssl_1_1 = common { version = "1.1.1w"; - sha256 = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; + hash = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -255,8 +257,32 @@ in { }; openssl_3 = common { - version = "3.0.10"; - sha256 = "sha256-F2HU9bE6ECi5tvPUuOF/6wztyTcPav5h1xk9LNzoMyM="; + version = "3.0.12"; + hash = "sha256-+Tyejt3l6RZhGd4xdV/Ie0qjSGNmL2fd/LoU0La2m2E="; + + patches = [ + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ./use-etc-ssl-certs-darwin.patch + else ./use-etc-ssl-certs.patch) + ]; + + withDocs = true; + + extraMeta = with lib; { + license = licenses.asl20; + }; + }; + + openssl_3_1 = common { + version = "3.1.4"; + hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM="; + patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 4cd398e6394..b0ff4b52886 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "opensubdiv"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-pYD2HxAszE9Ux1xsSJ7s2R13U8ct5tDo3ZP7H0+F9Rc="; + sha256 = "sha256-uDKCT0Uoa5WQekMUFm2iZmzm+oWAZ6IWMwfpchkUZY0="; }; outputs = [ "out" "dev" ]; @@ -47,6 +47,11 @@ stdenv.mkDerivation rec { "-DNO_OPENCL=1" ]; + preBuild = let maxBuildCores = 16; in lib.optionalString cudaSupport '' + # https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1313 + NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) + ''; + postInstall = "rm $out/lib/*.a"; meta = { diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index 9c99ee6027d..a85aa6d14e4 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "opentracing-cpp"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "opentracing"; repo = "opentracing-cpp"; rev = "v${version}"; - sha256 = "04kw19g8qrv3kd40va3sqbfish7kfczkdpxdwraifk9950wfs3gx"; + sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix index d6735e77d46..e20499b9206 100644 --- a/pkgs/development/libraries/openturns/default.nix +++ b/pkgs/development/libraries/openturns/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.21"; + version = "1.21.1"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY="; + sha256 = "sha256-Lg42QqsHYFxeUjZjYFVJFxeJv2MzOpjoShfbIg/095A="; }; nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 91e978ce04b..53bfa41a8e2 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.28"; + version = "1.0.31"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-rQ+Zkmvi4bWVp86KDPs7SLZ040stKUsC7Ycb9kltElk="; + sha256 = "sha256-qK8l/v6nLuMAitz7DfVDjJyVjEmkeD2jgJkG5qOMCcQ="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 4ea4692a14a..f0334ea4de1 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xF6QIXfsI+6WqshcG74/J98MgjSkYjRkTW64zeH6DDY="; + sha256 = "sha256-Cz3IE5UrfoWjMxQ/+iR1bLsYxf5DVN+7aJqLBcPjduA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index cf75de2bf6f..1c65fa1981f 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "5.2.16"; + version = "5.2.109"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4="; + hash = "sha256-EgUPICdKi8c/E6uonZB4DKyOZ3Od4JM5/bR2U6cq9ew="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/development/libraries/paho-mqtt-c/default.nix index 836f9fe625d..14943278822 100644 --- a/pkgs/development/libraries/paho-mqtt-c/default.nix +++ b/pkgs/development/libraries/paho-mqtt-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "paho.mqtt.c"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.c"; rev = "v${version}"; - hash = "sha256-LxyMbMA6Antt8Uu4jCvmvYT9+Vm4ZUVz4XXFdd0O7Kk="; + hash = "sha256-dKQnepQAryAjImh2rX1jdgiKBtJQy9wzk/7rGQjUtPg="; }; postPatch = '' diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e2155043aa3..3d866a92295 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -17,7 +17,7 @@ , glib , python3 , x11Support? !stdenv.isDarwin, libXft -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages, gobject-introspection }: @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { packageName = pname; versionPolicy = "odd-unstable"; # 1.90 is alpha for API 2. - freeze = true; + freeze = "1.90.0"; }; }; diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix index a61df952f89..a1f5c9a7285 100644 --- a/pkgs/development/libraries/parson/default.nix +++ b/pkgs/development/libraries/parson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "parson"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "kgabis"; repo = "parson"; - rev = "60c37844d7a1c97547812cac3423d458c73e60f9"; # upstream doesn't use tags - hash = "sha256-SbM0kqRtdcz1s+pUTW7VPMY1O6zdql3bao19Rk4t470="; + rev = "ba29f4eda9ea7703a9f6a9cf2b0532a2605723c3"; # upstream doesn't use tags + hash = "sha256-IEmCa0nauUzG+zcLpr++ySD7i21zVJh/35r9RaQkok0="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 7730b30b396..c6e67d39c19 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -38,7 +38,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio; - preConfigure = '' + # touch ChangeLog to avoid below error on darwin: + # Makefile.am: error: required file './ChangeLog.md' not found + preConfigure = lib.optionalString stdenv.isDarwin '' + touch ChangeLog + '' + '' ./autogen.sh ''; @@ -48,6 +52,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ aske ]; platforms = platforms.unix; - badPlatforms = platforms.darwin; }; }) diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix deleted file mode 100644 index c45a8e03fd1..00000000000 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{lib, stdenv, fetchurl, libxpdf, libxml2}: - -stdenv.mkDerivation { - name = "pdf2xml"; - - src = fetchurl { - url = "http://tarballs.nixos.org/pdf2xml.tar.gz"; - sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w"; - }; - sourceRoot = "pdf2xml/pdf2xml"; - - buildInputs = [libxml2 libxpdf]; - - patches = [./pdf2xml.patch]; - - hardeningDisable = [ "format" ]; - - preBuild = '' - cp Makefile.linux Makefile - - sed -i 's|/usr/include/libxml2|${libxml2.dev}/include/libxml2|' Makefile - sed -i 's|-lxml2|-lxml2 -L${libxml2.out}/lib|' Makefile - sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile - - mkdir exe - - buildFlags+=" CXX=$CXX" - ''; - - installPhase = '' - mkdir -p $out/bin - cp exe/* $out/bin - ''; - - meta = with lib; { - description = "PDF to XML converter"; - homepage = "https://sourceforge.net/projects/pdf2xml/"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/libraries/pdf2xml/pdf2xml.patch b/pkgs/development/libraries/pdf2xml/pdf2xml.patch deleted file mode 100644 index 596a3aea674..00000000000 --- a/pkgs/development/libraries/pdf2xml/pdf2xml.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux -*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100 ---- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200 -*************** -*** 30,36 **** - - - # Executable name -! PDFTOXMLEXE=pdftoxml.exe - - # Main target - all: pdftoxmlEXE ---- 30,36 ---- - - - # Executable name -! PDFTOXMLEXE=pdftoxml - - # Main target - all: pdftoxmlEXE -diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc -*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200 ---- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200 -*************** -*** 11,21 **** - // - //=========================================================================== - - #include <aconf.h> -- #include <stdio.h> - #include <stdlib.h> - #include <stddef.h> -! #include <string.h> - #include "parseargs.h" - #include "GString.h" - #include "gmem.h" ---- 11,21 ---- - // - //=========================================================================== - -+ #include <string.h> - #include <aconf.h> - #include <stdlib.h> - #include <stddef.h> -! #include <cstdio> - #include "parseargs.h" - #include "GString.h" - #include "gmem.h" diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index e9d3c45ae8b..a6b57f2b340 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.5.11"; + version = "4.6.1"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-nTLyFGnY07gDoahYe5YqSmU/URzdvRKQ1MsXt3164+c="; + hash = "sha256-4QJxYxLELBDg5GZISdO2xKzJej8F21BY+GD+KkrGXws="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index d9ccb4447b2..7560f2297cf 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -1,23 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "pe-parse"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "pe-parse"; rev = "v${version}"; - hash = "sha256-HwWlMRhpB/sa/JRyAZF7LZzkXCCyuxB+gtDAfHt7e6k="; + hash = "sha256-XegSZWRoQg6NEWuTSFI1RMvN3GbpLDrZrloPU2XdK2M="; }; - patches = [ - (fetchpatch { - url = "https://github.com/trailofbits/pe-parse/commit/eecdb3d36eb44e306398a2e66e85490f9bdcc74c.patch"; - hash = "sha256-pd6D/JMctiQqJxnJU9Nm/GDVf4/CaIGeXx1UfdcCupo="; - }) - ]; - nativeBuildInputs = [ cmake ]; doInstallCheck = true; @@ -28,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A principled, lightweight parser for Windows portable executable files"; homepage = "https://github.com/trailofbits/pe-parse"; + changelog = "https://github.com/trailofbits/pe-parse/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ arturcygan ]; mainProgram = "dump-pe"; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index fc0afbe2184..a94234aec41 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -58,9 +58,7 @@ stdenv.mkDerivation rec { qttools ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; meta = with lib; { homepage = "https://phonon.kde.org/"; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 42923d4f026..a50a07dde1a 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -28,9 +28,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; meta = with lib; { homepage = "https://community.kde.org/Phonon"; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 59d9e19556a..dc95b4ed826 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-fPIC"; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 33ca0326727..92b6ae003fc 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; - homepage = "http://nhartland.github.io/APFELgrid/"; + homepage = "https://nhartland.github.io/APFELgrid/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index b3ba508220f..589233a1959 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.6.4"; + version = "2.4.7.1"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-SciTMPGQPvcH08XXnBanxabyyQ/CkOIDTuODSAlInlc="; + hash = "sha256-HIMEp3cqxrmRlfEwA3jG4930rQfIXWSgRQVlKruKVfk="; }; prePatch = '' diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index f0caef03348..f803bea98f6 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -16,11 +16,11 @@ in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "sha256-JI87WzbddzhEy+c9UfYIkUWDNLmGsll1TFnb9Lvx1SU="; + sha256 = "sha256-WH+qZVbMVMzYmtNUIUYbR2HXgJvBei5y9QNNrqFCIys="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 8628ca87699..fdfc713d53a 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { hash = "sha256-dbPz1BnKY4jR/S7A7afh+Q8yS5lszwWR9IpdLijczBM="; }; - latex = texlive.combine { inherit (texlive) - scheme-basic + latex = texliveBasic.withPackages (ps: with ps; [ collection-pstricks collection-fontsrecommended l3kernel @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { xcolor xkeyval xstring - ;}; + ]); nativeBuildInputs = [ rsync makeWrapper ]; buildInputs = [ hepmc imagemagick python3 latex python3.pkgs.yoda ]; diff --git a/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/development/libraries/piper-phonemize/default.nix index fd1c1ae34b4..b08495cae74 100644 --- a/pkgs/development/libraries/piper-phonemize/default.nix +++ b/pkgs/development/libraries/piper-phonemize/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch # build , cmake @@ -17,24 +18,28 @@ let src = fetchFromGitHub { owner = "rhasspy"; repo = "espeak-ng"; - rev = "61504f6b76bf9ebbb39b07d21cff2a02b87c99ff"; - hash = "sha256-RBHL11L5uazAFsPFwul2QIyJREXk9Uz8HTZx9JqmyIQ="; + rev = "0f65aa301e0d6bae5e172cc74197d32a6182200f"; + hash = "sha256-2V0D3QO+v9OqffpNmwJQd3NIBd/IFeLkjaJ3Y0HHw7E="; }; patches = [ + (fetchpatch { + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; + }) ./espeak-mbrola.patch ]; }); in stdenv.mkDerivation rec { pname = "piper-phonemize"; - version = "1.1.0"; + version = "2023.11.14-4"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper-phonemize"; - rev = "refs/tags/v${version}"; - hash = "sha256-cMer7CSLOXv3jc9huVA3Oy5cjXjOX9XuEXpIWau1BNQ="; + rev = "refs/tags/${version}"; + hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0="; }; nativeBuildInputs = [ @@ -42,6 +47,11 @@ stdenv.mkDerivation rec { pkg-config ]; + cmakeFlags = [ + "-DONNXRUNTIME_DIR=${onnxruntime.dev}" + "-DESPEAK_NG_DIR=${espeak-ng'}" + ]; + buildInputs = [ espeak-ng' onnxruntime diff --git a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch b/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch deleted file mode 100644 index fab89c4ffd9..00000000000 --- a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 99a4b2d1..d4a4cda7 100644 ---- a/meson.build -+++ b/meson.build -@@ -55,7 +55,7 @@ endif - - spa_plugindir = pipewire_libdir / spa_name - --alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' -+alsadatadir = pipewire_libdir / '..' / 'share' / 'alsa-card-profile' / 'mixer' - - pipewire_headers_dir = pipewire_name / 'pipewire' - diff --git a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch deleted file mode 100644 index 230f1b30394..00000000000 --- a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index 961ae2a76..692b84dfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -179,6 +179,9 @@ option('udev', - option('udevrulesdir', - type : 'string', - description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') -+option('pipewire_pulse_prefix', -+ type : 'string', -+ description: 'Install directory for the pipewire-pulse daemon') - option('systemd-system-unit-dir', - type : 'string', - description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') -diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index d17f3794f..34afe4f1a 100644 ---- a/src/daemon/systemd/user/meson.build -+++ b/src/daemon/systemd/user/meson.build -@@ -9,7 +9,7 @@ install_data( - - systemd_config = configuration_data() - systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire') --systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse') -+systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse') - - configure_file(input : 'pipewire.service.in', - output : 'pipewire.service', diff --git a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch deleted file mode 100644 index b8d8fcb0f90..00000000000 --- a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/meson.build b/meson.build -index b6b4553b..f21c29d8 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,10 @@ pipewire_localedir = prefix / get_option('localedir') - pipewire_sysconfdir = prefix / get_option('sysconfdir') - - pipewire_configdir = pipewire_sysconfdir / 'pipewire' --pipewire_confdatadir = pipewire_datadir / 'pipewire' -+pipewire_confdatadir = get_option('pipewire_confdata_dir') -+if pipewire_confdatadir == '' -+ pipewire_confdatadir = pipewire_datadir / 'pipewire' -+endif - modules_install_dir = pipewire_libdir / pipewire_name - - if host_machine.system() == 'linux' -diff --git a/meson_options.txt b/meson_options.txt -index 9bc33fcd..e4bd2dc1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -61,6 +61,9 @@ option('jack-devel', - option('libjack-path', - description: 'Where to install the libjack.so library', - type: 'string') -+option('pipewire_confdata_dir', -+ type: 'string', -+ description: 'Directory for pipewire default configuration (defaults to /usr/share/pipewire)') - option('spa-plugins', - description: 'Enable spa plugins integration', - type: 'feature', diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch deleted file mode 100644 index ca7d351257b..00000000000 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in -index 9c885a38f..c474eb45d 100644 ---- a/src/daemon/minimal.conf.in -+++ b/src/daemon/minimal.conf.in -@@ -111,7 +111,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # <session_manager_path> - #] - - # An array of rejected paths. -@@ -359,5 +359,5 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- #@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ #@pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } - ] -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index 697bf094d..3a7b54ddd 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -142,7 +142,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # <session_manager_path> - #] - - # An array of rejected paths. -@@ -294,7 +294,7 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" -+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" - @sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] } - # - # You can optionally start the pulseaudio-server here as well -@@ -302,6 +302,6 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" -+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" - @pulse_comment@ condition = [ { exec.pipewire-pulse = null } { exec.pipewire-pulse = true } ] } - ] diff --git a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch b/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch deleted file mode 100644 index d8241a809f6..00000000000 --- a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index 56599ebd1..3bed2d3e3 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ else - endif - - spa_plugindir = pipewire_libdir / spa_name --spa_datadir = pipewire_datadir / spa_name -+spa_datadir = pipewire_libdir / spa_name - - alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index fdc514c286b..3876a5c892a 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -23,6 +23,7 @@ , vulkan-headers , vulkan-loader , webrtc-audio-processing +, webrtc-audio-processing_1 , ncurses , readline # meson can't find <7 as those versions don't have a .pc file , lilv @@ -42,10 +43,11 @@ , bluez , sbc , libfreeaptx -, ldacbt , liblc3 , fdk_aac , libopus +, ldacbtSupport ? bluezSupport && lib.meta.availableOn stdenv.hostPlatform ldacbt +, ldacbt , nativeHspSupport ? true , nativeHfpSupport ? true , nativeModemManagerSupport ? true @@ -68,19 +70,21 @@ , tinycompress , ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado +, libselinux }: +# Bluetooth codec only makes sense if general bluetooth enabled +assert ldacbtSupport -> bluezSupport; + let mesonEnableFeature = b: if b then "enabled" else "disabled"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.79"; + version = "0.3.84"; outputs = [ "out" - "lib" - "pulse" "jack" "dev" "doc" @@ -93,24 +97,14 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-pqs991pMqz3IQE+NUk0VNzZS4ExwfoZqBQDWBSGdWcs="; + sha256 = "sha256-9W9y+wtS/CYUaPRrCRmRDeyvuS1XllMBNQLy6GAMqBM="; }; patches = [ - # Break up a dependency cycle between outputs. - ./0040-alsa-profiles-use-libdir.patch - # Change the path of the pipewire-pulse binary in the service definition. - ./0050-pipewire-pulse-path.patch # Load libjack from a known location ./0060-libjack-path.patch # Move installed tests into their own output. ./0070-installed-tests-path.patch - # Add option for changing the config install directory - ./0080-pipewire-config-dir.patch - # Remove output paths from the comments in the config templates to break dependency cycles - ./0090-pipewire-config-template-paths.patch - # Place SPA data files in lib output to avoid dependency cycles - ./0095-spa-data-dir.patch ]; strictDeps = true; @@ -131,6 +125,7 @@ let glib libjack2 libusb1 + libselinux libsndfile lilv ncurses @@ -138,13 +133,14 @@ let udev vulkan-headers vulkan-loader - webrtc-audio-processing tinycompress ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) + ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals libcameraSupport [ libcamera libdrm ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt liblc3 sbc fdk_aac libopus ] + ++ lib.optionals bluezSupport [ bluez libfreeaptx liblc3 sbc fdk_aac libopus ] + ++ lib.optional ldacbtSupport ldacbt ++ lib.optional nativeModemManagerSupport modemmanager ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi @@ -162,9 +158,7 @@ let "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=enabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dlibv4l2-path=${placeholder "out"}/lib" "-Dlibcamera=${mesonEnableFeature libcameraSupport}" "-Dlibffado=${mesonEnableFeature ffadoSupport}" "-Droc=${mesonEnableFeature rocSupport}" @@ -173,7 +167,6 @@ let "-Dgstreamer=${mesonEnableFeature gstreamerSupport}" "-Dsystemd-system-service=${mesonEnableFeature enableSystemd}" "-Dudev=${mesonEnableFeature (!enableSystemd)}" - "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" "-Dffmpeg=${mesonEnableFeature ffmpegSupport}" "-Dbluez5=${mesonEnableFeature bluezSupport}" "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}" @@ -184,8 +177,8 @@ let # source code is not easily obtainable "-Dbluez5-codec-lc3plus=disabled" "-Dbluez5-codec-lc3=${mesonEnableFeature bluezSupport}" + "-Dbluez5-codec-ldac=${mesonEnableFeature ldacbtSupport}" "-Dsysconfdir=/etc" - "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" "-Dsession-managers=" "-Dvulkan=enabled" @@ -209,15 +202,6 @@ let ''; postInstall = '' - ${lib.optionalString enableSystemd '' - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" - ''} - - rm $out/bin/pipewire-pulse - mkdir -p $pulse/bin - ln -sf $out/bin/pipewire $pulse/bin/pipewire-pulse - moveToOutput "bin/pw-jack" "$jack" ''; diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 4e249459d7a..37dea2ece86 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -2,31 +2,29 @@ , stdenv , fetchFromGitLab , nix-update-script -, # base build deps - meson +# base build deps +, meson , pkg-config , ninja -, # docs build deps - python3 +# docs build deps +, python3 , doxygen , graphviz -, # GI build deps - gobject-introspection -, # runtime deps - glib +# GI build deps +, gobject-introspection +# runtime deps +, glib , systemd , lua5_4 , pipewire -, # options - enableDocs ? true +# options +, enableDocs ? true , enableGI ? true }: -let - mesonEnableFeature = b: if b then "enabled" else "disabled"; -in + stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.14"; + version = "0.4.15"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-PKS+WErdZuSU4jrFHQcRbnZIHlnlv06R6ZxIAIBptko="; + hash = "sha256-VwzpPAVfoaV47O7OjXtPQj5s8zfH5rkB22Pdlg7u5Fg="; }; nativeBuildInputs = [ @@ -48,9 +46,9 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals (enableDocs || enableGI) [ doxygen - (python3.pythonForBuild.withPackages (ps: with ps; - lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ - lib.optionals enableGI [ lxml ] + (python3.pythonOnBuildForHost.withPackages (ps: with ps; + lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] + ++ lib.optionals enableGI [ lxml ] )) ]; @@ -62,13 +60,13 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dsystem-lua=true" - "-Delogind=disabled" - "-Ddoc=${mesonEnableFeature enableDocs}" - "-Dintrospection=${mesonEnableFeature enableGI}" - "-Dsystemd-system-service=true" - "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" - "-Dsysconfdir=/etc" + (lib.mesonBool "system-lua" true) + (lib.mesonEnable "elogind" false) + (lib.mesonEnable "doc" enableDocs) + (lib.mesonEnable "introspection" enableGI) + (lib.mesonBool "systemd-system-service" true) + (lib.mesonOption "systemd-system-unit-dir" "${placeholder "out"}/lib/systemd/system") + (lib.mesonOption "sysconfdir" "/etc") ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 1f16ba86b3b..f5fb65f7989 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, flex, libevent, hwloc, munge, zlib, pandoc +, libtool, python3, flex, libevent, hwloc, munge, zlib, pandoc, gitMinimal } : stdenv.mkDerivation rec { pname = "pmix"; - version = "3.2.4"; + version = "5.0.1"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "sha256-79zTZm549VRsqeziCuBT6l4jTJ6D/gZaMAvgHZm7jn4="; + hash = "sha256-ZuuzQ8j5zqQ/9mBFEODAaoX9/doWB9Nt9Sl75JkJyqU="; + fetchSubmodules = true; }; postPatch = '' @@ -18,20 +19,35 @@ stdenv.mkDerivation rec { patchShebangs ./config ''; - nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ]; + nativeBuildInputs = [ + pandoc + perl + autoconf + automake + libtool + flex + gitMinimal + python3 + ]; buildInputs = [ libevent hwloc munge zlib ]; configureFlags = [ - "--with-libevent=${libevent.dev}" + "--with-libevent=${lib.getDev libevent}" + "--with-libevent-libdir=${lib.getLib libevent}/lib" "--with-munge=${munge}" - "--with-hwloc=${hwloc.dev}" + "--with-hwloc=${lib.getDev hwloc}" + "--with-hwloc-libdir=${lib.getLib hwloc}/lib" ]; preConfigure = '' ./autogen.pl ''; + postInstall = '' + find $out/lib/ -name "*.la" -exec rm -f \{} \; + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 1459d605acb..b3037c463e5 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { owner = "pocoproject"; repo = "poco"; - sha256 = "sha256-gQ97fkoTGI6yuMPjEsITfapH9FSQieR8rcrPR1nExxc="; + sha256 = "sha256-2macXa2pi5FebSrTIfSQbIiafNCXczNQEP+PFbFxylw="; rev = "poco-${version}-release"; }; diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix index 96fe45ddc2e..dbbd5c86b96 100644 --- a/pkgs/development/libraries/podofo/0.10.x.nix +++ b/pkgs/development/libraries/podofo/0.10.x.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-Y5dpx0otX14Jig/O/oq+Sfdcia1a0bhT/6k8nwg+k5o="; + hash = "sha256-BHTfidLn738f9kVIgzRTR4vY6fx5JPPtYNKvD7klyGw="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index a00b6bb07a5..80badcdd4db 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -25,7 +25,7 @@ , systemdMinimal , elogind , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, @@ -39,7 +39,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "122"; + version = "123"; outputs = [ "bin" "dev" "out" ]; # small man pages in $bin @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { owner = "polkit"; repo = "polkit"; rev = version; - sha256 = "fLY8i8h4McAnwVt8dLOqbyHM7v3SkbWqATz69NkUudU="; + hash = "sha256-/kjWkh6w2FYgtYWzw3g3GlWJKKpkJ3cqwfE0iDqJctw="; }; patches = [ @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ dbus - (python3.pythonForBuild.withPackages (pp: with pp; [ + (python3.pythonOnBuildForHost.withPackages (pp: with pp; [ dbus-python (python-dbusmock.overridePythonAttrs (attrs: { # Avoid dependency cycle. @@ -181,7 +181,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www.freedesktop.org/wiki/Software/polkit"; + homepage = "https://gitlab.freedesktop.org/polkit/polkit/"; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3774a3e05dc..d2af5d9e1e9 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,7 +4,6 @@ , fetchFromGitLab , cairo , cmake -, pcre , boost , cups-filters , curl @@ -20,11 +19,11 @@ , pkg-config , python3 , scribus -, texlive , zlib , withData ? true, poppler_data , qt5Support ? false, qt6Support ? false, qtbase ? null , introspectionSupport ? false, gobject-introspection ? null +, gpgmeSupport ? false, gpgme ? null , utils ? false, nss ? null , minimal ? false , suffix ? "glib" @@ -47,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.11.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg="; + hash = "sha256-+ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w="; }; nativeBuildInputs = [ @@ -65,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ boost - pcre libiconv libintl ] ++ lib.optionals withData [ @@ -88,6 +86,8 @@ stdenv.mkDerivation (finalAttrs: rec { qtbase ] ++ lib.optionals introspectionSupport [ gobject-introspection + ] ++ lib.optionals gpgmeSupport [ + gpgme ]; cmakeFlags = [ @@ -95,9 +95,13 @@ stdenv.mkDerivation (finalAttrs: rec { (mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "CPP") (mkFlag (!minimal) "LIBCURL") + (mkFlag (!minimal) "LCMS") + (mkFlag (!minimal) "LIBTIFF") + (mkFlag (!minimal) "NSS3") (mkFlag utils "UTILS") (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") + (mkFlag gpgmeSupport "GPGME") ] ++ lib.optionals finalAttrs.doCheck [ "-DTESTDATADIR=${testData}" ]; @@ -110,13 +114,24 @@ stdenv.mkDerivation (finalAttrs: rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + # Work around gpgme trying to write to $HOME during qt5 and qt6 tests: + preCheck = lib.optionalString gpgmeSupport '' + HOME_orig="$HOME" + export HOME="$(mktemp -d)" + ''; + + postCheck = lib.optionalString gpgmeSupport '' + export HOME="$HOME_orig" + unset -v HOME_orig + ''; + doCheck = true; passthru = { inherit testData; tests = { # These depend on internal poppler code that frequently changes. - inherit inkscape cups-filters texlive scribus; + inherit inkscape cups-filters scribus; }; }; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 589cf7cdf95..a109aad97b9 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "190700_20210406"; src = fetchurl { - url = "http://files.portaudio.com/archives/pa_stable_v${version}.tgz"; + url = "https://files.portaudio.com/archives/pa_stable_v${version}.tgz"; sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable cross-platform Audio API"; - homepage = "http://www.portaudio.com/"; + homepage = "https://www.portaudio.com/"; # Not exactly a bsd license, but alike license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index c9b456ba831..d49f3e6bd53 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation { sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; })]; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/PIP_Tree.cc \ + --replace "std::auto_ptr" "std::unique_ptr" + substituteInPlace src/Powerset_inlines.hh src/Pointset_Powerset_inlines.hh \ + --replace "std::mem_fun_ref" "std::mem_fn" + ''; + nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; diff --git a/pkgs/development/libraries/pplite/default.nix b/pkgs/development/libraries/pplite/default.nix new file mode 100644 index 00000000000..c9c0d186338 --- /dev/null +++ b/pkgs/development/libraries/pplite/default.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, fetchurl, flint, gmp }: + +stdenv.mkDerivation { + pname = "pplite"; + version = "0.11"; + + src = fetchurl { + url = "https://github.com/ezaffanella/PPLite/raw/main/releases/pplite-0.11.tar.gz"; + hash = "sha256-6IS5zVab8X+gnhK8/qbPH5FODFaG6vIsIG9TTEpfHEI="; + }; + + buildInputs = [ flint gmp ]; + + meta = { + homepage = "https://github.com/ezaffanella/PPLite"; + description = "Convex polyhedra library for Abstract Interpretation"; + license = lib.licenses.gpl3Only; + }; +} diff --git a/pkgs/development/libraries/protobuf/21.nix b/pkgs/development/libraries/protobuf/21.nix new file mode 100644 index 00000000000..09a8c81b3d1 --- /dev/null +++ b/pkgs/development/libraries/protobuf/21.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "21.12"; + hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; +} // args) diff --git a/pkgs/development/libraries/protobuf/23.nix b/pkgs/development/libraries/protobuf/23.nix new file mode 100644 index 00000000000..abb2cc2f446 --- /dev/null +++ b/pkgs/development/libraries/protobuf/23.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "23.4"; + hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; +} // args) diff --git a/pkgs/development/libraries/protobuf/24.nix b/pkgs/development/libraries/protobuf/24.nix new file mode 100644 index 00000000000..6741b8afe52 --- /dev/null +++ b/pkgs/development/libraries/protobuf/24.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "24.4"; + hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; +} // args) diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix deleted file mode 100644 index 7ee378d8ed3..00000000000 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3.nix ({ - version = "3.19.6"; - sha256 = "sha256-+ul9F8tyrwk2p25Dd9ragqwpYzdxdeGjpXhLAwKYWfM="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix deleted file mode 100644 index fe85be8cf02..00000000000 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.21.12"; - sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.23.nix b/pkgs/development/libraries/protobuf/3.23.nix deleted file mode 100644 index 2d658d57419..00000000000 --- a/pkgs/development/libraries/protobuf/3.23.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.23.4"; - sha256 = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.24.nix b/pkgs/development/libraries/protobuf/3.24.nix deleted file mode 100644 index 2deb155444e..00000000000 --- a/pkgs/development/libraries/protobuf/3.24.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.24.2"; - sha256 = "sha256-yVLszyVtsz1CCzeOkioL4O3mWTFKKVBUyOhwDbC5UqE="; -} // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix deleted file mode 100644 index 384d2d0decb..00000000000 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ /dev/null @@ -1,118 +0,0 @@ -# The cmake version of this build is meant to enable both cmake and .pc being exported -# this is important because grpc exports a .cmake file which also expects for protobuf -# to have been exported through cmake as well. -{ lib -, stdenv -, abseil-cpp -, buildPackages -, cmake -, fetchFromGitHub -, fetchpatch -, gtest -, zlib -, version -, sha256 - -# downstream dependencies -, python3 - -, ... -}: - -let - self = stdenv.mkDerivation { - pname = "protobuf"; - inherit version; - - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "protobuf"; - rev = "v${version}"; - inherit sha256; - }; - - # re-create submodule logic - postPatch = '' - rm -rf gmock - cp -r ${gtest.src}/googlemock third_party/gmock - cp -r ${gtest.src}/googletest third_party/ - chmod -R a+w third_party/ - - ln -s ../googletest third_party/gmock/gtest - ln -s ../gmock third_party/googletest/googlemock - ln -s $(pwd)/third_party/googletest third_party/googletest/googletest - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - patches = lib.optionals (lib.versionOlder version "3.22") [ - # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute - # https://github.com/protocolbuffers/protobuf/pull/10090 - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; - sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; - }) - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - ./static-executables-have-no-rpath.patch - ]; - - nativeBuildInputs = let - protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; - in [ - cmake - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build - buildPackages."protobuf${protobufVersion}" - ]; - - buildInputs = [ - zlib - ]; - - propagatedBuildInputs = [ - abseil-cpp - ]; - - cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; - cmakeFlags = [ - "-Dprotobuf_ABSL_PROVIDER=package" - ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ - "-Dprotobuf_BUILD_SHARED_LIBS=ON" - ] - # Tests fail to build on 32-bit platforms; fixed in 3.22 - # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optional - (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") - "-Dprotobuf_BUILD_TESTS=OFF"; - - # unfortunately the shared libraries have yet to been patched by nix, thus tests will fail - doCheck = false; - - passthru = { - tests = { - pythonProtobuf = python3.pkgs.protobuf.override(_: { - protobuf = self; - }); - }; - - inherit abseil-cpp; - }; - - meta = { - description = "Google's data interchange format"; - longDescription = '' - Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - homepage = "https://developers.google.com/protocol-buffers/"; - maintainers = with lib.maintainers; [ jonringer ]; - mainProgram = "protoc"; - }; - }; -in - self diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix new file mode 100644 index 00000000000..cf00d1d50be --- /dev/null +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -0,0 +1,114 @@ +# The cmake version of this build is meant to enable both cmake and .pc being exported +# this is important because grpc exports a .cmake file which also expects for protobuf +# to have been exported through cmake as well. +{ lib +, stdenv +, abseil-cpp +, buildPackages +, cmake +, fetchFromGitHub +, fetchpatch +, gtest +, zlib +, version +, hash + + # downstream dependencies +, python3 +, grpc +, enableShared ? !stdenv.hostPlatform.isStatic + +, ... +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "protobuf"; + inherit version; + + src = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "protobuf"; + rev = "v${version}"; + inherit hash; + }; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; + + patches = lib.optionals (lib.versionOlder version "22") [ + # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute + # https://github.com/protocolbuffers/protobuf/pull/10090 + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; + hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + }) + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + ./static-executables-have-no-rpath.patch + ]; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf_${lib.versions.major version}" + ]; + + buildInputs = [ + gtest + zlib + ]; + + propagatedBuildInputs = [ + abseil-cpp + ]; + + strictDeps = true; + + cmakeDir = if lib.versionOlder version "22" then "../cmake" else null; + cmakeFlags = [ + "-Dprotobuf_USE_EXTERNAL_GTEST=ON" + "-Dprotobuf_ABSL_PROVIDER=package" + ] ++ lib.optionals enableShared [ + "-Dprotobuf_BUILD_SHARED_LIBS=ON" + ] + # Tests fail to build on 32-bit platforms; fixed in 22.x + # https://github.com/protocolbuffers/protobuf/issues/10418 + ++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [ + "-Dprotobuf_BUILD_TESTS=OFF" + ]; + + # FIXME: investigate. 24.x and 23.x have different errors. + # At least some of it is not reproduced on some other machine; example: + # https://hydra.nixos.org/build/235677717/nixlog/4/tail + # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms + # https://github.com/protocolbuffers/protobuf/issues/8460 + doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; + + passthru = { + tests = { + pythonProtobuf = python3.pkgs.protobuf.override (_: { + protobuf = finalAttrs.finalPackage; + }); + inherit grpc; + }; + + inherit abseil-cpp; + }; + + meta = { + description = "Google's data interchange format"; + longDescription = '' + Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + homepage = "https://protobuf.dev/"; + maintainers = with lib.maintainers; [ jonringer ]; + mainProgram = "protoc"; + }; +}) diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 378b6babd72..8c98fdbdd6f 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,9 +1,9 @@ { lib , stdenv , fetchFromGitHub -, qtbase -, qtquick1 +, fetchpatch , qmake +, qtbase , qtmultimedia , utmp }: @@ -13,39 +13,47 @@ stdenv.mkDerivation { version = "unstable-2022-01-09"; src = fetchFromGitHub { - repo = "qmltermwidget"; owner = "Swordfish90"; + repo = "qmltermwidget"; rev = "63228027e1f97c24abb907550b22ee91836929c5"; hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + ]; buildInputs = [ qtbase - qtquick1 qtmultimedia ] ++ lib.optional stdenv.isDarwin utmp; patches = [ + # Changes required to make it compatible with lomiri-terminal-app + # QML-exposed colorscheme, scrollbar & clipboard functionality + # Remove when https://github.com/Swordfish90/qmltermwidget/pull/39 merged + (fetchpatch { + name = "0001-qmltermwidget-lomiri-submissions.patch"; + url = "https://github.com/Swordfish90/qmltermwidget/compare/63228027e1f97c24abb907550b22ee91836929c5..ffc6b2b2a20ca785f93300eca93c25c4b74ece17.patch"; + hash = "sha256-1GjC2mdfP3NpePDWZaT8zvIq3vwWIZs+iQ9o01iQtD4="; + }) + # Some files are copied twice to the output which makes the build fails ./do-not-copy-artifacts-twice.patch ]; postPatch = '' substituteInPlace qmltermwidget.pro \ - --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" + --replace '$$[QT_INSTALL_QML]' '$$PREFIX/${qtbase.qtQmlPrefix}/' ''; - installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ]; - dontWrapQtApps = true; meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ OPNA2608 ]; }; } diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 838657f48bb..d80309f2b16 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.5.0"; + version = "11.6.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-lojvsCgBsT7wVRLWfkeOduEYUG7ztI/uryM0WueWiL0="; + hash = "sha256-QXRzvSMi6gKISJo44KIjTYENNqxh1yDhUUhEZa8uz6Q="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index e6e6b24360a..a2b38046c5a 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -11,8 +11,8 @@ Check for any minor version changes. , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf +, llvmPackages_15, overrideSDK, overrideLibcxx , darwin -, buildPackages # options , developerBuild ? false @@ -46,13 +46,29 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch - ./qtbase.patch.d/9999-backport-dbus-crash.patch ]; qtdeclarative = [ ./qtdeclarative.patch # prevent headaches from stale qmlcache data ./qtdeclarative-default-disable-qmlcache.patch ]; + qtlocation = lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16 + (fetchpatch { + url = "https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/"; + hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; + }) + ]; + qtmultimedia = lib.optionals stdenv.isDarwin [ + # build patch for qtmultimedia with xcode 15 + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; + stripLen = 1; + hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs="; + }) + ]; qtpim = [ ## Upstream patches after the Qt6 transition that apply without problems & fix bugs @@ -202,32 +218,24 @@ let qttools = [ ./qttools.patch ]; }; - addPackages = self: with self; + addPackages = self: let - qtModule = - import ../qtModule.nix - { - inherit perl; - inherit lib; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = - import ../mkDerivation.nix - { inherit lib; inherit debug; wrapQtAppsHook = null; } - stdenv.mkDerivation; - } - { inherit self srcs patches; }; + qtModule = callPackage ../qtModule.nix { + inherit patches; + # Use a variant of mkDerivation that does not include wrapQtApplications + # to avoid cyclic dependencies between Qt modules. + mkDerivation = + (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation; + }; callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; in { inherit callPackage qtCompatVersion qtModule srcs; - mkDerivationWith = - import ../mkDerivation.nix - { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; + mkDerivationWith = callPackage ../mkDerivation.nix { }; - mkDerivation = mkDerivationWith stdenv.mkDerivation; + mkDerivation = callPackage ({ mkDerivationWith }: mkDerivationWith stdenv.mkDerivation) { }; qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; @@ -281,6 +289,18 @@ let qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix { + # The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due + # to the following errors: + # * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned + # to be made into a hard error in a future version of clang. Patches are not available for + # the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial. + # * -Wincompatible-function-pointer-types: This is also a downgradable error generated + # starting with clang 16. Patches are available upstream that can be backported. + # Because the first error is non-trivial to fix and suppressing it risks future breakage, + # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary. + stdenv = + let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; + in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; postPatch = '' @@ -309,29 +329,33 @@ let qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; env = callPackage ../qt-env.nix {}; - full = env "qt-full-${qtbase.version}" ([ + full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}") { } + # `with self` is ok to use here because having these spliced is unnecessary + (with self; [ qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); - qmake = makeSetupHook { + qmake = callPackage ({ qtbase }: makeSetupHook { name = "qmake-hook"; - propagatedBuildInputs = [ self.qtbase.dev ]; + ${if stdenv.buildPlatform == stdenv.hostPlatform + then "propagatedBuildInputs" + else "depsTargetTargetPropagated"} = [ qtbase.dev ]; substitutions = { inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; - } ../hooks/qmake-hook.sh; + } ../hooks/qmake-hook.sh) { }; - wrapQtAppsHook = makeSetupHook { + wrapQtAppsHook = callPackage ({ makeBinaryWrapper, qtbase, qtwayland }: makeSetupHook { name = "wrap-qt5-apps-hook"; - propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ] - ++ lib.optional stdenv.isLinux self.qtwayland.dev; - } ../hooks/wrap-qt-apps-hook.sh; + propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ] + ++ lib.optional stdenv.isLinux qtwayland.dev; + } ../hooks/wrap-qt-apps-hook.sh) { }; }; baseScope = makeScopeWithSplicing' { @@ -345,6 +369,12 @@ let }); finalScope = baseScope.overrideScope(final: prev: { - qttranslations = bootstrapScope.qttranslations; + # qttranslations causes eval-time infinite recursion when + # cross-compiling; disabled for now. + qttranslations = + if stdenv.buildPlatform == stdenv.hostPlatform + then bootstrapScope.qttranslations + else null; + qutebrowser = final.callPackage ../../../../applications/networking/browsers/qutebrowser { }; }); in finalScope diff --git a/pkgs/development/libraries/qt-5/5.15/modules b/pkgs/development/libraries/qt-5/5.15/modules index d6ce8822d54..ccc7dbcb815 100644 --- a/pkgs/development/libraries/qt-5/5.15/modules +++ b/pkgs/development/libraries/qt-5/5.15/modules @@ -21,7 +21,6 @@ qtquickcontrols qtquickcontrols2 qtquicktimeline qtremoteobjects -qtscript qtscxml qtsensors qtserialbus diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch deleted file mode 100644 index e1aa0119aa2..00000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit eb0c6846a5d05d686f0686f0f1ddddcad762ad26 (HEAD -> kde/5.15) -Author: K900 <me@0upti.me> -Date: Mon Aug 14 22:44:02 2023 +0300 - - QLibraryPrivate: Actually merge load hints - - Or old and new load hints in mergeLoadHints() instead of just storing - new ones. Andjust QLibraryPrivate::setLoadHints() to handle objects - with no file name differently and just set load hints directly. - - Mention that load hints are merged once the file name is set - in the documentation for QLibrary::setLoadHints(). - - Add a regression test into tst_qfactoryloader. - - Update and extend tst_QPluginLoader::loadHints() to take into account - load hints merging. - - Fixes: QTBUG-114480 - Change-Id: I3b9afaec7acde1f5ff992d913f8d7217392c7e00 - Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - -diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp -index 5d2f024267..45b5a3fe27 100644 ---- a/src/corelib/plugin/qlibrary.cpp -+++ b/src/corelib/plugin/qlibrary.cpp -@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) - if (pHnd.loadRelaxed()) - return; - -- loadHintsInt.storeRelaxed(lh); -+ loadHintsInt.fetchAndOrRelaxed(lh); - } - - QFunctionPointer QLibraryPrivate::resolve(const char *symbol) -@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) - - void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) - { -+ // Set the load hints directly for a dummy if this object is not associated -+ // with a file. Such object is not shared between multiple instances. -+ if (fileName.isEmpty()) { -+ loadHintsInt.storeRelaxed(lh); -+ return; -+ } -+ - // this locks a global mutex - QMutexLocker lock(&qt_library_mutex); - mergeLoadHints(lh); -@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const - lazy symbol resolution, and will not export external symbols for resolution - in other dynamically-loaded libraries. - -+ \note Hints can only be cleared when this object is not associated with a -+ file. Hints can only be added once the file name is set (\a hints will -+ be or'ed with the old hints). -+ - \note Setting this property after the library has been loaded has no effect - and loadHints() will not reflect those changes. - -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index 0a63b93762..ceee5d6385 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -414,10 +414,11 @@ QString QPluginLoader::errorString() const - void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) - { - if (!d) { -- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr -+ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr - d->errorString.clear(); -+ } else { -+ d->setLoadHints(loadHints); - } -- d->setLoadHints(loadHints); - } - - QLibrary::LoadHints QPluginLoader::loadHints() const diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index f67f9d66da7..81712934971 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,207 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897", - "sha256": "0r1bicsjn4addsf0cw2vkf26kxlf8z1fh65w19gnqmcwkrr8hnja" + "rev": "c1f8fa2578d99e07f5e581f26bd532695b9534f9", + "sha256": "19wsf9capc8i5157hfp8g735scpcms329ylp0fg86j9qalg7ccwg" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "7a04a93e97390de2d91e89dc907e8240dd5a0c4f", - "sha256": "1bqy5cmimnlmgd02zpv0ipf74nx350fk0d4pm2j4pqipq1spq3bh" + "rev": "2ed4be9e852d2533b982493a26bf061b245dc106", + "sha256": "0v6fwykibl4d20sdh10inaavpzwp5ijpyw8k31078shw3hsgkqxf" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "1170e17043ff51590ccee30447bef1e43a999b0d", - "sha256": "0qhlhz7ng35mb5pmva9ivpxq1ib30dz8f1p93yil78cyl9mwqbbi" + "rev": "3d30862e761afd5fe8451857bb531b6fb8f63dc3", + "sha256": "0sq4dgk88n96wja1wp6j5swxhz8wksf1v4sibywvg7v431nfy82p" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "e24dc54b2b4054413650904288aa7a363eee23a7", - "sha256": "0gpg0avl06jbamgk5f9034cfqwyifgv4nyqx49rp0r9wm2m1cgxb" + "rev": "ea7a183732c17005f08ca14fd70cdd305c90396d", + "sha256": "0lblir4zcnxc2ix9frcsygkhfs5qx7xibpflapmi6d978jjfxjmx" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "7ce22b0633eb9d1eb59854fee4f2f545e1b842e0", - "sha256": "0q173ql5xyacwb5lwyrzhgch1bbjq4mmsfwhyssm3a9phqcj083m" + "rev": "e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826", + "sha256": "1igna3qdwpaf67lhj0m743cj127hyg73ynjhadhjk3gz34h12r09" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "eeaf42bccd49e8161fbae82d110026d25a5a9a7f", - "sha256": "0daa72yizb6v28bci72fw1w8y8al0mhb9k7kxn7vg22fbb3iyksf" + "rev": "e33b82889625b6a72e0be91c5023a30d53136a80", + "sha256": "17yxmj1xd2q0a2in6aygp88bsg1vivklmzjwi97llbmvcxxvzhfn" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "d366b0aad8454355acac79eddbab445c1108b1e9", - "sha256": "15ad1cbfdwnl6lnafgd4chdsl9wnwfcqqnd2m0dwj10n2lsa3nmw" + "rev": "d7af24d26b9fbb83bf57b2b7245d280eb78e8b22", + "sha256": "1h85cn4qabva8fcr69b35cmy9c7vbk2fz8licw5ca42bq141k4kw" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "3e98cdb2780d052fce3d7a3694596a690cd76aca", - "sha256": "15fn0zjfz7jnjgc7m368sna2mvhcp33r85r2kwc9hy7zkp1is6a1" + "rev": "1b0e366092bcfae0392592c3b7891f0e47af1018", + "sha256": "0fif6gbin3clvy7rfvrs5qdjqvi3ql9yciiwdbm7z0by2kzz1qsg" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "9dfbbfb9971db22d51eb40d6636583df5913be01", - "sha256": "1l192k1w5mjw14zq3h3pjb3m0zl56fhgxdjfxhmbncjx0ym98wzr" + "rev": "c8af0c56f1765302f8bdf874dfacb11c4e0bf4e3", + "sha256": "161wm1pq732nnbx8jbmiv1g1ziqzjwy48dpasy3zgj4i83qyvdas" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "f90bd729eb70d4a0770efed3f9bb1b6dbe67d37c", - "sha256": "1vbfmyb51lv3ms0iyizi05jiba688scjwxwvyrr8qnmg4qrjqjd5" + "rev": "4b52913503e3713200265cd6bc19b301792dbf96", + "sha256": "1n5pafxarhb4rsvr18al4hyc6xmm5nhjkknrnhdldy9vz7w50bgs" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "500ae59f809877e0ada9a68601564882f2733145", - "sha256": "0p8vxp5l7iihd1xww94asnb9xv2v94p9whqbljzn6gwr56wvys5l" + "rev": "cce7d784237cd2dd4af1abe2757d048e34e02685", + "sha256": "1yvxpkfxd44z9z44mfv77lfsbgjlmxz1rilblpp8h276zc5w6l5z" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "5aa33ec870977863c400103db94da452edbaf414", - "sha256": "02i3ns2ijiiy0jfad3lxrvvlr38bgarl8246ka0y8aa8by1ih35b" + "rev": "b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd", + "sha256": "0gz1par4gkcwwbxh0g1n1lrzyjjmi53gqfmbb222gkf5k8kf0r2i" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "664701dc3acfca37500bc84ba03eed4953b684e9", - "sha256": "0nlzjksfzkjhla89warkj7c5h8z2h5ivnhnq1sw2385gfd4q5d8w" + "rev": "48a17e88fc1df5b6ae82a9787466226c830bcbf2", + "sha256": "0gn4zsf01xr0g8divixk2zpq97dnqs1cdc3q577ijczd2rcs6z4f" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "f65b6a268832fc86e1263a6597f2e369aefecd19", - "sha256": "157in9bvnd9q2jigrrl955y7d2gpj308g8mg7k19r1vaz6h4zlm7" + "rev": "909b79f4810b8ac62baa3544837793cfb132593b", + "sha256": "1bh5418nshzlgc3xf8yg1c0n70xcazr3ya9fdfn1xs3yhxdxcd8h" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "ca5e5fdca44e8e56dafaac2a5bd886cad2a5c0f5", - "sha256": "1yrk7kj5dvfcha8w0abvh8xfjn6nbl4njm1r2h2776l3sf46xd4c" + "rev": "cc717d0093d796e6bafb65892e6825f146c1d3cd", + "sha256": "1cdal8yfjwgl30fh2s5s45hy1mw70n8bfdsbx8q6j4g062dr16zd" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "78d05cfcec57a9e890cb5ddbea604f194e04315d", - "sha256": "1vf0gmf6bh3hadrrk0922dbagmvxi1il3pjiyhmz087bm80km1md" + "rev": "f587b18db4abd68cb6d4d77fbcec1b94c38d2a51", + "sha256": "16b3yaq7i0cs9sw8q5f98g9kzphy3kwy0nw6hzznnzpkmg0pgkv1" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "a0f23c6a1f11bd7c6a8e4fd34f10bdb0a35789fa", - "sha256": "0sy2s7xnq2xmqm3lcp439wn6zk6znzja489gh531mmkaj13kiqa9" + "rev": "1e3f2196bd45a5ee272b08b1d82cef29aaa89b61", + "sha256": "1jshzvsa2nnckakiybh6q7f0wdl5p04b6mymxvjzzphr0q32qn75" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "a3e675872e4b323f89b94b90b66caa945b576b2e", - "sha256": "0b6da91fja6w3mphsfydp0plcwmk8nywhd5v8irgc98v1hw114dg" + "rev": "736144c5827385000e391e9a55a0f0162b7e8112", + "sha256": "1djvj4glxc360my597g81aqjmrhk46447x5s2jj81yiflppvkbny" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "353f50a9851518eb637181c00302cd354e0ae98b", - "sha256": "1y269yamhlf46rwcvwzhdqhajyqj41xxf9x0l1nrcr4n07l4mbr8" + "rev": "f3c3c2041f4800a7fc1904771f5c6af036167dc9", + "sha256": "1xsxhx20spj50jmsqd5f2qa7kmr9rn08c22zkckhrgic73188dpg" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "0ea7cfdfbfa72d467fe542cc48ab3206c177a387", - "sha256": "1bvg32cz4x00j9333yas7cmfzx8rlhika4a9vwdikrr5a64awsl9" + "rev": "dcc90558d9c0cba41eec7df290943994289b0e87", + "sha256": "0xccglsr1c519lyfg58hj6aa34zfyxc4zff360kd84yxmp8r4y9i" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "0472a07a8f39587052216d85a7ed235c531eba2c", - "sha256": "1psal4kldwbhfgg0b234dhgm30s5q83g2krcik1p4sifrzgrry3r" + "rev": "a2d56960dd76c94a5115b5415be5ee174d377718", + "sha256": "03wikwwf329wzml59hw0mqqzqjqfp95k8bvifi21zgrnjfl8rsrr" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "4956b556ccb021e4691f314ab907ea2ebb1ca8a6", - "sha256": "0d6w36pvnk616ps7k1ykpk2ahcvn746svwmv3dxvf4capfij96rj" + "rev": "b1b4b882dabaa036c3fb73c4a879ba8efbb02ded", + "sha256": "07zaziin88y5cq9xy4dsfw2y7njs92qq00mg42350g1s6zqrlbv2" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "d10e7673218fa2b00191a82ad20cd3304a711fa6", - "sha256": "0z5dzgdr92yw3y5vx6l9r9kz81r0vvwi264la9r7j20jqb75i2a5" - }, - "qtscript": { - "url": "https://invent.kde.org/qt/qt/qtscript.git", - "rev": "4f8c35a528586541ea55bb8b3361eaa6749e52b1", - "sha256": "01jddzy51ks899mszz35lcdgmpl5czcgh5g9fb84pxdnpgaxrx9b" + "rev": "bdc316aca82769b43cb7821c10d80a1ca02b846e", + "sha256": "136izb42sdy42lr5amh343f97s59fwf3mv44dg5n8jwg0mg7s67b" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "7f276be586be79d41213a8dd05ef31144313d440", - "sha256": "0yiryqzs44nx5lg54gbs7gf5n2d5chybya71kcv0iwn48dbzy33n" + "rev": "e8727aabe55526956295407d27317ec15e12b283", + "sha256": "1gyas1prkvnmxlvb90s9qzpy1frk8c4b7n0wnjn0vkfp0cmv3w52" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "45c04582b15a9bb4be01ae99aa7fda1bbba7d0df", - "sha256": "0wp9ddna0zidl18707nrqsg8sybaggam0hmm9yxyyfnsr39wms4m" + "rev": "a41492b23cde20d1e00427d31e4637d06aea3638", + "sha256": "1p9w444bzgixw6a8qarznnr15ayn22k2limsi5mzqanf3j3bd3ml" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "b3081c36baee48b43b6285b4811dc6da451e2390", - "sha256": "167bmp5wrp9mflvzhgc2am9nnyw1vb58skdxjn7ag8jq88fhv0zz" + "rev": "c41785c9f36560722b917d373ee97eed8cc4089a", + "sha256": "05nvzh9lbkbsghpdb3q26nbxgdq5007xak8zxwd3cz9mhqy8xnyc" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "af58a4c62415fbfd997c43422acf93e2e6ab5155", - "sha256": "1ihjj7gqjy75ccf4qniilddyiknjklc88mxns6sy8wz3ymr58vfh" + "rev": "3380465d5d4977326616c5e57789a81681be650e", + "sha256": "06dzraplqhidkngl3sjb3sppqpvc8v8ahrjz06dnsh1dwj8hizh7" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "75142c77cda8ef3a5c1cae69863e963797c667b5", - "sha256": "0iaw13vx80yfcchkmrmp6n79i0i6b9rv7k69xxp3wb3l5d3n0ng0" + "rev": "3b163bfd46d96bc9ee848dcee49e9cabe6699287", + "sha256": "03d4qvxfzwcfgbjdrpq0hvnhbz8bj6diphwiywdp16kvfmp13g9f" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "37b2c764fb599c96fc415049208e871c729217c8", - "sha256": "11h0n9k6l4r97x6h1m09nzsblwmmkkj46nl80dnvjimb395d71ri" + "rev": "7d6e373c7db9c05ef586db0eb50c87cd894229ad", + "sha256": "1aw9xxfjhm14raj7nivrr1ljnqcmibbbjyrx4bawp58mqbq4as4x" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "9f7af2d08eea7c2a2a2bfe7e6a9b73d1b99f5123", - "sha256": "1vb6s9zy8nw6gd0kmk77bjvxwpnfbhaifrznp019zccckibzffsg" + "rev": "38ae810be3fb4984f75b55a16d3413e35d701af1", + "sha256": "0hc65pidlp6lnb3srr2hg3dnas3hdj9cxkp7azcndj3wi36mclwf" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "a680686754d84b91d4cc4252a2fb8af0c58f5f49", - "sha256": "1i92mk6f2ldwq12qa4wnlz52zya4nlpjm3r2vy95vkj69xi2bfk3" + "rev": "56065158ffc4cd0fd78f9edf4b21b77b969f8dbb", + "sha256": "1lyh8hryi6hgw50gz9l6qxjfb72k4a7cg10vw18iffi7yv262g0z" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "72373522141dd3206183eb5fa56ae1c36a6d4c2b", - "sha256": "1ndgy8jxn9f7dwg9kydhlbll20qdivfbvdlcxk8qpzilpccd2l3z" + "rev": "817378aa10176fd26eed36542bc657e48d9dd42e", + "sha256": "0ihgm8y19zlkp3677rp9hnzm56y74djsnpr78yk0mrbcbxv1hpwb" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "d4f650b6c29c621c58bc7b7e7c9ddcbbbc72e3b4", - "sha256": "11xqpj36mfyfhcip89i82dyclbkvs77byffax2kscv1kdj3x7w2l" + "rev": "4de268cbaf6ff3b633429577f06d3d746a3b202a", + "sha256": "1ris6yxd4igrjvjv7bnxkdr402lk1k0djalkbk5s4z8l4qpavn3y" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "74c0625337c8a8de0a465878c7e7d238e8d979ed", - "sha256": "0yz2sg8k3l88ngsgyfb6cljh8x5sicww59m447xk7yngxgyaj75m" + "rev": "f84887c1aee4ab04af375e639ae965c9ea2186a5", + "sha256": "0pn4ly4lyf0db9pfb80q45zssifjg3466hnw7ryxnm4331izvbja" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "13202e8a8c0c6d39026344b5a19a0148592160bc", - "sha256": "0gki7hc3684qhqbq7i4wa3w7szy3j6af0yfd50q2mxb1lbxjsdrx" + "rev": "ddcff45e8f2ca9f229017b3ded62327d2fb50af2", + "sha256": "1ybc94jidzqhrkm0v2daqq0nm34ydqpcgd8q4qhz9abi0ccj17s4" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "89fbe461e7091ae6a4689b7791293a06c9167776", - "sha256": "15vkh80rma5l9mrmg41vhxvqxlzqjzl8x20k33xm11lw2kjsszm5" + "rev": "d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00", + "sha256": "0pc14sd1dzrw599kdjg1309l9hf9ylp0pnyv7i6s2pyfqqq0x85r" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "7e941648610ff4033ae8f9709077edd0595364f0", - "sha256": "082w4r674fq7ks5jbh3pj3xb3sqlhn4giy7fy0h3vw170lmcqz0m" + "rev": "f078642eb9a440f6aa88f2beaf10f445de1e29bb", + "sha256": "0qak3y3qaxs6lf34y8rcp922sqd08nvag0lvl7znxm8d5b7qmnn6" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "5afc77f5347113b607ca0262505f3406e1be5bf4", - "sha256": "1a7dm0dxqq817pib1y6m0f09sc2cqd1qkfb9anznsgpmzynvfp6r" + "rev": "1bf19cc6a7972d8543485786418b6631459d3469", + "sha256": "09a6xacb0zsp44w5zz15lkh6sypy7y1xg7m1fkxj2n26wbdc2p52" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "74f81f0bfe17e5aabcebafcb0cf36f739133554c", - "sha256": "1akp4mwvfspxdq5akpyphf6p3ay0z9pzaigiiy198w9q0yvrkgl7" + "rev": "5fb2e067a38d3583684310130f5d8aad064f512f", + "sha256": "1whfsdmyihnzzy3ijh5wcbsw9ppg3s5nx2insw5yrx36iz0y054d" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "0c1dcfe344c03d48d753aeb58f139bc990f2611c", - "sha256": "1cab7y9asivdg9ypwc951pczf4ddgni60l1ajlfsprk48rypr7w1" + "rev": "5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2", + "sha256": "0613zb8lzd1i2g5kbn7h39warx7hn1z5qi28zk8l88ivpn84dx4q" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 6729c7c31af..130fcd332ba 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,25 +1,18 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.10"; - overrides = { - qtscript.version = "5.15.9"; - }; + version = "5.15.11"; mk = name: args: - let - override = overrides.${name} or {}; - in { - version = override.version or version; - src = override.src or - fetchgit { - inherit (args) url rev sha256; - fetchLFS = false; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - }; + inherit version; + src = fetchgit { + inherit (args) url rev sha256; + fetchLFS = false; + fetchSubmodules = true; + deepClone = false; + leaveDotGit = false; + }; }; in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) @@ -76,15 +69,26 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o="; }; + qtscript = rec { + version = "5.15.15"; + + src = fetchFromGitHub { + owner = "qt"; + repo = "qtscript"; + rev = "v${version}-lts"; + hash = "sha256-o2YG1m3LuG9Kq9Bqi1wRa6ceHsivK+hJR7w08NE/kBo="; + }; + }; + qtwebengine = rec { - version = "5.15.14"; + version = "5.15.15"; - src = fetchFromGitHub { - owner = "qt"; - repo = "qtwebengine"; - rev = "v${version}-lts"; - hash = "sha256-jIoNwRdr0bZ2p0UMp/KDQuwgNjhzzGlb91UGjQgT60Y="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebengine"; + rev = "v${version}-lts"; + hash = "sha256-AmW3u8D9Y8lXZu0aiuxYXNPzZ5GCXeBQGfAcgFuXAh4="; + fetchSubmodules = true; }; + }; } diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 98f9a05fac7..a90e229e688 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -1,6 +1,4 @@ -{ lib, debug, wrapQtAppsHook }: - -let inherit (lib) optional; in +{ wrapQtAppsHook }: mkDerivation: diff --git a/pkgs/development/libraries/qt-5/modules/qt3d.nix b/pkgs/development/libraries/qt-5/modules/qt3d.nix index 98d11864e45..f394ff6627e 100644 --- a/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -2,7 +2,7 @@ qtModule { pname = "qt3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 9f0feaf94e5..67e9bd5440d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -29,13 +29,18 @@ , developerBuild ? false , decryptSslTraffic ? false , testers +, buildPackages }: let debugSymbols = debug || developerBuild; + qtPlatformCross = plat: with plat; + if isLinux + then "linux-generic-g++" + else throw "Please add a qtPlatformCross entry for ${plat.config}"; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: ({ pname = "qtbase"; inherit qtCompatVersion src version; debug = debugSymbols; @@ -83,6 +88,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + # `qtbase` expects to find `cc` (with no prefix) in the + # `$PATH`, so the following is needed even if + # `stdenv.buildPlatform.canExecute stdenv.hostPlatform` + depsBuildBuild = [ buildPackages.stdenv.cc ]; + } // { + propagatedNativeBuildInputs = [ lndir ]; # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked @@ -162,6 +174,13 @@ stdenv.mkDerivation (finalAttrs: { export MAKEFLAGS+=" -j$NIX_BUILD_CORES" ./bin/syncqt.pl -version $version + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # QT's configure script will refuse to use pkg-config unless these two environment variables are set + export PKG_CONFIG_SYSROOT_DIR=/ + export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib + echo "QMAKE_LFLAGS=''${LDFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf + echo "QMAKE_CFLAGS=''${CFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf + echo "QMAKE_CXXFLAGS=''${CXXFLAGS}" >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf ''; postConfigure = '' @@ -186,21 +205,34 @@ stdenv.mkDerivation (finalAttrs: { done ''; - env.NIX_CFLAGS_COMPILE = toString ([ - "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields - ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' - ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' - ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' - ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' + env = { + NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Wno-warn=free-nonheap-object" + "-Wno-free-nonheap-object" + "-w" + ] ++ [ + ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' + ''-DLIBRESOLV_SO="${stdenv.cc.libc.out}/lib/libresolv"'' + ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' + ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optional stdenv.isLinux "-DUSE_X11" ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" ] ++ lib.optionals withGtk3 [ - ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' - ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' - ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); + ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' + ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' + ] ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + NIX_CFLAGS_COMPILE_FOR_BUILD = toString ([ + "-Wno-warn=free-nonheap-object" + "-Wno-free-nonheap-object" + "-w" + ]); + }; prefixKey = "-prefix "; @@ -209,6 +241,9 @@ stdenv.mkDerivation (finalAttrs: { # To prevent these failures, we need to override PostgreSQL detection. PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + configurePlatforms = [ ]; + } // { # TODO Remove obsolete and useless flags once the build will be totally mastered configureFlags = [ "-plugindir $(out)/$(qtPluginPrefix)" @@ -235,11 +270,16 @@ stdenv.mkDerivation (finalAttrs: { "-L" "${icu.out}/lib" "-I" "${icu.dev}/include" "-pch" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-device ${qtPlatformCross stdenv.hostPlatform}" + "-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ lib.optional debugSymbols "-debug" ++ lib.optionals developerBuild [ "-developer-build" "-no-warnings-are-errors" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-no-warnings-are-errors" ] ++ (if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] else [ @@ -381,4 +421,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.unix; }; -}) +})) diff --git a/pkgs/development/libraries/qt-5/modules/qtcharts.nix b/pkgs/development/libraries/qt-5/modules/qtcharts.nix index f5d034bcc32..75766649a40 100644 --- a/pkgs/development/libraries/qt-5/modules/qtcharts.nix +++ b/pkgs/development/libraries/qt-5/modules/qtcharts.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtcharts"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 9725b7babe0..81efb4bee04 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -2,8 +2,12 @@ qtModule { pname = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; buildInputs = lib.optional stdenv.isLinux bluez; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth ]; + propagatedBuildInputs = [ + qtbase + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ + IOBluetooth + ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix index 80a98f24be1..d79320ea139 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtdatavis3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f19074e08a0..f4249b7f950 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,8 +1,10 @@ -{ qtModule, lib, python3, qtbase, qtsvg }: +{ lib +, stdenv +, qtModule, python3, qtbase, qtsvg }: qtModule { pname = "qtdeclarative"; - qtInputs = [ qtbase qtsvg ]; + propagatedBuildInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ python3 ]; outputs = [ "out" "dev" "bin" ]; preConfigure = '' diff --git a/pkgs/development/libraries/qt-5/modules/qtdoc.nix b/pkgs/development/libraries/qt-5/modules/qtdoc.nix index 4ef4915000e..93620e42667 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdoc.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdoc.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtdoc"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 147fb0745db..39857267317 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtgamepad"; - qtInputs = [ qtbase qtdeclarative ] + propagatedBuildInputs = [ qtbase qtdeclarative ] ++ lib.optional stdenv.isDarwin GameController; buildInputs = [ ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix index c90280090b8..2fe865492e3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix +++ b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtgraphicaleffects"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 402f2ce0662..4775bb0b038 100644 --- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -1,4 +1,6 @@ -{ qtModule +{ lib +, stdenv +, qtModule , qtbase , libwebp , jasper @@ -8,6 +10,11 @@ qtModule { pname = "qtimageformats"; - qtInputs = [ qtbase ]; - propagatedBuildInputs = [ libwebp jasper libmng libtiff ]; + propagatedBuildInputs = [ + qtbase libwebp + ] ++ lib.optionals (!jasper.meta.broken) [ + jasper + ] ++ [ + libmng libtiff + ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index b5fdc918dc6..a9897648d8e 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtlocation"; - qtInputs = [ qtbase qtmultimedia ]; + propagatedBuildInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; qmakeFlags = lib.optionals stdenv.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx diff --git a/pkgs/development/libraries/qt-5/modules/qtlottie.nix b/pkgs/development/libraries/qt-5/modules/qtlottie.nix index d94c289953d..4231fcb26b1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlottie.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlottie.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtlottie"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 30e363cff59..da0f5f760bf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtmacextras"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; meta = with lib; { maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 704cb7881c7..d5dc16c5282 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -13,7 +13,7 @@ qtModule { pname = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base ] # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix index 148ed890fc9..bec5f354a23 100644 --- a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix +++ b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtnetworkauth"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtpim.nix b/pkgs/development/libraries/qt-5/modules/qtpim.nix index 702655c6e7f..01692d9f2ec 100644 --- a/pkgs/development/libraries/qt-5/modules/qtpim.nix +++ b/pkgs/development/libraries/qt-5/modules/qtpim.nix @@ -12,7 +12,7 @@ qtModule { "dev" ]; - qtInputs = [ + propagatedBuildInputs = [ qtbase qtdeclarative ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtpositioning.nix b/pkgs/development/libraries/qt-5/modules/qtpositioning.nix index 99b06bbf253..20f05997632 100644 --- a/pkgs/development/libraries/qt-5/modules/qtpositioning.nix +++ b/pkgs/development/libraries/qt-5/modules/qtpositioning.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtpositioning"; - qtInputs = [ qtbase qtdeclarative qtserialport ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix index 6c85a91fb78..3b78a2a6c87 100644 --- a/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix +++ b/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtquickcontrols"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix index a50ad9e2a30..59070629ddc 100644 --- a/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix +++ b/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtquickcontrols2"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix b/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix index a71f9e8e352..fde78848c85 100644 --- a/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix +++ b/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtremoteobjects"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; # cycle is detected in build when adding "dev" "bin" too outputs = [ "out" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtscript.nix b/pkgs/development/libraries/qt-5/modules/qtscript.nix index e7ce86b74a6..07993b72a6d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtscript.nix +++ b/pkgs/development/libraries/qt-5/modules/qtscript.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtscript"; - qtInputs = [ qtbase qttools ]; + propagatedBuildInputs = [ qtbase qttools ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtscxml.nix b/pkgs/development/libraries/qt-5/modules/qtscxml.nix index cf9af0bc754..3314934db2f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtscxml.nix +++ b/pkgs/development/libraries/qt-5/modules/qtscxml.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtscxml"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtsensors.nix b/pkgs/development/libraries/qt-5/modules/qtsensors.nix index 3fbd032b968..fdea92035b9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtsensors.nix +++ b/pkgs/development/libraries/qt-5/modules/qtsensors.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtsensors"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtserialbus.nix b/pkgs/development/libraries/qt-5/modules/qtserialbus.nix index 4fd6d7cb83c..3a7285d0a8b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialbus.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialbus.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtserialbus"; - qtInputs = [ qtbase qtserialport ]; + propagatedBuildInputs = [ qtbase qtserialport ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 93f3e130ee7..7907f91b986 100644 --- a/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtserialport"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/pkgs/development/libraries/qt-5/modules/qtspeech.nix index 371162324c0..94e66cf4004 100644 --- a/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtspeech"; - qtInputs = [ ]; + propagatedBuildInputs = [ ]; buildInputs = lib.optionals stdenv.isLinux [ speechd ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtsvg.nix b/pkgs/development/libraries/qt-5/modules/qtsvg.nix index 59c7cf67448..418c69fb2eb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtsvg.nix +++ b/pkgs/development/libraries/qt-5/modules/qtsvg.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtsvg"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtsystems.nix b/pkgs/development/libraries/qt-5/modules/qtsystems.nix index 32974bdecc6..921172c2856 100644 --- a/pkgs/development/libraries/qt-5/modules/qtsystems.nix +++ b/pkgs/development/libraries/qt-5/modules/qtsystems.nix @@ -20,7 +20,7 @@ qtModule { "bin" ]; - qtInputs = [ + propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix index bac70d146bf..37e4348ed2c 100644 --- a/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -2,7 +2,7 @@ qtModule { pname = "qttools"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # fixQtBuiltinPaths overwrites a builtin path we should keep diff --git a/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix index 77f1948dbf4..0bfc242d15b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix +++ b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtvirtualkeyboard"; - qtInputs = [ qtbase qtdeclarative qtsvg hunspell ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index edb15b0b48b..347a5cf6434 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,10 +1,10 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: +{ qtModule, qtbase, qtquickcontrols, wayland, wayland-scanner, pkg-config }: qtModule { pname = "qtwayland"; - qtInputs = [ qtbase qtquickcontrols ]; + propagatedBuildInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wayland-scanner ]; outputs = [ "out" "dev" "bin" ]; patches = [ # NixOS-specific, ensure that app_id is correctly determined for diff --git a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix b/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix index f49e9e23490..e7d6be53440 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix @@ -1,8 +1,12 @@ -{ qtModule, qtbase, qtdeclarative }: +{ lib +, stdenv +, qtModule +, qtbase +, qtdeclarative +}: qtModule { pname = "qtwebchannel"; - qtInputs = [ qtbase qtdeclarative ]; - outputs = [ "out" "dev" "bin" ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "bin" ]; } - diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1794e3f8ca6..3503067aca7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,8 +1,11 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel -, bison, flex, git, gperf, ninja, pkg-config, python, which +, bison, flex, git, gperf, ninja, pkg-config, python, which, python3 , nodejs, qtbase, perl +, buildPackages +, pkgsBuildTarget +, pkgsBuildBuild , xorg, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus, libdrm @@ -27,13 +30,45 @@ , pipewireSupport ? stdenv.isLinux , pipewire_0_2 , postPatch ? "" +, nspr +, lndir +, dbusSupport ? !stdenv.isDarwin, expat }: -qtModule { +let + # qtwebengine expects to find an executable in $PATH which runs on + # the build platform yet knows about the host `.pc` files. Most + # configury allows setting $PKG_CONFIG to point to an + # arbitrarily-named script which serves this purpose; however QT + # insists that it is named `pkg-config` with no target prefix. So + # we re-wrap the host platform's pkg-config. + pkg-config-wrapped-without-prefix = stdenv.mkDerivation { + name = "pkg-config-wrapper-without-target-prefix"; + dontUnpack = true; + dontBuild = true; + installPhase = '' + mkdir -p $out/bin + ln -s '${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' $out/bin/pkg-config + ''; + }; + + qtPlatformCross = plat: with plat; + if isLinux + then "linux-generic-g++" + else throw "Please add a qtPlatformCross entry for ${plat.config}"; + +in + +qtModule ({ pname = "qtwebengine"; - qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ bison flex git gperf ninja pkg-config python which gn nodejs + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + perl + lndir (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase) + pkgsBuildBuild.pkg-config + (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtquickcontrols) + pkg-config-wrapped-without-prefix ] ++ lib.optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -58,6 +93,12 @@ qtModule { # TODO: be more precise patchShebangs . + + # Fix compatibility with python3.11 + substituteInPlace tools/metrics/ukm/ukm_model.py \ + --replace "r'^(?i)(|true|false)$'" "r'(?i)^(|true|false)$'" + substituteInPlace tools/grit/grit/util.py \ + --replace "mode = 'rU'" "mode = 'r'" ) '' # Prevent Chromium build script from making the path to `clang` relative to @@ -103,16 +144,25 @@ qtModule { --replace "-Wl,-fatal_warnings" "" '') + postPatch; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit - "-Wno-class-memaccess" - ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [ - # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 - # TODO: investigate and fix properly - "-march=westmere" - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-elaborated-enum-base" - ]); + env = { + NIX_CFLAGS_COMPILE = + toString ( + lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-w " + ] ++ lib.optionals stdenv.cc.isGNU [ + # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit + "-Wno-class-memaccess" + ] ++ lib.optionals (stdenv.hostPlatform.gcc.arch or "" == "sandybridge") [ + # it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940 + # TODO: investigate and fix properly + "-march=westmere" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-elaborated-enum-base" + ]); + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + NIX_CFLAGS_LINK = "-Wl,--no-warn-search-mismatch"; + "NIX_CFLAGS_LINK_${buildPackages.stdenv.cc.suffixSalt}" = "-Wl,--no-warn-search-mismatch"; + }; preConfigure = '' export NINJAFLAGS=-j$NIX_BUILD_CORES @@ -120,13 +170,20 @@ qtModule { if [ -d "$PWD/tools/qmake" ]; then QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fi + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + export QMAKE_CC=$CC + export QMAKE_CXX=$CXX + export QMAKE_LINK=$CXX + export QMAKE_AR=$AR ''; qmakeFlags = [ "--" "-system-ffmpeg" ] - ++ lib.optional pipewireSupport "-webengine-webrtc-pipewire" + ++ lib.optional (pipewireSupport && stdenv.buildPlatform == stdenv.hostPlatform) "-webengine-webrtc-pipewire" ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ + qtdeclarative qtquickcontrols qtlocation qtwebchannel + # Image formats libjpeg libpng libtiff libwebp @@ -219,7 +276,9 @@ qtModule { dontUseNinjaBuild = true; dontUseNinjaInstall = true; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + mkdir -p $out/libexec + '' + lib.optionalString stdenv.isLinux '' cat > $out/libexec/qt.conf <<EOF [Paths] Prefix = .. @@ -238,21 +297,31 @@ qtModule { # qtwebengine-5.15.8: "QtWebEngine can only be built for x86, # x86-64, ARM, Aarch64, and MIPSel architectures." - platforms = - lib.trivial.pipe lib.systems.doubles.all [ - (map (double: lib.systems.elaborate { system = double; })) - (lib.lists.filter (parsedPlatform: with parsedPlatform; - isUnix && - (isx86_32 || - isx86_64 || - isAarch32 || - isAarch64 || - (isMips && isLittleEndian)))) - (map (plat: plat.system)) - ]; - broken = stdenv.isDarwin && stdenv.isx86_64; + platforms = with lib.systems.inspect.patterns; + let inherit (lib.systems.inspect) patternLogicalAnd; + in concatMap (patternLogicalAnd isUnix) (lib.concatMap lib.toList [ + isx86_32 + isx86_64 + isAarch32 + isAarch64 + (patternLogicalAnd isMips isLittleEndian) + ]); # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; }; -} + +} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + configurePlatforms = [ ]; + # to get progress output in `nix-build` and `nix build -L` + preBuild = '' + export TERM=dumb + ''; + depsBuildBuild = [ + pkgsBuildBuild.stdenv + zlib + nss + nspr + ]; + +}) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix b/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix index d8fd7a69237..b2d93300a66 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtwebglplugin"; - qtInputs = [ qtbase qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtwebsockets ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index fc1766488ec..9c5d347d110 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -22,7 +22,7 @@ let in qtModule { pname = "qtwebkit"; - qtInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] + propagatedBuildInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] ++ lib.optional stdenv.isDarwin qtmultimedia; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix b/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix index 540fcade73c..a355662aed6 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix index dccc3d6f81e..fd875539097 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtwebview"; - qtInputs = [ qtdeclarative qtwebengine ]; + propagatedBuildInputs = [ qtdeclarative qtwebengine ]; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation WebKit diff --git a/pkgs/development/libraries/qt-5/modules/qtx11extras.nix b/pkgs/development/libraries/qt-5/modules/qtx11extras.nix index ad743523bb0..8d5aa2fd235 100644 --- a/pkgs/development/libraries/qt-5/modules/qtx11extras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtx11extras.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtx11extras"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix index c602b1e39d2..ae4ea52dcd8 100644 --- a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix +++ b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtxmlpatterns"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ]; } diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index bddbf254c5f..54d24e46092 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -1,9 +1,16 @@ -{ lib, mkDerivation, perl }: +{ lib +, stdenv +, buildPackages +, mkDerivation +, perl +, qmake +, patches +, srcs +, pkgsHostTarget +}: let inherit (lib) licenses maintainers platforms; in -{ self, srcs, patches }: - args: let @@ -16,8 +23,18 @@ mkDerivation (args // { inherit pname version src; patches = (args.patches or []) ++ (patches.${pname} or []); - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; - propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); + nativeBuildInputs = + (args.nativeBuildInputs or []) ++ [ + perl qmake + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + pkgsHostTarget.qt5.qtbase.dev + ]; + propagatedBuildInputs = + (lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ + (args.propagatedBuildInputs or []); +} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { + depsBuildBuild = [ buildPackages.stdenv.cc ] ++ (args.depsBuildBuild or []); +} // { outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 0dd6cd75df0..bef3f7ef62e 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -9,6 +9,7 @@ , gst_all_1 , libglvnd , darwin +, overrideSDK , buildPackages , python3 @@ -49,11 +50,11 @@ let ./patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch - ./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch - ./patches/0008-qtbase-allow-translations-outside-prefix.patch - ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch - ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch - ./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch + ./patches/0007-qtbase-find-tools-in-PATH.patch + ./patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch + ./patches/0009-qtbase-allow-translations-outside-prefix.patch + ./patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch + ./patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch ]; }; env = callPackage ./qt-env.nix { }; @@ -65,6 +66,7 @@ let qtdatavis3d qtdeclarative qtdoc + qtgraphs qtgrpc qthttpserver qtimageformats @@ -105,15 +107,8 @@ let qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; qtdoc = callPackage ./modules/qtdoc.nix { }; - qtgrpc = callPackage ./modules/qtgrpc.nix { - patches = [ - (fetchpatch2 { - # fix compatibility with protobuf 23 - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/d6b33bd915dc6e63b30db2cd29150d55b289d7ed/protobuf-23.patch"; - hash = "sha256-KQAcrjQ3rK9pDQUOUK6AS4ej8YvtRv9WZOxby31Y5r4="; - }) - ]; - }; + qtgraphs = callPackage ./modules/qtgraphs.nix { }; + qtgrpc = callPackage ./modules/qtgrpc.nix { }; qthttpserver = callPackage ./modules/qthttpserver.nix { }; qtimageformats = callPackage ./modules/qtimageformats.nix { }; qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; @@ -147,13 +142,18 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) bootstrap_cmds cctools xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14; + inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; + qtModule = qtModule.override { + stdenv = if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + else stdenv; + }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; @@ -184,12 +184,12 @@ let # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 baseScope = lib.makeScope newScope addPackages; - bootstrapScope = baseScope.overrideScope'(final: prev: { + bootstrapScope = baseScope.overrideScope(final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; qtdeclarative = null; }); - finalScope = baseScope.overrideScope'(final: prev: { + finalScope = baseScope.overrideScope(final: prev: { qttranslations = bootstrapScope.qttranslations; }); in finalScope diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 519f2f887d1..1081cf06241 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qt3d.nix b/pkgs/development/libraries/qt-6/modules/qt3d.nix index 2f3a45f67d8..f1df7f6fc25 100644 --- a/pkgs/development/libraries/qt-6/modules/qt3d.nix +++ b/pkgs/development/libraries/qt-6/modules/qt3d.nix @@ -7,6 +7,5 @@ qtModule { pname = "qt3d"; - qtInputs = [ qtbase qtdeclarative qtmultimedia ]; - propagatedBuildInputs = [ assimp ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtmultimedia assimp ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qt5compat.nix b/pkgs/development/libraries/qt-6/modules/qt5compat.nix index f3a62b7b5ec..d2049d7fc3e 100644 --- a/pkgs/development/libraries/qt-6/modules/qt5compat.nix +++ b/pkgs/development/libraries/qt-6/modules/qt5compat.nix @@ -8,6 +8,6 @@ qtModule { pname = "qt5compat"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ libiconv icu openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtcharts.nix b/pkgs/development/libraries/qt-6/modules/qtcharts.nix index 917697c3862..e9b6c8d6b33 100644 --- a/pkgs/development/libraries/qt-6/modules/qtcharts.nix +++ b/pkgs/development/libraries/qt-6/modules/qtcharts.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtcharts"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix index 976fd626f5d..46d8f925beb 100644 --- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -11,8 +11,13 @@ qtModule { pname = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ bluez ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth PCSC ]; + propagatedBuildInputs = [ + qtbase + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ + IOBluetooth + PCSC + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix b/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix index 1d0f9711e58..e6c12508c9d 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtdatavis3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index d78a886109a..afdb24d1d29 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -8,8 +8,7 @@ qtModule { pname = "qtdeclarative"; - qtInputs = [ qtbase qtlanguageserver qtshadertools ]; - propagatedBuildInputs = [ openssl python3 ]; + propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl python3 ]; patches = [ # prevent headaches from stale qmlcache data ../patches/qtdeclarative-default-disable-qmlcache.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/pkgs/development/libraries/qt-6/modules/qtdoc.nix index 3bbe39e5ee2..555108caa01 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -14,7 +14,7 @@ qtModule { done ''; nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; cmakeFlags = [ "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS" ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtgraphs.nix b/pkgs/development/libraries/qt-6/modules/qtgraphs.nix new file mode 100644 index 00000000000..5cafb8d8d7f --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtgraphs.nix @@ -0,0 +1,16 @@ +{ qtModule +, qtbase +, qtdeclarative +, qtquick3d +, qtquicktimeline +}: + +qtModule { + pname = "qtgraphs"; + propagatedBuildInputs = [ + qtbase + qtdeclarative + qtquick3d + qtquicktimeline + ]; +} diff --git a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix index 877dd2371c2..09ff7ee8919 100644 --- a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix @@ -3,12 +3,10 @@ , qtdeclarative , protobuf , grpc -, patches ? [] }: qtModule { pname = "qtgrpc"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ protobuf grpc ]; - inherit patches; } diff --git a/pkgs/development/libraries/qt-6/modules/qthttpserver.nix b/pkgs/development/libraries/qt-6/modules/qthttpserver.nix index cd2c9d2a803..cf32c8a7ea7 100644 --- a/pkgs/development/libraries/qt-6/modules/qthttpserver.nix +++ b/pkgs/development/libraries/qt-6/modules/qthttpserver.nix @@ -5,5 +5,5 @@ qtModule { pname = "qthttpserver"; - qtInputs = [ qtbase qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtwebsockets ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtimageformats.nix b/pkgs/development/libraries/qt-6/modules/qtimageformats.nix index b28adbc7295..50420aaa7e4 100644 --- a/pkgs/development/libraries/qt-6/modules/qtimageformats.nix +++ b/pkgs/development/libraries/qt-6/modules/qtimageformats.nix @@ -8,6 +8,6 @@ qtModule { pname = "qtimageformats"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; buildInputs = [ libwebp jasper libmng libtiff ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix b/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix index 07115d6755a..b45ab11fc3f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix +++ b/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix @@ -4,7 +4,7 @@ qtModule { pname = "qtlanguageserver"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; # Doesn't have version set dontCheckQtModuleVersion = true; diff --git a/pkgs/development/libraries/qt-6/modules/qtlocation.nix b/pkgs/development/libraries/qt-6/modules/qtlocation.nix index 751a2e0915a..12fa89b9aae 100644 --- a/pkgs/development/libraries/qt-6/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-6/modules/qtlocation.nix @@ -6,5 +6,5 @@ qtModule { pname = "qtlocation"; - qtInputs = [ qtbase qtdeclarative qtpositioning ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtpositioning ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtlottie.nix b/pkgs/development/libraries/qt-6/modules/qtlottie.nix index d94c289953d..4231fcb26b1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtlottie.nix +++ b/pkgs/development/libraries/qt-6/modules/qtlottie.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtlottie"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 43c6dade7de..5608a9a9156 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,12 @@ qtModule rec { pname = "qtmqtt"; - version = "6.5.2"; + version = "6.6.0"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0="; + hash = "sha256-rFi1w0Z4jLvHvhu0/VOIT0MWmKjy51jSK5M56qLs0gI="; }; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index cb012ee8bef..538687dce58 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -22,12 +22,11 @@ qtModule { pname = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libunwind orc ] ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ]; - propagatedBuildInputs = - lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ] + ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin diff --git a/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix index 148ed890fc9..bec5f354a23 100644 --- a/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix +++ b/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtnetworkauth"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtpositioning.nix b/pkgs/development/libraries/qt-6/modules/qtpositioning.nix index 99b06bbf253..20f05997632 100644 --- a/pkgs/development/libraries/qt-6/modules/qtpositioning.nix +++ b/pkgs/development/libraries/qt-6/modules/qtpositioning.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtpositioning"; - qtInputs = [ qtbase qtdeclarative qtserialport ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix index d19a8e725a1..1c84856c0c1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix @@ -6,6 +6,6 @@ qtModule { pname = "qtquick3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix index 34c17fc0345..05d121cd9b7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -7,7 +7,7 @@ qtModule { pname = "qtquick3dphysics"; - qtInputs = [ qtbase qtquick3d ]; + propagatedBuildInputs = [ qtbase qtquick3d ]; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-faligned-allocation"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix b/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix index c86fc92218f..213814a017e 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtquickeffectmaker"; - qtInputs = [ qtbase qtquick3d ]; + propagatedBuildInputs = [ qtbase qtquick3d ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix b/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix index 7458515dba2..9ac9c1f0939 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtquicktimeline"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix b/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix index 888ec33b461..1fd3b1b7a25 100644 --- a/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix +++ b/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtremoteobjects"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtscxml.nix b/pkgs/development/libraries/qt-6/modules/qtscxml.nix index c49064c5e57..ece975f59e8 100644 --- a/pkgs/development/libraries/qt-6/modules/qtscxml.nix +++ b/pkgs/development/libraries/qt-6/modules/qtscxml.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtscxml"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtsensors.nix b/pkgs/development/libraries/qt-6/modules/qtsensors.nix index 73ddc394cc4..bc49c7a77f5 100644 --- a/pkgs/development/libraries/qt-6/modules/qtsensors.nix +++ b/pkgs/development/libraries/qt-6/modules/qtsensors.nix @@ -6,5 +6,5 @@ qtModule { pname = "qtsensors"; - qtInputs = [ qtbase qtdeclarative qtsvg ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtserialbus.nix b/pkgs/development/libraries/qt-6/modules/qtserialbus.nix index 4fd6d7cb83c..3a7285d0a8b 100644 --- a/pkgs/development/libraries/qt-6/modules/qtserialbus.nix +++ b/pkgs/development/libraries/qt-6/modules/qtserialbus.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtserialbus"; - qtInputs = [ qtbase qtserialport ]; + propagatedBuildInputs = [ qtbase qtserialport ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtserialport.nix b/pkgs/development/libraries/qt-6/modules/qtserialport.nix index 2d23ae17cc5..27b9eb9c191 100644 --- a/pkgs/development/libraries/qt-6/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-6/modules/qtserialport.nix @@ -8,7 +8,6 @@ qtModule { pname = "qtserialport"; - qtInputs = [ qtbase ]; nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ udev ]; + propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ udev ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtshadertools.nix b/pkgs/development/libraries/qt-6/modules/qtshadertools.nix index 47102896f7e..5a4b894b9ab 100644 --- a/pkgs/development/libraries/qt-6/modules/qtshadertools.nix +++ b/pkgs/development/libraries/qt-6/modules/qtshadertools.nix @@ -4,5 +4,5 @@ qtModule { pname = "qtshadertools"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix index ec713bc98c6..77c08fa9195 100644 --- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix @@ -12,8 +12,8 @@ qtModule { pname = "qtspeech"; - qtInputs = [ qtbase qtmultimedia ]; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa ]; + propagatedBuildInputs = [ qtbase qtmultimedia ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtsvg.nix b/pkgs/development/libraries/qt-6/modules/qtsvg.nix index 9031f8805ac..699b35b2704 100644 --- a/pkgs/development/libraries/qt-6/modules/qtsvg.nix +++ b/pkgs/development/libraries/qt-6/modules/qtsvg.nix @@ -5,11 +5,21 @@ , libmng , zlib , pkg-config +, fetchpatch2 }: qtModule { pname = "qtsvg"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; buildInputs = [ libwebp jasper libmng zlib ]; nativeBuildInputs = [ pkg-config ]; + patches = [ + # Fix nullptr dereference with invalid SVG + # https://bugreports.qt.io/projects/QTBUG/issues/QTBUG-117944 + (fetchpatch2 { + name = "QTBUG-117944.patch"; + url = "https://code.qt.io/cgit/qt/qtsvg.git/patch/?id=edc8ca7f"; + hash = "sha256-kBQYlQqPb0QkRhatQyaGdxE1Y5zHd6/ZEd5zn0gRVoM="; + }) + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index adca87550cc..a1aa1026e57 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -15,14 +15,21 @@ qtModule { llvmPackages.libclang llvmPackages.llvm ]; - qtInputs = [ qtbase qtdeclarative ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ cups ]; + propagatedBuildInputs = [ qtbase qtdeclarative ] + ++ lib.optionals stdenv.isDarwin [ cups ]; patches = [ ../patches/qttools-paths.patch ]; env.NIX_CFLAGS_COMPILE = toString [ "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\"" ]; + postPatch = '' + substituteInPlace \ + src/qdoc/catch/CMakeLists.txt \ + src/qdoc/catch_generators/CMakeLists.txt \ + src/qdoc/catch_conversions/CMakeLists.txt \ + --replace ''\'''${CMAKE_INSTALL_INCLUDEDIR}' "$out/include" + ''; postInstall = '' mkdir -p "$dev" ln -s "$out/bin" "$dev/bin" diff --git a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix index 9c53f11e1a3..9f067900dc0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix +++ b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix @@ -8,7 +8,6 @@ qtModule { pname = "qtvirtualkeyboard"; - qtInputs = [ qtbase qtdeclarative qtsvg ]; - propagatedBuildInputs = [ hunspell ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index e28cdb438e5..94f3b80e9c3 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -1,15 +1,23 @@ { qtModule , qtbase -, qtquick3d , qtdeclarative , wayland , pkg-config , libdrm +, fetchpatch }: qtModule { pname = "qtwayland"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; + patches = [ + # Fix a freezing bug with fcitx5. + # https://codereview.qt-project.org/c/qt/qtwayland/+/517601 + (fetchpatch { + url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=6fe83f6076423068b652fa4fcb0b5adbd297f2a8"; + hash = "sha256-TlZozKezpYm90B9qFP9qv76asRdIt+5bq9E3GcmFiDc="; + }) + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix b/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix index 49b959c5dea..bf0ba0f6338 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix @@ -7,6 +7,6 @@ qtModule { pname = "qtwebchannel"; - qtInputs = [ qtbase qtdeclarative qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtwebsockets ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 5d9aa71e853..4b4172897e0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -60,7 +60,6 @@ , mesa , enableProprietaryCodecs ? true # darwin -, llvmPackages_14 , bootstrap_cmds , cctools , xcbuild @@ -93,7 +92,6 @@ qtModule { pname = "qtwebengine"; - qtInputs = [ qtdeclarative qtwebchannel qtwebsockets qtpositioning ]; nativeBuildInputs = [ bison coreutils @@ -107,7 +105,6 @@ qtModule { gn nodejs ] ++ lib.optionals stdenv.isDarwin [ - llvmPackages_14.clang bootstrap_cmds cctools xcbuild @@ -166,7 +163,7 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure.cmake \ + substituteInPlace configure.cmake src/gn/CMakeLists.txt \ --replace "AppleClang" "Clang" substituteInPlace cmake/Functions.cmake \ --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" @@ -201,6 +198,11 @@ qtModule { ]; propagatedBuildInputs = [ + qtdeclarative + qtwebchannel + qtwebsockets + qtpositioning + # Image formats libjpeg libpng diff --git a/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix b/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix index f81cd64596e..c3a346a8d78 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix @@ -6,6 +6,6 @@ qtModule { pname = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ openssl ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/pkgs/development/libraries/qt-6/modules/qtwebview.nix index 1e7c4239779..e8ebea932f0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebview.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtwebview"; - qtInputs = [ qtdeclarative ] - ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ WebKit ]; + propagatedBuildInputs = [ qtdeclarative ] + ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ] + ++ lib.optionals stdenv.isDarwin [ WebKit ]; } diff --git a/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch b/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch index 6724e0d28ad..a0ee1e11b06 100644 --- a/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch +++ b/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -1,7 +1,7 @@ -From 69d9faa9e4420d3cb0d1466c1b95ceadb2cd75f3 Mon Sep 17 00:00:00 2001 +From afbe4002948e60ee3b27cb9be9e549ae416373f8 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Thu, 13 Apr 2023 23:42:29 +0800 -Subject: [PATCH 1/6] qtbase: qmake: always use libname instead of absolute +Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute path in qmake files In generated qmake files, absolute paths to qt libraries are embedded @@ -46,5 +46,5 @@ index 3ffe354fd8d..441332d4582 100644 else() list(APPEND out_list "${library_path}") -- -2.39.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index ee4af1730eb..8ffe0c936b7 100644 --- a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -1,7 +1,7 @@ -From 41e32c41f781261726722628122c924abb532575 Mon Sep 17 00:00:00 2001 +From 8d3f5ee63ed29fe41927b904aa1e2b40f90c8ef4 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 21:43:04 +0800 -Subject: [PATCH 2/6] qtbase: qmake: fix mkspecs for darwin +Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin --- mkspecs/common/mac.conf | 2 +- @@ -26,7 +26,7 @@ index 61bea952b22..9909dae7260 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 4acf3b19d5c..aadfce875e2 100644 +index f364716717c..3b40328304d 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -39,7 +39,7 @@ index 4acf3b19d5c..aadfce875e2 100644 contains(TEMPLATE, .*app) { !macx-xcode:if(isEmpty(BUILDS)|build_pass) { # Detect changes to the platform SDK -@@ -15,37 +11,6 @@ contains(TEMPLATE, .*app) { +@@ -15,269 +11,10 @@ contains(TEMPLATE, .*app) { QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) } @@ -77,9 +77,6 @@ index 4acf3b19d5c..aadfce875e2 100644 } !no_objective_c:CONFIG += objective_c -@@ -73,234 +38,6 @@ qt { - } - } -# Add the same default rpaths as Xcode does for new projects. -# This is especially important for iOS/tvOS/watchOS where no other option is possible. @@ -486,5 +483,5 @@ index df191eb13c4..e69de29bb2d 100644 - -load(toolchain) -- -2.39.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch index 759c71365d7..041960352b1 100644 --- a/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch +++ b/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch @@ -1,17 +1,17 @@ -From f52f3c2cb1703592eaeb43e80f585a24ce8402d7 Mon Sep 17 00:00:00 2001 +From 8ce66fca339d9daf6bd132771c2ea582a461f31c Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 09:34:46 +0800 -Subject: [PATCH 3/6] qtbase: qmake: fix includedir in generated pkg-config +Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config --- qmake/generators/makefile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index cc985a878b4..4e3b383d812 100644 +index 11d2f0ff7df..c78ed0d3485 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3403,8 +3403,7 @@ MakefileGenerator::writePkgConfigFile() +@@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") // << varGlue("DEFINES","-D"," -D"," ") ; @@ -22,5 +22,5 @@ index cc985a878b4..4e3b383d812 100644 && libDir != QLatin1String("/Library/Frameworks")) { t << " -F${libdir}"; -- -2.39.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch b/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch index 0b4da29afd7..5ccc9346d6d 100644 --- a/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch +++ b/pkgs/development/libraries/qt-6/patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch @@ -1,18 +1,18 @@ -From dd0dfc9cf87966f5d7493a943ec04c665be83cb6 Mon Sep 17 00:00:00 2001 +From b1533ac42718835499ec633ffb3b1bed0d040719 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 09:35:25 +0800 -Subject: [PATCH 4/6] qtbase: fix locating tzdir on NixOS +Subject: [PATCH 04/11] qtbase: fix locating tzdir on NixOS --- src/corelib/time/qtimezoneprivate_tz.cpp | 27 +++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 960a0944185..a5186acbd91 100644 +index e702a5d6b43..2ac88c1cd10 100644 --- a/src/corelib/time/qtimezoneprivate_tz.cpp +++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -51,7 +51,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories +@@ -56,7 +56,11 @@ static bool isTzFile(const QString &name); + // zone1970.tab). static QTzTimeZoneHash loadTzTimeZones() { - QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); @@ -24,7 +24,7 @@ index 960a0944185..a5186acbd91 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -730,18 +734,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) +@@ -773,18 +777,21 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) if (!tzif.open(QIODevice::ReadOnly)) return ret; } else { @@ -56,5 +56,5 @@ index 960a0944185..a5186acbd91 100644 } } -- -2.39.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch b/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch index 606be2d5ac1..8e04bda1364 100644 --- a/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch +++ b/pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch @@ -1,7 +1,7 @@ -From 4e8c14f1af9c332826e0454f4fd63e541edbaf5c Mon Sep 17 00:00:00 2001 +From 880fe5653a86d8091f3f577977f8af93552c48fd Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 21 Mar 2023 15:48:49 +0800 -Subject: [PATCH 5/6] qtbase: deal with a font face at index 0 as Regular for +Subject: [PATCH 05/11] qtbase: deal with a font face at index 0 as Regular for Variable fonts Reference: https://bugreports.qt.io/browse/QTBUG-111994 @@ -22,5 +22,5 @@ index 474644b871f..c7a117fd134 100644 FcObjectSetDestroy(os); FcPatternDestroy(pattern); -- -2.39.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch b/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch index 4933534caff..bab52a38c00 100644 --- a/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch +++ b/pkgs/development/libraries/qt-6/patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch @@ -1,7 +1,7 @@ -From 61ae6e04388dd40e11c214d56f22f8f2007bf35f Mon Sep 17 00:00:00 2001 +From 7f573f00fb850a08017d9f1e3c73b4d7efeb84f2 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Wed, 12 Apr 2023 10:13:50 +0800 -Subject: [PATCH 6/6] qtbase: qt-cmake: always use cmake from path +Subject: [PATCH 06/11] qtbase: qt-cmake: always use cmake from path The generated qt-cmake scripts embeds the absolute path of cmake used during the build of qtbase, bloating the runtime closure of qtbase. @@ -28,5 +28,5 @@ index f719257f602..571ffe788fa 100755 toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" -- -2.39.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch b/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-tools-in-PATH.patch index 146cba58b8e..fc2f55c9b4a 100644 --- a/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch +++ b/pkgs/development/libraries/qt-6/patches/0007-qtbase-find-tools-in-PATH.patch @@ -1,7 +1,7 @@ -From 31d808a7b0d52a01c3f2875202cd29410a94b39a Mon Sep 17 00:00:00 2001 +From 95b6bc2a414d381fdeab0899a3b02499c43695e7 Mon Sep 17 00:00:00 2001 From: rewine <luhongxu@deepin.org> Date: Wed, 29 Mar 2023 11:51:33 +0800 -Subject: [PATCH] qtbase-find-tools-in-PATH +Subject: [PATCH 07/11] qtbase-find-tools-in-PATH 1. find qt's tools in `QTTOOLSPATH` env qt assumes that all components use the same install prefix @@ -14,13 +14,12 @@ Subject: [PATCH] qtbase-find-tools-in-PATH We can guarantee the build order of qt components in nixpkgs tools in qttools always build before qtdoc qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH` - --- cmake/QtDocsHelpers.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake -index 48ed5a32..9409d22d 100644 +index 48ed5a324bf..91d8d41fb1f 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake @@ -47,9 +47,14 @@ function(qt_internal_add_docs) @@ -42,5 +41,5 @@ index 48ed5a32..9409d22d 100644 get_target_property(target_type ${target} TYPE) if (NOT target_type STREQUAL "INTERFACE_LIBRARY") -- -2.38.1 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/pkgs/development/libraries/qt-6/patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch index 81f0f76636d..d1139e0aecd 100644 --- a/pkgs/development/libraries/qt-6/patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch +++ b/pkgs/development/libraries/qt-6/patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -1,19 +1,19 @@ -From 39eb99dcd66f8ffb632fed6308a49896fe5ad2d3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> -Date: Thu, 10 Aug 2023 14:17:03 +0200 -Subject: [PATCH 3/3] Pass to qmlimportscanner the QML2_IMPORT_PATH +From a5cbfb30fc53b3290578af4a87fe4c0463df4247 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 10 Oct 2023 10:12:56 -0400 +Subject: [PATCH 08/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH --- src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 676d34d545..7908b07b3c 100644 +index f637416cf22..77749506ccb 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf - argumentList.append(qmlImportsPath); - } +@@ -1293,6 +1293,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf + argumentList.append( "-importPath"); + argumentList.append(qmlImportsPath); + // In a modularized installation of qt as we have in Nix, instead, we will + // read the paths from the environment, as they are spread in multiple @@ -26,5 +26,5 @@ index 676d34d545..7908b07b3c 100644 QProcess qmlImportScanner; qmlImportScanner.start(qmlImportScannerPath, argumentList); -- -2.26.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/pkgs/development/libraries/qt-6/patches/0009-qtbase-allow-translations-outside-prefix.patch index e96cbdbef11..ee2e35f813f 100644 --- a/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch +++ b/pkgs/development/libraries/qt-6/patches/0009-qtbase-allow-translations-outside-prefix.patch @@ -1,5 +1,14 @@ +From 28220453d157c0825669145c94ab86e9603265fa Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 10 Oct 2023 10:14:40 -0400 +Subject: [PATCH 09/11] qtbase: allow translations outside prefix + +--- + cmake/QtBuild.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake -index b45ec1d208..05f69c131b 100644 +index 1dc576d27af..4348eb97c37 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -30,7 +30,7 @@ function(qt_configure_process_path name default docstring) @@ -11,3 +20,6 @@ index b45ec1d208..05f69c131b 100644 message(FATAL_ERROR "Path component '${name}' is outside computed install prefix: ${rel_path} ") return() +-- +2.42.0 + diff --git a/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch b/pkgs/development/libraries/qt-6/patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch index 32e30679ec5..fbb74a055d4 100644 --- a/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch +++ b/pkgs/development/libraries/qt-6/patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch @@ -1,7 +1,8 @@ -From 505391a31aa353b8f1cc5d3feb9861582554d9f1 Mon Sep 17 00:00:00 2001 +From bbd9cf61b686f68d5e5eb78fb0b96a74a8921cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> Date: Wed, 9 Aug 2023 16:16:21 +0200 -Subject: [PATCH 1/3] Find qmlimportscanner in macdeployqt via environment +Subject: [PATCH 10/11] qtbase: find qmlimportscanner in macdeployqt via + environment The qmlimportscanner tool is provided by qtdeclarative. Because of the modularized installation in Nix, it can not be found via the usual @@ -16,10 +17,10 @@ a workaround for users. 1 file changed, 4 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 643fe5390a..b8fcc9c9bd 100644 +index 77749506ccb..48979195f40 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1270,6 +1270,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1273,6 +1273,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf if (!QFile::exists(qmlImportScannerPath)) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; @@ -31,5 +32,5 @@ index 643fe5390a..b8fcc9c9bd 100644 if (!QFile::exists(qmlImportScannerPath)) { LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; -- -2.26.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch b/pkgs/development/libraries/qt-6/patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch index 4436d512d9d..ab3354d62b8 100644 --- a/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch +++ b/pkgs/development/libraries/qt-6/patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch @@ -1,8 +1,8 @@ -From 32df59bea18bebc18d6d308750e88be325522d2e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> -Date: Thu, 10 Aug 2023 14:15:34 +0200 -Subject: [PATCH 2/3] Check in the QML folder of this library does actually - exist +From 617d27ee91aaa59c59c4f3a2cca7bab8167d9f5f Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 10 Oct 2023 10:17:00 -0400 +Subject: [PATCH 11/11] qtbase: check in the QML folder of this library does + actually exist In a modularized installation, this folder will be the location where `qtbase` itself is installed, but `qtbase` does not have any QML @@ -12,10 +12,10 @@ code, and `qmlimportscanner` will complain that it does not exist. 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index b8fcc9c9bd..676d34d545 100644 +index 48979195f40..8415680ecda 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1290,9 +1290,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1293,9 +1293,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf } for (const QString &importPath : qmlImportPaths) argumentList << "-importPath" << importPath; @@ -28,8 +28,8 @@ index b8fcc9c9bd..676d34d545 100644 + argumentList.append(qmlImportsPath); + } - // run qmlimportscanner - QProcess qmlImportScanner; + // In a modularized installation of qt as we have in Nix, instead, we will + // read the paths from the environment, as they are spread in multiple -- -2.26.2 +2.42.0 diff --git a/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch b/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch index 02e578f2d52..a204d52c9f0 100644 --- a/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +++ b/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch @@ -1,13 +1,29 @@ +From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 10 Oct 2023 11:12:27 -0400 +Subject: [PATCH] qtdeclarative: disable qml disk cache + +--- + src/qml/jsruntime/qv4engine.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index 852cde9e..165f1b57 100644 +index d1b4c4fff6..50f8a07420 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2093,7 +2093,7 @@ void ExecutionEngine::registerModule(const QString &_name, const QJSValue &modul - - bool ExecutionEngine::diskCacheEnabled() const +@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { -- return (!disableDiskCache() && !debugger()) || forceDiskCache(); -+ return forceDiskCache(); + if (forceDiskCache()) + return DiskCache::Enabled; +- if (disableDiskCache() || debugger()) +- return DiskCache::Disabled; +- static const DiskCacheOptions options = qmlGetConfigOption< +- DiskCacheOptions, transFormDiskCache>("QML_DISK_CACHE"); +- return options; ++ return DiskCache::Disabled; } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, +-- +2.42.0 + diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch index 86507165bd9..3df917edf5c 100644 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch +++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch @@ -1,10 +1,10 @@ diff --git a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -index 6a3a777..249d4cc 100644 +index d4b0161b2e..e5a0eb1967 100644 --- a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc +++ b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -@@ -20,12 +20,6 @@ - #include "media/base/media_log.h" - #include "media/base/video_frame.h" +@@ -29,12 +29,6 @@ + #include "media/base/video_types.h" + #include "media/video/video_encode_accelerator.h" -// This is a min version of macOS where we want to support SVC encoding via -// EnableLowLatencyRateControl flag. The flag is actually supported since 11.3, @@ -15,21 +15,22 @@ index 6a3a777..249d4cc 100644 namespace media { namespace { -@@ -150,8 +144,6 @@ VTVideoEncodeAccelerator::GetSupportedProfiles() { - profile.max_framerate_numerator = kMaxFrameRateNumerator; - profile.max_framerate_denominator = kMaxFrameRateDenominator; - profile.max_resolution = gfx::Size(kMaxResolutionWidth, kMaxResolutionHeight); +@@ -277,8 +271,6 @@ VTVideoEncodeAccelerator::GetSupportedH264Profiles() { + profile.rate_control_modes = VideoEncodeAccelerator::kConstantMode | + VideoEncodeAccelerator::kVariableMode; + profile.scalability_modes.push_back(SVCScalabilityMode::kL1T1); - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) - profile.scalability_modes.push_back(SVCScalabilityMode::kL1T2); + for (const auto& supported_profile : kSupportedProfiles) { - profile.profile = supported_profile; - profiles.push_back(profile); -@@ -595,13 +587,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( - kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder}; - std::vector<CFTypeRef> encoder_values{kCFBooleanTrue}; + if (VideoCodecProfileToVideoCodec(supported_profile) == VideoCodec::kH264) { +@@ -814,14 +806,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( + encoder_values.push_back(kCFBooleanFalse); + } - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { -- if (require_low_delay_) { +- // Remove the validation once HEVC SVC mode is supported on macOS. +- if (require_low_delay_ && codec == VideoCodec::kH264) { - encoder_keys.push_back( - kVTVideoEncoderSpecification_EnableLowLatencyRateControl); - encoder_values.push_back(kCFBooleanTrue); @@ -38,10 +39,10 @@ index 6a3a777..249d4cc 100644 base::ScopedCFTypeRef<CFDictionaryRef> encoder_spec = video_toolbox::DictionaryWithKeysAndValues( encoder_keys.data(), encoder_values.data(), encoder_keys.size()); -@@ -669,19 +654,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession() { - } +@@ -891,19 +875,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession(VideoCodec codec) { - if (num_temporal_layers_ == 2) { + // Remove the validation once HEVC SVC mode is supported on macOS. + if (num_temporal_layers_ == 2 && codec_ == VideoCodec::kH264) { - if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { - if (!session_property_setter.IsSupported( - kVTCompressionPropertyKey_BaseLayerFrameRateFraction)) { diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch index 31516c41beb..c4302113786 100644 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch +++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch @@ -1,10 +1,24 @@ +From da66a74e8b8e57b4a60b2cd0d18ef3bebb15509c Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 10 Oct 2023 11:45:24 -0400 +Subject: [PATCH 1/2] qtwebengine: link pulseaudio + +--- + src/core/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index 4153ce180..e89f41798 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -341,6 +341,7 @@ - devtools_fast_bundle=false - devtools_skip_typecheck=false - enable_jxl_decoder=false # temporarily because libjxl causes internal compiler error on armv7 +@@ -340,6 +340,7 @@ foreach(arch ${archs}) + use_static_angle=true + chrome_root_store_supported=false + trial_comparison_cert_verifier_supported=false + link_pulseaudio=true ) + extend_gn_list(gnArgArg + ARGS use_v8_context_snapshot v8_use_external_startup_data +-- +2.42.0 - extend_gn_list(gnArgArg \ No newline at end of file diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch index 58f2d96f809..fecdb93cd54 100644 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch +++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch @@ -1,8 +1,18 @@ +From 6f0068359f32d1e7ebaa32650c3b608c008a1127 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Tue, 10 Oct 2023 11:46:28 -0400 +Subject: [PATCH 2/2] qtwebengine: fix path to locales + +--- + src/core/api/CMakeLists.txt | 3 ++- + src/core/web_engine_library_info.cpp | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt -index f860e0ba7..30e1a767a 100644 +index a3cb53e17..fcb6d70c5 100644 --- a/src/core/api/CMakeLists.txt +++ b/src/core/api/CMakeLists.txt -@@ -193,7 +193,8 @@ if(QT_FEATURE_framework) +@@ -190,7 +190,8 @@ if(QT_FEATURE_framework) else() install(FILES ${localeFiles} @@ -26,3 +36,6 @@ index c03c9a3b2..430fdfab2 100644 % QLatin1String("qtwebengine_locales"); candidatePaths << fallbackDir(); } +-- +2.42.0 + diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index ce917a27415..5434be84fa5 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; - propagatedBuildInputs = (args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]); + propagatedBuildInputs = + (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ + (args.propagatedBuildInputs or []); moveToDev = false; diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index a0ac367f162..5c7cd6d48b1 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,315 @@ { qt3d = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "047rwawrlm7n0vifxmsqvs3w3j5c16x8qkpx8xazq6xd47dn9w11"; - name = "qt3d-everywhere-src-6.5.2.tar.xz"; - }; - }; - qt5 = { - version = "6.5.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5-everywhere-src-6.5.2.tar.xz"; - sha256 = "15da8xd213fg2yfna3zvvr5mnhdfdai0i4m1paqfxr10sl81p515"; - name = "qt5-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qt3d-everywhere-src-6.6.0.tar.xz"; + sha256 = "0apwq6cqxn1xszhaawrz14yyy9akbmh6i5yys3v74kbz4537ma0d"; + name = "qt3d-everywhere-src-6.6.0.tar.xz"; }; }; qt5compat = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qt5compat-everywhere-src-6.5.2.tar.xz"; - sha256 = "1i4izabbmf1dayzlj1miz7hsm4cy0qb7i72pwyl2fp05w8pf9axr"; - name = "qt5compat-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qt5compat-everywhere-src-6.6.0.tar.xz"; + sha256 = "1jlg3b3jn7m2gih892vcsv36rm430g86rz6bdlk15xr6c6vfv19x"; + name = "qt5compat-everywhere-src-6.6.0.tar.xz"; }; }; qtactiveqt = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.2.tar.xz"; - sha256 = "04zhbwhnjlc561bs2f4y82mzlf18byy6g5gh37yq9r3gfz54002x"; - name = "qtactiveqt-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtactiveqt-everywhere-src-6.6.0.tar.xz"; + sha256 = "17ks2sggvx7p7hmg128w494n06nzyf7r5i04nykhmhqlx71wnm6j"; + name = "qtactiveqt-everywhere-src-6.6.0.tar.xz"; }; }; qtbase = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz"; - sha256 = "0s8jwzdcv97dfy8n3jjm8zzvllv380l73mwdva7rs2nqnhlwgd1x"; - name = "qtbase-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtbase-everywhere-src-6.6.0.tar.xz"; + sha256 = "03lysc6lp17hyjrwvp0znw02bdysrff8rlsb0nlrfn6b58qm7783"; + name = "qtbase-everywhere-src-6.6.0.tar.xz"; }; }; qtcharts = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtcharts-everywhere-src-6.5.2.tar.xz"; - sha256 = "0bddlrwda5bh5bdwdx86ixdpm3zg5nygzb754y5nkjlw06zgfnkp"; - name = "qtcharts-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtcharts-everywhere-src-6.6.0.tar.xz"; + sha256 = "1x9c55j8yscb6q18haspqnnvbc6pcgdv5ljrhj0ijxqcqz6spgp6"; + name = "qtcharts-everywhere-src-6.6.0.tar.xz"; }; }; qtconnectivity = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtconnectivity-everywhere-src-6.5.2.tar.xz"; - sha256 = "16fwbz9pr6pi19119mp6w0crq9nsb35fw8cgpfpkq99d6li4jbnv"; - name = "qtconnectivity-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtconnectivity-everywhere-src-6.6.0.tar.xz"; + sha256 = "04203igj3fnmw1i7k291j3p987qssss3hz58kjdz33n28xic4a8w"; + name = "qtconnectivity-everywhere-src-6.6.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdatavis3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "1s8wlpc4nibnxaghkxmaxda5dkkn64jw6qgmzw39vi5vvhc3khb8"; - name = "qtdatavis3d-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdatavis3d-everywhere-src-6.6.0.tar.xz"; + sha256 = "17jrs6mh741vfgj8bgkahfzj2xaa7agw9s6q2xcv9s8bkxnryj60"; + name = "qtdatavis3d-everywhere-src-6.6.0.tar.xz"; }; }; qtdeclarative = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdeclarative-everywhere-src-6.5.2.tar.xz"; - sha256 = "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk"; - name = "qtdeclarative-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdeclarative-everywhere-src-6.6.0.tar.xz"; + sha256 = "0cd3gxyklhscq2zymhmv6j4pzgrl0gpx8yyhgwqg1j0qm6q9nlqv"; + name = "qtdeclarative-everywhere-src-6.6.0.tar.xz"; }; }; qtdoc = { - version = "6.5.2"; + version = "6.6.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtdoc-everywhere-src-6.6.0.tar.xz"; + sha256 = "07i6fxczbpma344jgmpcb1y24jlm136y7b698b57ipcvgbc38xnk"; + name = "qtdoc-everywhere-src-6.6.0.tar.xz"; + }; + }; + qtgraphs = { + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtdoc-everywhere-src-6.5.2.tar.xz"; - sha256 = "0cydg39f4cpv965pr97qn3spm5fzlxvhamifjfdsrzgskc5nm0v3"; - name = "qtdoc-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtgraphs-everywhere-src-6.6.0.tar.xz"; + sha256 = "0zsyw5w15xzmaap0r396jpsz7synq5q2knl75807f6q3i7y4gqan"; + name = "qtgraphs-everywhere-src-6.6.0.tar.xz"; }; }; qtgrpc = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtgrpc-everywhere-src-6.5.2.tar.xz"; - sha256 = "016jw2ny7paky54pk4pa499273919s8ag2ksx361ir6d0ydrdcks"; - name = "qtgrpc-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtgrpc-everywhere-src-6.6.0.tar.xz"; + sha256 = "14pdqwv0yw8dgr5nr04aw73fwkljwrg3yhkflfndwnf7mmgvkffs"; + name = "qtgrpc-everywhere-src-6.6.0.tar.xz"; }; }; qthttpserver = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qthttpserver-everywhere-src-6.5.2.tar.xz"; - sha256 = "1b6w0999n5vw5xb93m0rc896l6ci3jld657y8645rl3q29fjpypq"; - name = "qthttpserver-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qthttpserver-everywhere-src-6.6.0.tar.xz"; + sha256 = "0r9wwf239r3q7i633lld2mbmn98d7jqna1fgfxakri68x7bixbpm"; + name = "qthttpserver-everywhere-src-6.6.0.tar.xz"; }; }; qtimageformats = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtimageformats-everywhere-src-6.5.2.tar.xz"; - sha256 = "0hv7mkn72126rkhy5gmjmbvzy7v17mkk3q2pkmzy99f64j4w1q5a"; - name = "qtimageformats-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtimageformats-everywhere-src-6.6.0.tar.xz"; + sha256 = "11736il80bdcajz01l836z38g1f0k2am9ilmk203gqkn06sjqm71"; + name = "qtimageformats-everywhere-src-6.6.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlanguageserver-everywhere-src-6.5.2.tar.xz"; - sha256 = "196iicwpqca2ydpca41qs6aqxxq8ycknw6lm2v00h1w3m86frdbk"; - name = "qtlanguageserver-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlanguageserver-everywhere-src-6.6.0.tar.xz"; + sha256 = "03j9kbmv80sj84lbz90692ckg7nd60i6mrbg41lkgxibhqck1jdf"; + name = "qtlanguageserver-everywhere-src-6.6.0.tar.xz"; }; }; qtlocation = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlocation-everywhere-src-6.5.2.tar.xz"; - sha256 = "1yvdv1gqj7dij7v4cq9rlnqfb77c0v9b7n56jccvy5v6q9j7s7c9"; - name = "qtlocation-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlocation-everywhere-src-6.6.0.tar.xz"; + sha256 = "1507syiar3dv53km0hl2rf29518arwkk0h2b6fpj5gq8c7kqp5pm"; + name = "qtlocation-everywhere-src-6.6.0.tar.xz"; }; }; qtlottie = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtlottie-everywhere-src-6.5.2.tar.xz"; - sha256 = "16z8fhaa40ig0cggb689zf8j3cid6fk6pmh91b8342ymy1fdqfh0"; - name = "qtlottie-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtlottie-everywhere-src-6.6.0.tar.xz"; + sha256 = "0kzq739ziyy8xhzdj57q220sdnjcwnwkgb67gcrsdfd40x8v960x"; + name = "qtlottie-everywhere-src-6.6.0.tar.xz"; }; }; qtmultimedia = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtmultimedia-everywhere-src-6.5.2.tar.xz"; - sha256 = "0xc9k4mlncscxqbp8q46yjd89k4jb8j0ggbi5ad874lycym013wl"; - name = "qtmultimedia-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtmultimedia-everywhere-src-6.6.0.tar.xz"; + sha256 = "10l7sc8c7gwz47z77acvxz5wba14grwqgfpmnx0qh4gcldn26jxs"; + name = "qtmultimedia-everywhere-src-6.6.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtnetworkauth-everywhere-src-6.5.2.tar.xz"; - sha256 = "0g18kh3zhcfi9ni8cqbbjdc1l6jf99ijv5shcl42jk6219b4pk2f"; - name = "qtnetworkauth-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtnetworkauth-everywhere-src-6.6.0.tar.xz"; + sha256 = "0c48rk35qh4q9drs53jijgnhxk8adllnk63wy4rk7sq0disc1m90"; + name = "qtnetworkauth-everywhere-src-6.6.0.tar.xz"; }; }; qtpositioning = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtpositioning-everywhere-src-6.5.2.tar.xz"; - sha256 = "1yhlfs8izc054qv1krf5qv6zzjlvmz013h74fwamn74dfh1kyjbh"; - name = "qtpositioning-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtpositioning-everywhere-src-6.6.0.tar.xz"; + sha256 = "0fd51wgxcir8b5n6ljcfhagrkv77w6kimjx7mqzd77km7kx20rcd"; + name = "qtpositioning-everywhere-src-6.6.0.tar.xz"; }; }; qtquick3d = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3d-everywhere-src-6.5.2.tar.xz"; - sha256 = "1nh0vg2m1lf8m40bxbwsam5pwdzjammhal69k2pb5s0rjifs7q3m"; - name = "qtquick3d-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquick3d-everywhere-src-6.6.0.tar.xz"; + sha256 = "1fkshfd0abnxd5ir8wsf57zms99cg1zhrnn40cmnr7g4jjrkxarp"; + name = "qtquick3d-everywhere-src-6.6.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; - sha256 = "0dri8v0pmvc1h1cdhdchvd4xi5f62c1wrk0jd01lh95i6sc1403m"; - name = "qtquick3dphysics-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquick3dphysics-everywhere-src-6.6.0.tar.xz"; + sha256 = "00vwzp5qwccjl65dda8s3lyf3dz1pgwhyls15qqgl338dxl5nfbl"; + name = "qtquick3dphysics-everywhere-src-6.6.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; - sha256 = "1gvcszqj6khqisxkpwi67xad0247hpq5zcz4v2vhbgkxq8kwfiym"; - name = "qtquickeffectmaker-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquickeffectmaker-everywhere-src-6.6.0.tar.xz"; + sha256 = "0zzps7wmjmnbkm37j60xc11jppk4g3nnh7qcn91q68mdqygkgjyp"; + name = "qtquickeffectmaker-everywhere-src-6.6.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtquicktimeline-everywhere-src-6.5.2.tar.xz"; - sha256 = "1fhmy01nqcr9q1193m9fkhbvqd9208kaigprqxkjjm61bn8awif9"; - name = "qtquicktimeline-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtquicktimeline-everywhere-src-6.6.0.tar.xz"; + sha256 = "145mkgcacjf9ak1ydfkrqfk6371zkjgjd2v264krkv9aaza537h7"; + name = "qtquicktimeline-everywhere-src-6.6.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtremoteobjects-everywhere-src-6.5.2.tar.xz"; - sha256 = "0k29sk02n54vj1w6vh6xycsjpyfqlijc13fnxh1q7wpgg4gizx60"; - name = "qtremoteobjects-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtremoteobjects-everywhere-src-6.6.0.tar.xz"; + sha256 = "0szpy60xdmw2spqaczib7mx7k1lnaid8micmy0jh4hmrbgir8496"; + name = "qtremoteobjects-everywhere-src-6.6.0.tar.xz"; }; }; qtscxml = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtscxml-everywhere-src-6.5.2.tar.xz"; - sha256 = "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58"; - name = "qtscxml-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtscxml-everywhere-src-6.6.0.tar.xz"; + sha256 = "0hqhi9z9cbnpbc9dx22ci3a08javb1hi9cn46h1ks1lbbpdx1v2p"; + name = "qtscxml-everywhere-src-6.6.0.tar.xz"; }; }; qtsensors = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsensors-everywhere-src-6.5.2.tar.xz"; - sha256 = "19iamfl4znqbfflnnpis6qk3cqri7kzbg0nsgf42lc5lzdybs1j0"; - name = "qtsensors-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtsensors-everywhere-src-6.6.0.tar.xz"; + sha256 = "1624v0wwpdrcbz4x2jdrzb0r7qfh0qcac3k6pfikn45c9rfvxw18"; + name = "qtsensors-everywhere-src-6.6.0.tar.xz"; }; }; qtserialbus = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialbus-everywhere-src-6.5.2.tar.xz"; - sha256 = "1zndnw1zx5x9daidcm0jq7jcr06ihw0nf6iksrx591f1rl3n6hph"; - name = "qtserialbus-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtserialbus-everywhere-src-6.6.0.tar.xz"; + sha256 = "0k5r57fsdyplbcffq9lnl0bp1smsnqh93kpk3rn5r6gaa9qz1k0q"; + name = "qtserialbus-everywhere-src-6.6.0.tar.xz"; }; }; qtserialport = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtserialport-everywhere-src-6.5.2.tar.xz"; - sha256 = "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06"; - name = "qtserialport-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtserialport-everywhere-src-6.6.0.tar.xz"; + sha256 = "0ra0v8vc6y2s9y9irh30g1wnyhgd5xlgg6s0k9czyrvsqkqvpz7c"; + name = "qtserialport-everywhere-src-6.6.0.tar.xz"; }; }; qtshadertools = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtshadertools-everywhere-src-6.5.2.tar.xz"; - sha256 = "0g8aziqhds2fkx11y4p2akmyn2p1qqf2fjxv72f9pibnhpdv0gya"; - name = "qtshadertools-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtshadertools-everywhere-src-6.6.0.tar.xz"; + sha256 = "0xcqxwvkga11s150jha0b3iwnp4rvkvbfaxy0a0ln52hqmyk541n"; + name = "qtshadertools-everywhere-src-6.6.0.tar.xz"; }; }; qtspeech = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtspeech-everywhere-src-6.5.2.tar.xz"; - sha256 = "1cnlc9x0wswzl7j2imi4kvs9zavs4z1mhzzfpwr6d9zlfql9rzw8"; - name = "qtspeech-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtspeech-everywhere-src-6.6.0.tar.xz"; + sha256 = "174zpr582nfgj19qk7qdyf4l85q0gwsjx3qfv37z0238hbzxp6wn"; + name = "qtspeech-everywhere-src-6.6.0.tar.xz"; }; }; qtsvg = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtsvg-everywhere-src-6.5.2.tar.xz"; - sha256 = "18v337lfk8krg0hff5jx6fi7gn6x3djn03x3psrhlbmgjc8crd28"; - name = "qtsvg-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtsvg-everywhere-src-6.6.0.tar.xz"; + sha256 = "1pkj7inw76klyld3sy24gcds785lgkjs6zjac9jga0hiypz2bnik"; + name = "qtsvg-everywhere-src-6.6.0.tar.xz"; }; }; qttools = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttools-everywhere-src-6.5.2.tar.xz"; - sha256 = "0ha3v488vnm4pgdpyjgf859sak0z2fwmbgcyivcd93qxflign7sm"; - name = "qttools-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qttools-everywhere-src-6.6.0.tar.xz"; + sha256 = "16ds0mclns7656hf4phv13pwhigc15z2ghqx7r2nxfrb2jyfx7sf"; + name = "qttools-everywhere-src-6.6.0.tar.xz"; }; }; qttranslations = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qttranslations-everywhere-src-6.5.2.tar.xz"; - sha256 = "1sxy2ljn5ajvn4yjb8fx86l56viyvqh5r9hf5x67azkmgrilaz1k"; - name = "qttranslations-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qttranslations-everywhere-src-6.6.0.tar.xz"; + sha256 = "13072ll3kwb9kvw3a6sjcdific12vf81xbp41zmi1f34dwirmn50"; + name = "qttranslations-everywhere-src-6.6.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; - sha256 = "0sb2c901ma30dcbf4yhznw0pad09iz55alvkzyw2d992gqwf0w05"; - name = "qtvirtualkeyboard-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz"; + sha256 = "0yvpz8mm3g1lj5m3fk95cqw5magfdl4y0y8frsid7gqlym1xp117"; + name = "qtvirtualkeyboard-everywhere-src-6.6.0.tar.xz"; }; }; qtwayland = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwayland-everywhere-src-6.5.2.tar.xz"; - sha256 = "16iwar19sgjvxgmbr6hmd3hsxp6ahdjwl1lra2wapl3zzf3bw81h"; - name = "qtwayland-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwayland-everywhere-src-6.6.0.tar.xz"; + sha256 = "1s5p0gfkw96nx4k2fp5s3v2rj8c05k8jc2kif0rwhl6hhlnxihrh"; + name = "qtwayland-everywhere-src-6.6.0.tar.xz"; }; }; qtwebchannel = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebchannel-everywhere-src-6.5.2.tar.xz"; - sha256 = "0qwfnwva7v5f2g5is17yy66mnmc9c1yf9aagaw5qanskdvxdk261"; - name = "qtwebchannel-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebchannel-everywhere-src-6.6.0.tar.xz"; + sha256 = "077mlg2zqr002z7z6yqzl3jqc05g5ahz2m06az3zjhsqdn7b7p7x"; + name = "qtwebchannel-everywhere-src-6.6.0.tar.xz"; }; }; qtwebengine = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebengine-everywhere-src-6.5.2.tar.xz"; - sha256 = "17qxf3asyxq6kcqqvml170n7rnzih3nr4srp9r5v80pmas5l7jg7"; - name = "qtwebengine-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebengine-everywhere-src-6.6.0.tar.xz"; + sha256 = "105pag9a2q611ixn5bvc45kpylhrdz5wgw6bk6zssmrcbbq9zp6m"; + name = "qtwebengine-everywhere-src-6.6.0.tar.xz"; }; }; qtwebsockets = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebsockets-everywhere-src-6.5.2.tar.xz"; - sha256 = "0xjwifxj2ssshys6f6kjr6ri2vq1wfshxky6mcscjm7vvyqdfjr0"; - name = "qtwebsockets-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebsockets-everywhere-src-6.6.0.tar.xz"; + sha256 = "03pkgp854pb1rzjixhrbyz4ad174wfikjjisry2c90kf1ifb219f"; + name = "qtwebsockets-everywhere-src-6.6.0.tar.xz"; }; }; qtwebview = { - version = "6.5.2"; + version = "6.6.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.5/6.5.2/submodules/qtwebview-everywhere-src-6.5.2.tar.xz"; - sha256 = "0cgn1px8zk2khmswi9zawi9cnx9p26y4lb3a0kr4kfklm1rf00jr"; - name = "qtwebview-everywhere-src-6.5.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.0/submodules/qtwebview-everywhere-src-6.6.0.tar.xz"; + sha256 = "14ikfl38ajgcv3611zjls7liscfyazf49y1plxk0pipsbndqv955"; + name = "qtwebview-everywhere-src-6.6.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 9df86514ede..83f46b12a24 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.4"; + version = "2.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "sha256-Ju22lCpwbNxiFeQoaUh3LmtI6RlTO3hOw2Z4/O8PQ6E="; + sha256 = "sha256-tTpCbHiZTb/xmm3oRXsYAUWl1sYyAlGP9ss4xVQgPVo="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index de80fc0709d..860e3922751 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.13.1"; + version = "6.13.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-ic1Xnle1fGZ5elf0yH0BF+3spAmIo9kP62WhXLmBVNc="; + hash = "sha256-Kdvr3T9hynLCj99+Rc1L0Gq7xkiM0a6xovuqhAncrek="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index e87243fe8ef..47cfae64829 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -13,6 +13,7 @@ , python3 , quarto , extraPythonPackages ? ps: with ps; [] +, sysctl }: stdenv.mkDerivation (final: { @@ -60,11 +61,13 @@ stdenv.mkDerivation (final: { mv bin/* $out/bin mv share/* $out/share - runHook preInstall + runHook postInstall ''; passthru.tests = { - quarto-check = runCommand "quarto-check" {} '' + quarto-check = runCommand "quarto-check" { + nativeBuildInputs = lib.optionals stdenv.isDarwin [ sysctl ]; + } '' export HOME="$(mktemp -d)" ${quarto}/bin/quarto check touch $out @@ -81,7 +84,7 @@ stdenv.mkDerivation (final: { changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson mrtarantoga ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; }; }) diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index bee09ec67bf..ab53b5cc9b6 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quictls"; - version = "3.0.10-quic1"; + version = "3.1.4-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; rev = "openssl-${finalAttrs.version}"; - hash = "sha256-PTHZCj5aqwFrrvydut9ZS04EJ7YPywKAjbXBBihj4Gg="; + hash = "sha256-WOWoY6rmAAUvuWWXPTWsllUkew5ZIULjL1CEg/RRPsE="; }; patches = [ diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index e2dd81b1387..2e1163e5f59 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "refs/tags/v${version}"; - hash = "sha256-P6IYl6xcsqXw1ilt6HYw757FL2syy1XePBVGbPAlz6Q="; + hash = "sha256-C3LfrdXNs5AG9B2n2c39fTjv2gri910EYxApGWwtH90="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index b5da1ad6e19..4e85b3688ab 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "randomX"; - version = "1.1.10"; + version = "1.2.1"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "tevador"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZPphhZFzQL72xcEp9kNfZITY4oqK930ve/bbljTYNBs="; + sha256 = "sha256-dfImzwbEfJQcaPZCoWypHiI6dishVRdqS/r+n3tfjvM="; }; meta = with lib; { diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index ec9669f3c7d..2f4a2ee6b1d 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-gLiITRCxX3nkzrlvU1/ZPxEo2v7q79/MwrnURUjrY28="; + hash = "sha256-OeGn3ks+vSHt4Kdzy6kqhpFOtjoHrbPZB1BrV6Ggzz4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch b/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch new file mode 100644 index 00000000000..df334cc9126 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch @@ -0,0 +1,35 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 11c1b04c..762eaa75 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,20 +1,14 @@ +-find_package(GTestSrc) ++enable_testing() + +-IF(GTESTSRC_FOUND) +- enable_testing() ++if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW)) ++ set(gtest_disable_pthreads ON) ++ set(gtest_force_shared_crt ON) ++endif() + +- if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW)) +- set(gtest_disable_pthreads ON) +- set(gtest_force_shared_crt ON) +- endif() ++include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) + +- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest) +- include_directories(SYSTEM ${GTEST_INCLUDE_DIR}) ++set(TEST_LIBRARIES gtest gtest_main) + +- set(TEST_LIBRARIES gtest gtest_main) +- +- add_custom_target(tests ALL) +- add_subdirectory(perftest) +- add_subdirectory(unittest) +- +-ENDIF(GTESTSRC_FOUND) ++add_custom_target(tests ALL) ++add_subdirectory(perftest) ++add_subdirectory(unittest) diff --git a/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch b/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch new file mode 100644 index 00000000000..dd06ba6a697 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch @@ -0,0 +1,36 @@ +diff --git a/test/valgrind.supp b/test/valgrind.supp +index c9d3d226..63af7bf9 100644 +--- a/test/valgrind.supp ++++ b/test/valgrind.supp +@@ -24,3 +24,31 @@ + fun:*Uri*Parse_UTF16_Std* + } + ++{ ++ Suppress memcpy_chk valgrind report 5 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*dtoa_normal* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 6 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*dtoa_maxDecimalPlaces* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 7 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ ... ++ fun:*Reader*ParseDoubleHandler* ++} ++ ++{ ++ Suppress memcpy_chk valgrind report 8 ++ Memcheck:Overlap ++ fun:__memcpy_chk ++ fun:*Reader*ParseNumber_NormalPrecisionError* ++} diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index f73e01b6476..b200193aa21 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchFromGitHub { - owner = "miloyip"; + owner = "Tencent"; repo = "rapidjson"; rev = "v${version}"; sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909"; hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) + # One of these three tests reports memcpy overlap after update to glibc-2.38 + ./test-skip-valgrind.diff ]; postPatch = '' @@ -51,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "http://rapidjson.org/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff b/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff new file mode 100644 index 00000000000..a791d88699f --- /dev/null +++ b/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff @@ -0,0 +1,7 @@ +--- a/test/unittest/CMakeLists.txt ++++ b/test/unittest/CMakeLists.txt +@@ -82,3 +81,0 @@ +- add_test(NAME valgrind_unittest +- COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.* +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) + diff --git a/pkgs/development/libraries/rapidjson/unstable.nix b/pkgs/development/libraries/rapidjson/unstable.nix new file mode 100644 index 00000000000..0f4c3d40403 --- /dev/null +++ b/pkgs/development/libraries/rapidjson/unstable.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doxygen +, graphviz +, gtest +, valgrind +# One of "11" or "17"; default in source is CXX 11 +, cxxStandard ? "11" +, buildDocs ? true +, buildTests ? !stdenv.hostPlatform.isStatic && !stdenv.isDarwin +, buildExamples ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rapidjson"; + version = "unstable-2023-09-28"; + + outputs = [ + "out" + ] ++ lib.optionals buildDocs [ + "doc" + ] ++ lib.optionals buildExamples [ + "example" + ]; + + src = fetchFromGitHub { + owner = "Tencent"; + repo = "rapidjson"; + rev = "f9d53419e912910fd8fa57d5705fa41425428c35"; + hash = "sha256-rl7iy14jn1K2I5U2DrcZnoTQVEGEDKlxmdaOCF/3hfY="; + }; + + patches = lib.optionals buildTests [ + ./0000-unstable-use-nixpkgs-gtest.patch + # https://github.com/Tencent/rapidjson/issues/2214 + ./0001-unstable-valgrind-suppress-failures.patch + ]; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals buildDocs [ + doxygen + graphviz + ]; + + cmakeFlags = [ + (lib.cmakeBool "RAPIDJSON_BUILD_DOC" buildDocs) + (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" buildTests) + (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" buildExamples) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" (cxxStandard == "11")) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" (cxxStandard == "17")) + ] ++ lib.optionals buildTests [ + (lib.cmakeFeature "GTEST_INCLUDE_DIR" "${lib.getDev gtest}") + ]; + + doCheck = buildTests; + + nativeCheckInputs = [ + gtest + valgrind + ]; + + postInstall = lib.optionalString buildExamples '' + mkdir -p $example/bin + + find bin -type f -executable \ + -not -name "perftest" \ + -not -name "unittest" \ + -exec cp -a {} $example/bin \; + ''; + + meta = with lib; { + description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; + homepage = "http://rapidjson.org/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ Madouura ]; + broken = (cxxStandard != "11" && cxxStandard != "17"); + }; +}) diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 5af34139f93..e655645cd86 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -1,13 +1,28 @@ -{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch -, mesa, libGLU, glfw -, libX11, libXi, libXcursor, libXrandr, libXinerama -, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib -, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio +{ stdenv +, lib +, fetchFromGitHub +, cmake +, fetchpatch +, mesa +, libGLU +, glfw +, libX11 +, libXi +, libXcursor +, libXrandr +, libXinerama +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsa-lib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio , sharedLib ? true , includeEverything ? true , raylib-games +, darwin }: - +let + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL; +in stdenv.mkDerivation (finalAttrs: { pname = "raylib"; version = "4.5.0"; @@ -21,11 +36,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ - mesa glfw libXi libXcursor libXrandr libXinerama - ] ++ lib.optional alsaSupport alsa-lib + buildInputs = [ glfw ] + ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; - propagatedBuildInputs = [ libGLU libX11 ]; + + propagatedBuildInputs = lib.optionals stdenv.isLinux [ libGLU libX11 ] + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ @@ -33,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_EXAMPLES=OFF" "-DCUSTOMIZE_BUILD=1" ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" - ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; + ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; passthru.tests = [ raylib-games ]; @@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.raylib.com/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; - platforms = platforms.linux; + platforms = platforms.all; changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; }; }) diff --git a/pkgs/development/libraries/rccl/default.nix b/pkgs/development/libraries/rccl/default.nix deleted file mode 100644 index b3aaaff82f0..00000000000 --- a/pkgs/development/libraries/rccl/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocm-smi -, hip -, gtest -, chrpath -, buildTests ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rccl"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rccl"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-hQTzaiPMo5FAVScmxV0iNhy80uJ1xvx/kzlbfwROOs4="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ]; - - buildInputs = [ - rocm-smi - gtest - ] ++ lib.optionals buildTests [ - chrpath - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_TESTS=ON" - ]; - - # Replace the manually set parallel jobs to NIX_BUILD_CORES - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "8 P" "$NIX_BUILD_CORES P" \ - --replace "8)" "$NIX_BUILD_CORES)" - ''; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/* $test/bin - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm communication collectives library"; - homepage = "https://github.com/ROCmSoftwarePlatform/rccl"; - license = with licenses; [ bsd2 bsd3 ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index adaef49976a..a1a22fb38e4 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2023-08-01"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-RexwqNR/Izf2Rzu1cvMw+le6C4EmL4CeWCOc+vXUBZQ="; + hash = "sha256-cKXe8r5MUag/z+seem4Zg/gmqIQjaCY7DBxiKlrnXPs="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 28ed971a25e..437da86e8c2 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -63,8 +63,7 @@ redoxRustPlatform.buildRustPackage rec { DESTDIR=$out make install ''; - # TODO: should be hostPlatform - TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; + TARGET = stdenvNoCC.hostPlatform.rust.rustcTargetSpec; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix index 2083a6a7af4..680455d4cb5 100644 --- a/pkgs/development/libraries/reproc/default.nix +++ b/pkgs/development/libraries/reproc/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=ON" "-DREPROC++=ON" diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index d5f5268ac8e..39a8f1a4b6a 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation rec { simd ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - meta = with lib; { description = "A real-time noise suppression plugin for voice based on Xiph's RNNoise"; homepage = "https://github.com/werman/noise-suppression-for-voice"; diff --git a/pkgs/development/libraries/rocalution/default.nix b/pkgs/development/libraries/rocalution/default.nix deleted file mode 100644 index 2796215d031..00000000000 --- a/pkgs/development/libraries/rocalution/default.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocblas -, rocsparse -, rocprim -, rocrand -, hip -, git -, openmp -, openmpi -, gtest -, buildTests ? false -, buildBenchmarks ? false -, buildSamples ? false -, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocalution"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ] ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocALUTION"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jovhodhNa7tr1bSqpZCKI/9xF7Ie96JB+giqAEfis2k="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - git - ]; - - buildInputs = [ - rocblas - rocsparse - rocprim - rocrand - openmp - openmpi - ] ++ lib.optionals buildTests [ - gtest - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DROCM_PATH=${hip}" - "-DHIP_ROOT_DIR=${hip}" - "-DSUPPORT_HIP=ON" - "-DSUPPORT_OMP=ON" - "-DSUPPORT_MPI=ON" - "-DBUILD_CLIENTS_SAMPLES=${if buildSamples then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.strings.concatStringsSep ";" gpuTargets}" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/rocalution-test $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/rocalution-bench $benchmark/bin - '' + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv clients/staging/* $sample/bin - rm $sample/bin/rocalution-test || true - rm $sample/bin/rocalution-bench || true - - patchelf --set-rpath \ - $out/lib:${lib.makeLibraryPath (finalAttrs.buildInputs ++ [ hip ])} \ - $sample/bin/* - '' + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Iterative sparse solvers for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocblas/default.nix b/pkgs/development/libraries/rocblas/default.nix deleted file mode 100644 index 11385ae6403..00000000000 --- a/pkgs/development/libraries/rocblas/default.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, hip -, python3 -, tensile -, msgpack -, libxml2 -, gtest -, gfortran -, openmp -, amd-blis -, python3Packages -, buildTensile ? true -, buildTests ? false -, buildBenchmarks ? false -, tensileLogic ? "asm_full" -, tensileCOVersion ? "V3" -, tensileSepArch ? true -, tensileLazyLib ? true -, tensileLibFormat ? "msgpack" -, gpuTargets ? [ "all" ] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocblas"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocBLAS"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-XhYpzBXviMnUdbF6lZi9g0LARKpzWLtDxJxLI3MuHiM="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ]; - - buildInputs = [ - python3 - ] ++ lib.optionals buildTensile [ - msgpack - libxml2 - python3Packages.msgpack - ] ++ lib.optionals buildTests [ - gtest - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - gfortran - openmp - amd-blis - ] ++ lib.optionals (buildTensile || buildTests || buildBenchmarks) [ - python3Packages.pyyaml - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-Dpython=python3" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DBUILD_WITH_TENSILE=${if buildTensile then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTensile [ - "-DVIRTUALENV_HOME_DIR=/build/source/tensile" - "-DTensile_TEST_LOCAL_PATH=/build/source/tensile" - "-DTensile_ROOT=/build/source/tensile/lib/python${python3.pythonVersion}/site-packages/Tensile" - "-DTensile_LOGIC=${tensileLogic}" - "-DTensile_CODE_OBJECT_VERSION=${tensileCOVersion}" - "-DTensile_SEPARATE_ARCHITECTURES=${if tensileSepArch then "ON" else "OFF"}" - "-DTensile_LAZY_LIBRARY_LOADING=${if tensileLazyLib then "ON" else "OFF"}" - "-DTensile_LIBRARY_FORMAT=${tensileLibFormat}" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" - ]; - - # Tensile REALLY wants to write to the nix directory if we include it normally - postPatch = lib.optionalString buildTensile '' - cp -a ${tensile} tensile - chmod +w -R tensile - - # Rewrap Tensile - substituteInPlace tensile/bin/{.t*,.T*,*} \ - --replace "${tensile}" "/build/source/tensile" - - substituteInPlace CMakeLists.txt \ - --replace "include(virtualenv)" "" \ - --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" - ''; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - cp -a $out/bin/* $test/bin - rm $test/bin/*-bench || true - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - cp -a $out/bin/* $benchmark/bin - rm $benchmark/bin/*-test || true - '' + lib.optionalString (buildTests || buildBenchmarks ) '' - rm -rf $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "BLAS implementation for ROCm platform"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocBLAS"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix deleted file mode 100644 index 09876ea98a9..00000000000 --- a/pkgs/development/libraries/rocclr/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, rocmUpdateScript -, rocm-comgr -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocclr"; - version = "5.4.4"; - - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "ROCclr"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-DbN7kL8oyaPeYQB19Q96L3wX66v62TMSWl0Yor7Q4kE="; - }; - - patches = [ - # Enable support for gfx8 again - # See the upstream issue: https://github.com/RadeonOpenCompute/ROCm/issues/1659 - # And the arch patch: https://github.com/rocm-arch/rocm-arch/pull/742 - (fetchpatch { - url = "https://raw.githubusercontent.com/John-Gee/rocm-arch/d6812d308fee3caf2b6bb01b4d19fe03a6a0e3bd/rocm-opencl-runtime/enable-gfx800.patch"; - hash = "sha256-59jFDIIsTTZcNns9RyMVWPRUggn/bSlAGrky4quu8B4="; - }) - ]; - - postPatch = '' - substituteInPlace device/comgrctx.cpp \ - --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" - ''; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -a * $out/ - - runHook postInstall - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Source package of the Radeon Open Compute common language runtime"; - homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - # rocclr seems to have some AArch64 ifdefs, but does not seem - # to be supported yet by the build infrastructure. Recheck in - # the future. - platforms = [ "x86_64-linux" ]; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocdbgapi/default.nix b/pkgs/development/libraries/rocdbgapi/default.nix deleted file mode 100644 index dfeb9249914..00000000000 --- a/pkgs/development/libraries/rocdbgapi/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, git -, rocm-comgr -, rocm-runtime -, texlive -, doxygen -, graphviz -, buildDocs ? true -}: - -let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small - changepage - latexmk - varwidth - multirow - hanging - adjustbox - collectbox - stackengine - enumitem - alphalph - wasysym - sectsty - tocloft - newunicodechar - etoc - helvetic - wasy - courier; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "rocdbgapi"; - version = "5.4.2"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ]; - - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "ROCdbgapi"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-KoFa6JzoEPT5/ns9X/hMfu8bOh29HD9n2qGJ3gzhiBA="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - git - ] ++ lib.optionals buildDocs [ - latex - doxygen - graphviz - ]; - - buildInputs = [ - rocm-comgr - rocm-runtime - ]; - - # Unfortunately, it seems like we have to call make on this manually - postBuild = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - make -j$NIX_BUILD_CORES doc - ''; - - postInstall = '' - substituteInPlace $out/lib/cmake/amd-dbgapi/amd-dbgapi-config.cmake \ - --replace "/build/source/build/" "" - - substituteInPlace $out/lib/cmake/amd-dbgapi/amd-dbgapi-targets.cmake \ - --replace "/build/source/build" "$out" - '' + lib.optionalString buildDocs '' - mv $out/share/html/amd-dbgapi $doc/share/doc/amd-dbgapi/html - rmdir $out/share/html - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Debugger support for control of execution and inspection state"; - homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix deleted file mode 100644 index d1136d4be8e..00000000000 --- a/pkgs/development/libraries/rocfft/default.nix +++ /dev/null @@ -1,243 +0,0 @@ -{ rocfft -, lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, hip -, python3 -, rocm-cmake -, sqlite -, boost -, fftw -, fftwFloat -, gtest -, openmp -, rocrand -# NOTE: Update the default GPU targets on every update -, gpuTargets ? [ - "gfx803" - "gfx900" - "gfx906" - "gfx908" - "gfx90a" - "gfx1030" - "gfx1100" - "gfx1102" -] -}: - -let - # To avoid output limit exceeded errors in hydra, we build kernel - # device libs and the kernel RTC cache database in separate derivations - kernelDeviceLibs = map - (target: - (rocfft.overrideAttrs (prevAttrs: { - pname = "rocfft-device-${target}"; - - patches = prevAttrs.patches ++ [ - # Add back install rule for device library - # This workaround is needed because rocm_install_targets - # doesn't support an EXCLUDE_FROM_ALL option - ./device-install.patch - ]; - - buildFlags = [ "rocfft-device-${target}" ]; - - installPhase = '' - runHook preInstall - cmake --install . --component device - runHook postInstall - ''; - - requiredSystemFeatures = [ "big-parallel" ]; - })).override { - gpuTargets = [ target ]; - } - ) - gpuTargets; - - # TODO: Figure out how to also split this by GPU target - # - # It'll be bit more complicated than what we're doing for the kernel - # device libs, because the kernel cache needs to be compiled into - # one sqlite database (whereas the device libs can be linked into - # rocfft as separate libraries for each GPU target). - # - # It's not clear why this needs to even be a db in the first place. - # It would simplify things A LOT if we could just store these - # pre-compiled kernels as files (but that'd need a lot of patching). - kernelRtcCache = rocfft.overrideAttrs (_: { - pname = "rocfft-kernel-cache"; - - buildFlags = [ "rocfft_kernel_cache_target" ]; - - installPhase = '' - runHook preInstall - cmake --install . --component kernel_cache - runHook postInstall - ''; - - requiredSystemFeatures = [ "big-parallel" ]; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "rocfft"; - version = "5.4.3"; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocFFT"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-FsefE0B2hF5ZcHDB6TscwFeZ1NKFkWX7VDpEvvbDbOk="; - }; - - patches = [ - # Exclude kernel compilation & installation from "all" target, - # and split device libraries by GPU target - ./split-kernel-compilation.patch - ]; - - nativeBuildInputs = [ - cmake - hip - python3 - rocm-cmake - ]; - - buildInputs = [ - sqlite - ] ++ lib.optionals (finalAttrs.pname == "rocfft") kernelDeviceLibs; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DUSE_HIP_CLANG=ON" - "-DSQLITE_USE_SYSTEM_PACKAGE=ON" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ]; - - postInstall = lib.optionalString (finalAttrs.pname == "rocfft") '' - ln -s ${kernelRtcCache}/lib/rocfft_kernel_cache.db "$out/lib" - ''; - - passthru = { - test = stdenv.mkDerivation { - pname = "${finalAttrs.pname}-test"; - inherit (finalAttrs) version src; - - sourceRoot = "${finalAttrs.src.name}/clients/tests"; - - nativeBuildInputs = [ - cmake - hip - rocm-cmake - ]; - - buildInputs = [ - boost - fftw - fftwFloat - finalAttrs.finalPackage - gtest - openmp - rocrand - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ]; - - postInstall = '' - rm -r "$out/lib/fftw" - rmdir "$out/lib" - ''; - }; - - benchmark = stdenv.mkDerivation { - pname = "${finalAttrs.pname}-benchmark"; - inherit (finalAttrs) version src; - - sourceRoot = "${finalAttrs.src.name}/clients/rider"; - - nativeBuildInputs = [ - cmake - hip - rocm-cmake - ]; - - buildInputs = [ - boost - finalAttrs.finalPackage - openmp - (python3.withPackages (ps: with ps; [ - pandas - scipy - ])) - rocrand - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ]; - - postInstall = '' - cp -a ../../../scripts/perf "$out/bin" - ''; - }; - - samples = stdenv.mkDerivation { - pname = "${finalAttrs.pname}-samples"; - inherit (finalAttrs) version src; - - sourceRoot = "${finalAttrs.src.name}/clients/samples"; - - nativeBuildInputs = [ - cmake - hip - rocm-cmake - ]; - - buildInputs = [ - boost - finalAttrs.finalPackage - openmp - rocrand - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - ]; - - installPhase = '' - runHook preInstall - mkdir "$out" - cp -a bin "$out" - runHook postInstall - ''; - }; - - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - }; - - meta = with lib; { - description = "FFT implementation for ROCm"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ kira-bruneau ] ++ teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocfft/device-install.patch b/pkgs/development/libraries/rocfft/device-install.patch deleted file mode 100644 index 355cf30d07f..00000000000 --- a/pkgs/development/libraries/rocfft/device-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt -index 73a8ec9..9bfd4b8 100644 ---- a/library/src/device/CMakeLists.txt -+++ b/library/src/device/CMakeLists.txt -@@ -255,4 +255,10 @@ foreach( sub ${AMDGPU_TARGETS} ) - if( NOT BUILD_SHARED_LIBS ) - set_target_properties( rocfft-device-${sub} PROPERTIES PREFIX "lib" ) - endif( ) -+ -+ rocm_install_targets( -+ TARGETS -+ rocfft-device-${sub} -+ COMPONENT device -+ ) - endforeach() diff --git a/pkgs/development/libraries/rocfft/split-kernel-compilation.patch b/pkgs/development/libraries/rocfft/split-kernel-compilation.patch deleted file mode 100644 index 5d71fe399c1..00000000000 --- a/pkgs/development/libraries/rocfft/split-kernel-compilation.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt -index 3a16304..606b711 100644 ---- a/library/src/CMakeLists.txt -+++ b/library/src/CMakeLists.txt -@@ -250,12 +250,12 @@ foreach( target - - endforeach() - --add_executable( rocfft_aot_helper -+add_executable( rocfft_aot_helper EXCLUDE_FROM_ALL - rocfft_aot_helper.cpp - rocfft_stub.cpp - ) - --add_executable( rocfft_config_search -+add_executable( rocfft_config_search EXCLUDE_FROM_ALL - rocfft_config_search.cpp - rocfft_stub.cpp - ) -@@ -279,10 +279,10 @@ endif() - - target_link_libraries( rocfft PRIVATE ${ROCFFT_DEVICE_LINK_LIBS} ) - --target_link_libraries( rocfft PRIVATE rocfft-device-0 ) --target_link_libraries( rocfft PRIVATE rocfft-device-1 ) --target_link_libraries( rocfft PRIVATE rocfft-device-2 ) --target_link_libraries( rocfft PRIVATE rocfft-device-3 ) -+foreach( sub ${AMDGPU_TARGETS} ) -+ target_link_libraries( rocfft PRIVATE -lrocfft-device-${sub} ) -+endforeach() -+ - foreach( target rocfft rocfft_aot_helper rocfft_config_search ) - # RTC uses dladdr to find the RTC helper program - if( NOT WIN32 ) -@@ -347,7 +347,7 @@ add_custom_command( - DEPENDS rocfft_aot_helper rocfft_rtc_helper - COMMENT "Compile kernels into shipped cache file" - ) --add_custom_target( rocfft_kernel_cache_target ALL -+add_custom_target( rocfft_kernel_cache_target - DEPENDS rocfft_kernel_cache.db - VERBATIM - ) -@@ -392,7 +392,8 @@ else() - endif() - rocm_install(FILES ${ROCFFT_KERNEL_CACHE_PATH} - DESTINATION "${ROCFFT_KERNEL_CACHE_INSTALL_DIR}" -- COMPONENT runtime -+ COMPONENT kernel_cache -+ EXCLUDE_FROM_ALL - ) - - # PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -diff --git a/library/src/device/CMakeLists.txt b/library/src/device/CMakeLists.txt -index 9f7b85f..73a8ec9 100644 ---- a/library/src/device/CMakeLists.txt -+++ b/library/src/device/CMakeLists.txt -@@ -170,11 +170,11 @@ list( SORT rocfft_device_source ) - # functions callable by rocFFT and depends on amdhip64, and another - # one usable by AOT RTC that contains no device code - list( FILTER rocfft_device_source EXCLUDE REGEX function_pool.cpp ) --add_library( rocfft-function-pool OBJECT -+add_library( rocfft-function-pool OBJECT EXCLUDE_FROM_ALL - function_pool.cpp - ) - target_compile_definitions( rocfft-function-pool PRIVATE FUNCTION_POOL_STANDALONE_BODY= ) --add_library( rocfft-function-pool-standalone OBJECT -+add_library( rocfft-function-pool-standalone OBJECT EXCLUDE_FROM_ALL - function_pool.cpp - ) - target_compile_definitions( rocfft-function-pool-standalone PRIVATE FUNCTION_POOL_STANDALONE_BODY={} ) -@@ -193,26 +193,15 @@ foreach( pool rocfft-function-pool rocfft-function-pool-standalone ) - add_dependencies(${pool} gen_headers_target) - endforeach() - --list( LENGTH rocfft_device_source rocfft_device_source_len ) --math(EXPR split_len "${rocfft_device_source_len} / 4") --math(EXPR split_idx_2 "${rocfft_device_source_len} / 4 * 2") --math(EXPR split_idx_3 "${rocfft_device_source_len} / 4 * 3") -- --list( SUBLIST rocfft_device_source 0 ${split_len} rocfft_device_source_0 ) --list( SUBLIST rocfft_device_source ${split_len} ${split_len} rocfft_device_source_1 ) --list( SUBLIST rocfft_device_source ${split_idx_2} ${split_len} rocfft_device_source_2 ) --list( SUBLIST rocfft_device_source ${split_idx_3} -1 rocfft_device_source_3 ) -- --foreach( sub RANGE 3 ) -- set( rocfft_device_source_var rocfft_device_source_${sub} ) -+foreach( sub ${AMDGPU_TARGETS} ) - if(NOT SINGLELIB) -- add_library( rocfft-device-${sub} -- ${${rocfft_device_source_var}} ) -+ add_library( rocfft-device-${sub} EXCLUDE_FROM_ALL -+ ${rocfft_device_source} ) - else() - # Compile the device lib as a static library, which is then linked - # into librocfft.so Useful for testing purposes. -- add_library( rocfft-device-${sub} STATIC -- ${${rocfft_device_source_var}} ) -+ add_library( rocfft-device-${sub} STATIC EXCLUDE_FROM_ALL -+ ${rocfft_device_source} ) - - # if we're building singlelib, we don't want to export any of the - # device library symbols to the main library -@@ -241,9 +230,7 @@ foreach( sub RANGE 3 ) - # Set AMD GPU architecture options - - # Enable compilation of desired architectures -- foreach( target ${AMDGPU_TARGETS} ) -- target_compile_options( rocfft-device-${sub} PRIVATE --offload-arch=${target} ) -- endforeach( ) -+ target_compile_options( rocfft-device-${sub} PRIVATE --offload-arch=${sub} ) - - target_include_directories( rocfft-device-${sub} - PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> -@@ -268,9 +255,4 @@ foreach( sub RANGE 3 ) - if( NOT BUILD_SHARED_LIBS ) - set_target_properties( rocfft-device-${sub} PROPERTIES PREFIX "lib" ) - endif( ) -- -- rocm_install_targets( -- TARGETS -- rocfft-device-${sub} -- ) - endforeach() diff --git a/pkgs/development/libraries/rocm-comgr/cmake.patch b/pkgs/development/libraries/rocm-comgr/cmake.patch deleted file mode 100644 index ae966745171..00000000000 --- a/pkgs/development/libraries/rocm-comgr/cmake.patch +++ /dev/null @@ -1,365 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62b857b..d21c7f4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,8 +147,8 @@ if (UNIX) - list(APPEND AMD_COMGR_PUBLIC_LINKER_OPTIONS -pthread) - if (NOT APPLE AND COMGR_BUILD_SHARED_LIBS) - configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/src/exportmap.in -- ${CMAKE_CURRENT_BINARY_DIR}/src/exportmap @ONLY) -+ src/exportmap.in -+ src/exportmap @ONLY) - list(APPEND AMD_COMGR_PRIVATE_LINKER_OPTIONS - "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/src/exportmap") - # When building a shared library with -fsanitize=address we can't be -@@ -175,10 +175,6 @@ endif() - # the shared header. - list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS AMD_COMGR_EXPORT) - --configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/include/amd_comgr.h.in -- ${CMAKE_CURRENT_BINARY_DIR}/include/amd_comgr.h @ONLY) -- - include(bc2h) - include(opencl_pch) - include(DeviceLibs) -@@ -212,10 +208,14 @@ target_include_directories(amd_comgr - $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> - $<INSTALL_INTERFACE:include>) - -+configure_file( -+ include/amd_comgr.h.in -+ include/amd_comgr.h @ONLY) -+ - set(AMD_COMGR_CONFIG_NAME amd_comgr-config.cmake) - set(AMD_COMGR_TARGETS_NAME amd_comgr-targets.cmake) - set(AMD_COMGR_VERSION_NAME amd_comgr-config-version.cmake) --set(AMD_COMGR_PACKAGE_PREFIX ${CMAKE_INSTALL_LIBDIR}/cmake/amd_comgr) -+set(AMD_COMGR_PACKAGE_PREFIX cmake/amd_comgr) - - # Generate the build-tree package. - set(AMD_COMGR_PREFIX_CODE) -@@ -226,13 +226,13 @@ if (NOT COMGR_BUILD_SHARED_LIBS) - endif() - - set(AMD_COMGR_TARGETS_PATH -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") -+ "${CMAKE_CURRENT_BINARY_DIR}/lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") - set(AMD_COMGR_VERSION_PATH -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") -+ "${CMAKE_CURRENT_BINARY_DIR}/lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") - export(TARGETS amd_comgr -- FILE "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") -+ FILE "lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") - configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" -- "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" -+ "lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" - @ONLY) - write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}" - VERSION "${amd_comgr_VERSION}" -@@ -266,7 +266,7 @@ install(FILES - set(AMD_COMGR_PREFIX_CODE " - # Derive absolute install prefix from config file path. - get_filename_component(AMD_COMGR_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") --string(REGEX REPLACE "/" ";" count "${AMD_COMGR_PACKAGE_PREFIX}") -+string(REGEX REPLACE "/" ";" count "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}") - foreach(p ${count}) - set(AMD_COMGR_PREFIX_CODE "${AMD_COMGR_PREFIX_CODE} - get_filename_component(AMD_COMGR_PREFIX \"\${AMD_COMGR_PREFIX}\" PATH)") -@@ -278,20 +278,20 @@ if (NOT COMGR_BUILD_SHARED_LIBS) - string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(LLD REQUIRED)\n") - endif() - --set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") -+set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") - configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" -+ "${AMD_COMGR_CONFIG_NAME}.install" - @ONLY) - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}" - RENAME "${AMD_COMGR_CONFIG_NAME}") - install(EXPORT amd_comgr_export -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}" - FILE "${AMD_COMGR_TARGETS_NAME}") - install(FILES - "${AMD_COMGR_VERSION_PATH}" -- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}") - - if(TARGET clangFrontendTool) - set(CLANG_LIBS -diff --git a/cmake/DeviceLibs.cmake b/cmake/DeviceLibs.cmake -index 27e9546..dfe1b57 100644 ---- a/cmake/DeviceLibs.cmake -+++ b/cmake/DeviceLibs.cmake -@@ -1,8 +1,7 @@ - set(INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) - - set(GEN_LIBRARY_INC_FILE ${INC_DIR}/libraries.inc) -- --file(WRITE ${GEN_LIBRARY_INC_FILE} "// Automatically generated file; DO NOT EDIT.\n") -+set(GEN_LIBRARY_DEFS_INC_FILE ${INC_DIR}/libraries_defs.inc) - - # cmake does not provide a way to query targets produced by a project, - # so we have to make one up. Ordinarily, individual library target -@@ -23,6 +22,7 @@ if(NOT AMD_DEVICE_LIBS_TARGETS) - message(FATAL_ERROR "Could not find list of device libraries") - endif() - -+set(TARGETS_INCLUDES "") - foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) - set(header ${AMDGCN_LIB_TARGET}.inc) - -@@ -54,75 +54,52 @@ foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) - add_custom_target(${AMDGCN_LIB_TARGET}_header DEPENDS ${INC_DIR}/${header}) - add_dependencies(amd_comgr ${AMDGCN_LIB_TARGET}_header) - -- file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"${header}\"\n") -+ list(APPEND TARGETS_INCLUDES "#include \"${header}\"") -+endforeach() -+ -+list(JOIN TARGETS_INCLUDES "\n" TARGETS_INCLUDES) -+file(GENERATE OUTPUT ${GEN_LIBRARY_INC_FILE} CONTENT "${TARGETS_INCLUDES}") -+ -+foreach(OPENCL_VERSION 1.2 2.0) -+ string(REPLACE . _ OPENCL_UNDERSCORE_VERSION ${OPENCL_VERSION}) -+ add_custom_command(OUTPUT ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc -+ COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl${OPENCL_VERSION}-c.pch -+ ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc -+ opencl${OPENCL_UNDERSCORE_VERSION}_c -+ DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl${OPENCL_VERSION}-c.pch -+ COMMENT "Generating opencl${OPENCL_VERSION}-c.inc" -+ ) -+ set_property(DIRECTORY APPEND PROPERTY -+ ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc) -+ add_custom_target(opencl${OPENCL_VERSION}-c.inc_target DEPENDS ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc) -+ add_dependencies(amd_comgr opencl${OPENCL_VERSION}-c.inc_target) - endforeach() - --add_custom_command(OUTPUT ${INC_DIR}/opencl1.2-c.inc -- COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.pch -- ${INC_DIR}/opencl1.2-c.inc -- opencl1_2_c -- DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.pch -- COMMENT "Generating opencl1.2-c.inc" --) --set_property(DIRECTORY APPEND PROPERTY -- ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl1.2-c.inc) --add_custom_target(opencl1.2-c.inc_target DEPENDS ${INC_DIR}/opencl1.2-c.inc) --add_dependencies(amd_comgr opencl1.2-c.inc_target) --file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"opencl1.2-c.inc\"\n") -- --add_custom_command(OUTPUT ${INC_DIR}/opencl2.0-c.inc -- COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.pch -- ${INC_DIR}/opencl2.0-c.inc -- opencl2_0_c -- DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.pch -- COMMENT "Generating opencl2.0-c.inc" --) --set_property(DIRECTORY APPEND PROPERTY -- ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl2.0-c.inc) --add_custom_target(opencl2.0-c.inc_target DEPENDS ${INC_DIR}/opencl2.0-c.inc) --add_dependencies(amd_comgr opencl2.0-c.inc_target) --file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"opencl2.0-c.inc\"\n") -- --# Generate function to select libraries for a given GFXIP number. --file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"llvm/ADT/StringRef.h\"\n") --file(APPEND ${GEN_LIBRARY_INC_FILE} -- "static std::tuple<const char*, const void*, size_t> get_oclc_isa_version(llvm::StringRef gfxip) {") -+set(TARGETS_DEFS "") -+list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_TARGET\n#define AMD_DEVICE_LIBS_TARGET(t)\n#endif") -+list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_GFXIP\n#define AMD_DEVICE_LIBS_GFXIP(t, g)\n#endif") -+list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_FUNCTION\n#define AMD_DEVICE_LIBS_FUNCTION(t, f)\n#endif") -+list(APPEND TARGETS_DEFS "") - foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) -+ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_TARGET(${AMDGCN_LIB_TARGET})") -+ # Generate function to select libraries for a given GFXIP number. - if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_isa_version_.+$") - string(REGEX REPLACE "^oclc_isa_version_(.+)$" "\\1" gfxip ${AMDGCN_LIB_TARGET}) -- file(APPEND ${GEN_LIBRARY_INC_FILE} -- "if (gfxip == \"${gfxip}\") return std::make_tuple(\"${AMDGCN_LIB_TARGET}.bc\", ${AMDGCN_LIB_TARGET}_lib, ${AMDGCN_LIB_TARGET}_lib_size);") -+ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_GFXIP(${AMDGCN_LIB_TARGET}, \"${gfxip}\")") - endif() --endforeach() --file(APPEND ${GEN_LIBRARY_INC_FILE} -- "return std::make_tuple(nullptr, nullptr, 0); }") -- --# Generate function to select libraries for given feature. --foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) -+ # Generate function to select libraries for given feature. - if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_.*_on$") - string(REGEX REPLACE "^oclc_(.*)_on" "\\1" function ${AMDGCN_LIB_TARGET}) -- file(APPEND ${GEN_LIBRARY_INC_FILE} -- "static std::tuple<const char*, const void*, size_t> get_oclc_${function}(bool on) { \ -- return std::make_tuple( \ -- on ? \"oclc_${function}_on_lib.bc\" : \"oclc_${function}_off_lib.bc\", \ -- on ? oclc_${function}_on_lib : oclc_${function}_off_lib, \ -- on ? oclc_${function}_on_lib_size : oclc_${function}_off_lib_size \ -- ); }") -+ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_FUNCTION(${AMDGCN_LIB_TARGET}, ${function})") - endif() - endforeach() - --# Generate function yield all libraries. --file(APPEND ${GEN_LIBRARY_INC_FILE} "\n#include \"llvm/ADT/ArrayRef.h\"\n") --file(APPEND ${GEN_LIBRARY_INC_FILE} -- "llvm::ArrayRef<std::tuple<llvm::StringRef, llvm::StringRef>> COMGR::getDeviceLibraries() { \ -- static std::tuple<llvm::StringRef, llvm::StringRef> DeviceLibs[] = {") --foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) -- file(APPEND ${GEN_LIBRARY_INC_FILE} -- "{\"${AMDGCN_LIB_TARGET}.bc\", llvm::StringRef(reinterpret_cast<const char *>(${AMDGCN_LIB_TARGET}_lib), ${AMDGCN_LIB_TARGET}_lib_size)},") --endforeach() --file(APPEND ${GEN_LIBRARY_INC_FILE} -- "}; \ -- return DeviceLibs; \ -- }") -+list(APPEND TARGETS_DEFS "") -+list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_TARGET") -+list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_GFXIP") -+list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_FUNCTION") -+ -+list(JOIN TARGETS_DEFS "\n" TARGETS_DEFS) -+file(GENERATE OUTPUT ${GEN_LIBRARY_DEFS_INC_FILE} CONTENT "${TARGETS_DEFS}") - - include_directories(${INC_DIR}) -diff --git a/cmake/bc2h.cmake b/cmake/bc2h.cmake -index 146fe2b..9134985 100644 ---- a/cmake/bc2h.cmake -+++ b/cmake/bc2h.cmake -@@ -1,40 +1,41 @@ --file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c --"#include <stdio.h>\n" --"int main(int argc, char **argv){\n" --" FILE *ifp, *ofp;\n" --" int c, i, l;\n" --" if (argc != 4) return 1;\n" --" ifp = fopen(argv[1], \"rb\");\n" --" if (!ifp) return 1;\n" --" i = fseek(ifp, 0, SEEK_END);\n" --" if (i < 0) return 1;\n" --" l = ftell(ifp);\n" --" if (l < 0) return 1;\n" --" i = fseek(ifp, 0, SEEK_SET);\n" --" if (i < 0) return 1;\n" --" ofp = fopen(argv[2], \"wb+\");\n" --" if (!ofp) return 1;\n" --" fprintf(ofp, \"#define %s_size %d\\n\\n\"\n" --" \"#if defined __GNUC__\\n\"\n" --" \"__attribute__((aligned (4096)))\\n\"\n" --" \"#elif defined _MSC_VER\\n\"\n" --" \"__declspec(align(4096))\\n\"\n" --" \"#endif\\n\"\n" --" \"static const unsigned char %s[%s_size+1] = {\",\n" --" argv[3], l,\n" --" argv[3], argv[3]);\n" --" i = 0;\n" --" while ((c = getc(ifp)) != EOF) {\n" --" if (0 == (i&7)) fprintf(ofp, \"\\n \");\n" --" fprintf(ofp, \" 0x%02x,\", c);\n" --" ++i;\n" --" }\n" --" fprintf(ofp, \" 0x00\\n};\\n\\n\");\n" --" fclose(ifp);\n" --" fclose(ofp);\n" --" return 0;\n" --"}\n" --) -+file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c -+ CONTENT -+"#include <stdio.h> -+int main(int argc, char **argv){ -+ FILE *ifp, *ofp; -+ int c, i, l; -+ if (argc != 4) return 1; -+ ifp = fopen(argv[1], \"rb\"); -+ if (!ifp) return 1; -+ i = fseek(ifp, 0, SEEK_END); -+ if (i < 0) return 1; -+ l = ftell(ifp); -+ if (l < 0) return 1; -+ i = fseek(ifp, 0, SEEK_SET); -+ if (i < 0) return 1; -+ ofp = fopen(argv[2], \"wb+\"); -+ if (!ofp) return 1; -+ fprintf(ofp, \"#define %s_size %d\\n\\n\" -+ \"#if defined __GNUC__\\n\" -+ \"__attribute__((aligned (4096)))\\n\" -+ \"#elif defined _MSC_VER\\n\" -+ \"__declspec(align(4096))\\n\" -+ \"#endif\\n\" -+ \"static const unsigned char %s[%s_size+1] = {\", -+ argv[3], l, -+ argv[3], argv[3]); -+ i = 0; -+ while ((c = getc(ifp)) != EOF) { -+ if (0 == (i&7)) fprintf(ofp, \"\\n \"); -+ fprintf(ofp, \" 0x%02x,\", c); -+ ++i; -+ } -+ fprintf(ofp, \" 0x00\\n};\\n\\n\"); -+ fclose(ifp); -+ fclose(ofp); -+ return 0; -+} -+") - - add_executable(bc2h ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c) - if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") -diff --git a/src/comgr-device-libs.cpp b/src/comgr-device-libs.cpp -index 4d2b914..80786d1 100644 ---- a/src/comgr-device-libs.cpp -+++ b/src/comgr-device-libs.cpp -@@ -35,7 +35,7 @@ - - #include "comgr-device-libs.h" - #include "comgr.h" --#include "libraries.inc" -+#include "comgr-libraries.h" - #include "llvm/ADT/StringSwitch.h" - #include <cstdint> - -diff --git a/src/comgr-libraries.h b/src/comgr-libraries.h -new file mode 100644 -index 0000000..3caa0a0 ---- /dev/null -+++ b/src/comgr-libraries.h -@@ -0,0 +1,34 @@ -+#include "libraries.inc" -+#include "opencl1.2-c.inc" -+#include "opencl2.0-c.inc" -+#include "llvm/ADT/StringRef.h" -+#include "llvm/ADT/ArrayRef.h" -+ -+static std::tuple<const char*, const void*, size_t> get_oclc_isa_version(llvm::StringRef gfxip) { -+#define AMD_DEVICE_LIBS_GFXIP(target, target_gfxip) \ -+ if (gfxip == target_gfxip) return std::make_tuple(#target ".bc", target##_lib, target##_lib_size); -+#include "libraries_defs.inc" -+ -+ return std::make_tuple(nullptr, nullptr, 0); -+} -+ -+#define AMD_DEVICE_LIBS_FUNCTION(target, function) \ -+ static std::tuple<const char*, const void*, size_t> get_oclc_##function(bool on) { \ -+ return std::make_tuple( \ -+ on ? "oclc_" #function "_on_lib.bc" : "oclc_" #function "_off_lib.bc", \ -+ on ? oclc_##function##_on_lib : oclc_##function##_off_lib, \ -+ on ? oclc_##function##_on_lib_size : oclc_##function##_off_lib_size \ -+ ); \ -+ } -+#include "libraries_defs.inc" -+ -+llvm::ArrayRef<std::tuple<llvm::StringRef, llvm::StringRef>> COMGR::getDeviceLibraries() { -+ static std::tuple<llvm::StringRef, llvm::StringRef> DeviceLibs[] = { -+#define AMD_DEVICE_LIBS_TARGET(target) \ -+ {#target ".bc", llvm::StringRef(reinterpret_cast<const char *>(target##_lib), target##_lib_size)}, -+#include "libraries_defs.inc" -+ }; -+ return DeviceLibs; -+} -+ -+ diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix deleted file mode 100644 index 6dc7b87934f..00000000000 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocm-device-libs -, libxml2 -}: - -let - llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" - else throw "Unsupported ROCm LLVM platform"; -in stdenv.mkDerivation (finalAttrs: { - pname = "rocm-comgr"; - version = "5.4.4"; - - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "ROCm-CompilerSupport"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-qLsrBTeSop7lIQv8gZDwgpvGZJOAq90zsvMi1QpfbAs="; - }; - - patches = [ ./cmake.patch ]; - sourceRoot = "${finalAttrs.src.name}/lib/comgr"; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - buildInputs = [ - rocm-device-libs - libxml2 - ]; - - cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "APIs for compiling and inspecting AMDGPU code objects"; - homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; - license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocm-core/default.nix b/pkgs/development/libraries/rocm-core/default.nix deleted file mode 100644 index 9f1a4ab4ccf..00000000000 --- a/pkgs/development/libraries/rocm-core/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, runCommand -, substituteAll -, cmake -}: - -let - rocm_version = with lib; concatStrings (intersperse "0" (splitString "." stdenv.cc.version)); -in stdenv.mkDerivation (finalAttrs: { - pname = "rocm-core"; - version = stdenv.cc.version; - - # Based on https://github.com/rocm-arch/rocm-arch/tree/ad0b15690d403e5822db062ffff4db3912de6669/rocm-core - src = let - rocm_major = lib.versions.major finalAttrs.version; - rocm_minor = lib.versions.minor finalAttrs.version; - rocm_patch = lib.versions.patch finalAttrs.version; - - cmake_lists = substituteAll { - inherit rocm_version; - src = ./src/CMakeLists.txt; - }; - - version_c = substituteAll { - inherit rocm_major rocm_minor rocm_patch; - src = ./src/rocm_version.c; - }; - - version_h = substituteAll { - inherit rocm_major rocm_minor rocm_patch; - src = ./src/rocm_version.h; - }; - in runCommand "rocm-core-${finalAttrs.version}-source" { preferLocalBuild = true; } '' - mkdir -p $out/rocm-core - ln -s ${cmake_lists} $out/CMakeLists.txt - ln -s ${version_c} $out/rocm_version.c - ln -s ${version_h} $out/rocm-core/rocm_version.h - ''; - - nativeBuildInputs = [ cmake ]; - - postInstall = '' - mkdir -p $out/include - cp -a ../rocm-core $out/include - ln -s $out/include/rocm-core/rocm_version.h $out/include - ln -s $out/lib/librocm-core.so.1.0.${rocm_version} $out/lib/librocm-core.so.1 - ''; - - meta = with lib; { - description = "ROCm core"; - homepage = "https://docs.amd.com"; - license = with licenses; [ ncsa ]; # See src/rocm_version.h - maintainers = teams.rocm.members; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/rocm-core/src/CMakeLists.txt b/pkgs/development/libraries/rocm-core/src/CMakeLists.txt deleted file mode 100644 index b2d9fc1f53b..00000000000 --- a/pkgs/development/libraries/rocm-core/src/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 3.23) -project(rocm-core) -add_library(rocm-core SHARED rocm_version.c) -set_target_properties(rocm-core PROPERTIES VERSION "1.0.@rocm_version@") -install(TARGETS rocm-core LIBRARY DESTINATION lib) diff --git a/pkgs/development/libraries/rocm-core/src/rocm_version.c b/pkgs/development/libraries/rocm-core/src/rocm_version.c deleted file mode 100644 index a35dfc6a72c..00000000000 --- a/pkgs/development/libraries/rocm-core/src/rocm_version.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "rocm-core/rocm_version.h" - -VerErrors getROCmVersion(unsigned int *Major, unsigned int *Minor, - unsigned int *Patch) { - *Major = @rocm_major@; - *Minor = @rocm_minor@; - *Patch = @rocm_patch@; - - return 0; -} diff --git a/pkgs/development/libraries/rocm-core/src/rocm_version.h b/pkgs/development/libraries/rocm-core/src/rocm_version.h deleted file mode 100644 index d112a68b865..00000000000 --- a/pkgs/development/libraries/rocm-core/src/rocm_version.h +++ /dev/null @@ -1,82 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// The University of Illinois/NCSA -// Open Source License (NCSA) -// -// Copyright (c) 2014-2021, Advanced Micro Devices, Inc. All rights reserved. -// -// Developed by: -// -// AMD Research and AMD HSA Software Development -// -// Advanced Micro Devices, Inc. -// -// www.amd.com -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal with the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// - Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimers. -// - Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimers in -// the documentation and/or other materials provided with the distribution. -// - Neither the names of Advanced Micro Devices, Inc, -// nor the names of its contributors may be used to endorse or promote -// products derived from this Software without specific prior written -// permission. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS WITH THE SOFTWARE. -// -//////////////////////////////////////////////////////////////////////////////// - - -#ifndef _ROCM_VERSION_H_ -#define _ROCM_VERSION_H_ - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define ROCM_VERSION_MAJOR @rocm_major@ -#define ROCM_VERSION_MINOR @rocm_minor@ -#define ROCM_VERSION_PATCH @rocm_patch@ - - -typedef enum { - VerSuccess=0, - VerIncorrecPararmeters, - VerValuesNotDefined, - VerErrorMAX //This should always be last value in the enumerations -} VerErrors; - - -// API for getting the verion -// Return val : VerErros : API execution status. The parameters are valid only when the exetution status is SUCCESS==0 -VerErrors getROCmVersion(unsigned int* Major, unsigned int* Minor, unsigned int* Patch) __attribute__((nonnull)) ; -// Usage : -// int mj=0,mn=0,p=0,ret=0; -// ret=getROCMVersion(&mj,&mn,&p); -// if(ret !=VerSuccess ) // error occured -// -// check for the values and -// - - -#ifdef __cplusplus -} // end extern "C" block -#endif - -#endif //_ROCM_VERSION_H_ header guard diff --git a/pkgs/development/libraries/rocm-device-libs/cmake.patch b/pkgs/development/libraries/rocm-device-libs/cmake.patch deleted file mode 100644 index 500ff37a990..00000000000 --- a/pkgs/development/libraries/rocm-device-libs/cmake.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake -index 07c60eb..c736b3e 100644 ---- a/cmake/Packages.cmake -+++ b/cmake/Packages.cmake -@@ -12,24 +12,29 @@ set_target_properties(${target} PROPERTIES - IMPORTED_LOCATION \"${target_path}\")") - endforeach() - configure_file(AMDDeviceLibsConfig.cmake.in -- ${PACKAGE_PREFIX}/AMDDeviceLibsConfig.cmake -+ lib/cmake/AMDDeviceLibs/AMDDeviceLibsConfig.cmake - @ONLY) - - - set(install_path_suffix "amdgcn/bitcode") - - # Generate the install-tree package. --# We do not know the absolute path to the intall tree until we are installed, --# so we calculate it dynamically in AMD_DEVICE_LIBS_PREFIX_CODE and use --# relative paths in the target imports in AMD_DEVICE_LIBS_TARGET_CODE. --set(AMD_DEVICE_LIBS_PREFIX_CODE " -+if(IS_ABSOLUTE "${CMAKE_INSTALL_PREFIX}") -+ set(AMD_DEVICE_LIBS_PREFIX_CODE "set(AMD_DEVICE_LIBS_PREFIX \"${CMAKE_INSTALL_PREFIX}\")") -+else() -+ # We do not know the absolute path to the install tree until we are installed, -+ # so we calculate it dynamically in AMD_DEVICE_LIBS_PREFIX_CODE and use -+ # relative paths in the target imports in AMD_DEVICE_LIBS_TARGET_CODE. -+ set(AMD_DEVICE_LIBS_PREFIX_CODE " - # Derive absolute install prefix from config file path. - get_filename_component(AMD_DEVICE_LIBS_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") --string(REGEX REPLACE "/" ";" count "${PACKAGE_PREFIX}") --foreach(p ${count}) -- set(AMD_DEVICE_LIBS_PREFIX_CODE "${AMD_DEVICE_LIBS_PREFIX_CODE} -+ string(REGEX REPLACE "/" ";" count "${PACKAGE_PREFIX}") -+ foreach(p ${count}) -+ set(AMD_DEVICE_LIBS_PREFIX_CODE "${AMD_DEVICE_LIBS_PREFIX_CODE} - get_filename_component(AMD_DEVICE_LIBS_PREFIX \"\${AMD_DEVICE_LIBS_PREFIX}\" PATH)") --endforeach() -+ endforeach() -+endif() -+ - set(AMD_DEVICE_LIBS_TARGET_CODE) - foreach(target ${AMDGCN_LIB_LIST}) - get_target_property(target_name ${target} ARCHIVE_OUTPUT_NAME) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix deleted file mode 100644 index 92e84fe1419..00000000000 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, libxml2 -}: - -let - llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" - else throw "Unsupported ROCm LLVM platform"; -in stdenv.mkDerivation (finalAttrs: { - pname = "rocm-device-libs"; - version = "5.4.4"; - - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "ROCm-Device-Libs"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-8gxvgy2GlROxM5qKtZVu5Lxa1FmTIVlBTpfp8rxhNhk="; - }; - - patches = [ ./cmake.patch ]; - - nativeBuildInputs = [ - cmake - rocm-cmake - ]; - - buildInputs = [ libxml2 ]; - cmakeFlags = [ "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Set of AMD-specific device-side language runtime libraries"; - homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; - license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix deleted file mode 100644 index 4602d3646e4..00000000000 --- a/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, stdenv -, callPackage -, rocm-opencl-runtime -}: - -stdenv.mkDerivation rec { - pname = "rocm-opencl-icd"; - version = rocm-opencl-runtime.version; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/etc/OpenCL/vendors - echo "${rocm-opencl-runtime}/lib/libamdocl64.so" > $out/etc/OpenCL/vendors/amdocl64.icd - ''; - - passthru.impureTests = { rocm-opencl = callPackage ./test.nix { }; }; - - meta = with lib; { - description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; - license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/rocm-opencl-icd/test.nix b/pkgs/development/libraries/rocm-opencl-icd/test.nix deleted file mode 100644 index 398a4818e7c..00000000000 --- a/pkgs/development/libraries/rocm-opencl-icd/test.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, makeImpureTest, clinfo, rocm-opencl-icd, rocm-smi }: -makeImpureTest { - name = "rocm-opencl"; - testedPackage = "rocm-opencl-icd"; - - nativeBuildInputs = [ clinfo rocm-smi ]; - - OCL_ICD_VENDORS = "${rocm-opencl-icd}/etc/OpenCL/vendors/"; - - testScript = '' - # Test fails if the number of platforms is 0 - clinfo | grep -E 'Number of platforms * [1-9]' - rocm-smi | grep -A1 GPU - ''; - - meta = with lib; { - maintainers = teams.rocm.members; - }; -} diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix deleted file mode 100644 index ebdb4e3177d..00000000000 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, addOpenGLRunpath -, cmake -, rocm-comgr -, rocm-runtime -, rocclr -, glew -, libX11 -, numactl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-opencl-runtime"; - version = "5.4.4"; - - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "ROCm-OpenCL-Runtime"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-E1+Y/fgp5b+7H1LN+O1fwVi0/XRCgvsiSxTY3u/q+8I="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - rocm-comgr - rocm-runtime - glew - libX11 - numactl - ]; - - cmakeFlags = [ - "-DAMD_OPENCL_PATH=${finalAttrs.src}" - "-DROCCLR_PATH=${rocclr}" - ]; - - dontStrip = true; - - # Remove clinfo, which is already provided through the - # `clinfo` package. - postInstall = '' - rm -rf $out/bin - ''; - - # Fix the ICD installation path for NixOS - postPatch = '' - substituteInPlace khronos/icd/loader/linux/icd_linux.c \ - --replace 'ICD_VENDOR_PATH' '"${addOpenGLRunpath.driverLink}/etc/OpenCL/vendors/"' - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; - homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ acowley lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix deleted file mode 100644 index d10f7811ccb..00000000000 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, pkg-config -, cmake -, xxd -, rocm-device-libs -, rocm-thunk -, libelf -, libdrm -, numactl -, valgrind -, libxml2 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-runtime"; - version = "5.4.3"; - - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "ROCR-Runtime"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JkTXTQmdESHSFbA6HZdMK3pYEApz9aoAlMzdXayzdyY="; - }; - - sourceRoot = "${finalAttrs.src.name}/src"; - - nativeBuildInputs = [ - pkg-config - cmake - xxd - ]; - - buildInputs = [ - rocm-thunk - libelf - libdrm - numactl - valgrind - libxml2 - ]; - - postPatch = '' - patchShebangs image/blit_src/create_hsaco_ascii_file.sh - patchShebangs core/runtime/trap_handler/create_trap_handler_header.sh - - substituteInPlace CMakeLists.txt \ - --replace 'hsa/include/hsa' 'include/hsa' - - # We compile clang before rocm-device-libs, so patch it in afterwards - substituteInPlace image/blit_src/CMakeLists.txt \ - --replace '-cl-denorms-are-zero' '-cl-denorms-are-zero --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode' - ''; - - fixupPhase = '' - rm -rf $out/hsa/* - ln -s $out/{include,lib} $out/hsa - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Platform runtime for ROCm"; - homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; - license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix deleted file mode 100644 index 86f0044799c..00000000000 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, pkg-config -, cmake -, rocm-cmake -, libdrm -, numactl -, valgrind -, gcc -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocm-thunk"; - version = "5.4.4"; - - src = fetchFromGitHub { - owner = "RadeonOpenCompute"; - repo = "ROCT-Thunk-Interface"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-EU5toaKzVeZpdm/YhaQ0bXq0eoYwYQ5qGLUJzxgZVjE="; - }; - - nativeBuildInputs = [ - pkg-config - cmake - rocm-cmake - ]; - - buildInputs = [ - libdrm - numactl - valgrind - gcc.cc.libgcc or null # TODO: unhack this? - ]; - - cmakeFlags = [ - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Radeon open compute thunk interface"; - homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; - license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ lovesegfault ] ++ teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix deleted file mode 100644 index b8dee138543..00000000000 --- a/pkgs/development/libraries/rocmlir/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, ninja -, hip -, rocminfo -, git -, libxml2 -, libedit -, zlib -, ncurses -, python3 -, buildRockCompiler ? false -}: - -# Theoretically, we could have our MLIR have an output -# with the source and built objects so that we can just -# use it as the external LLVM repo for this -let - llvmNativeTarget = - if stdenv.isx86_64 then "X86" - else if stdenv.isAarch64 then "AArch64" - else throw "Unsupported ROCm LLVM platform"; -in stdenv.mkDerivation (finalAttrs: { - pname = "rocmlir"; - version = "5.4.1"; - - outputs = [ - "out" - ] ++ lib.optionals (!buildRockCompiler) [ - "external" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocMLIR"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-MokE7Ej8mLHTQeLYvKr7PPlsNG6ul91fqfXDlGu5JpI="; - }; - - nativeBuildInputs = [ - cmake - ninja - ] ++ lib.optionals (!buildRockCompiler) [ - hip - ]; - - buildInputs = [ - git - libxml2 - libedit - python3 - ]; - - propagatedBuildInputs = [ - zlib - ncurses - ]; - - cmakeFlags = [ - "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" - "-DLLVM_ENABLE_ZLIB=ON" - "-DLLVM_ENABLE_TERMINFO=ON" - ] ++ lib.optionals buildRockCompiler [ - "-DBUILD_FAT_LIBROCKCOMPILER=ON" - ] ++ lib.optionals (!buildRockCompiler) [ - "-DROCM_PATH=${rocminfo}" - "-DROCM_TEST_CHIPSET=gfx000" - ]; - - dontBuild = true; - doCheck = true; - - # Certain libs aren't being generated, try enabling tests next update - checkTarget = if buildRockCompiler - then "librockCompiler" - else "check-mlir-miopen-build-only"; - - postInstall = let - libPath = lib.makeLibraryPath [ zlib ncurses hip stdenv.cc.cc ]; - in lib.optionals (!buildRockCompiler) '' - mkdir -p $external/lib - cp -a external/llvm-project/llvm/lib/{*.a*,*.so*} $external/lib - patchelf --set-rpath $external/lib:$out/lib:${libPath} $external/lib/*.so* - patchelf --set-rpath $out/lib:$external/lib:${libPath} $out/{bin/*,lib/*.so*} - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - page = "tags?per_page=2"; - filter = ".[1].name | split(\"-\") | .[1]"; - }; - - meta = with lib; { - description = "MLIR-based convolution and GEMM kernel generator"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; - license = with licenses; [ asl20 ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocprim/default.nix b/pkgs/development/libraries/rocprim/default.nix deleted file mode 100644 index 9b6ed7edc47..00000000000 --- a/pkgs/development/libraries/rocprim/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, hip -, gtest -, gbenchmark -, buildTests ? false -, buildBenchmarks ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocprim"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocPRIM"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-Sqr3lbDMK1Gwucqmr/CHoxw/L6bGj3wlXoHzKTnTqoc="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ]; - - buildInputs = lib.optionals buildTests [ - gtest - ] ++ lib.optionals buildBenchmarks [ - gbenchmark - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_TEST=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_BENCHMARK=ON" - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/benchmark_* $benchmark/bin - '' + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm parallel primitives"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch b/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch deleted file mode 100644 index b70163b08e4..00000000000 --- a/pkgs/development/libraries/rocprofiler/0000-dont-require-hsa_amd_aqlprofile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/util/hsa_rsrc_factory.cpp b/src/util/hsa_rsrc_factory.cpp -index 643ff16..c08d98f 100644 ---- a/src/util/hsa_rsrc_factory.cpp -+++ b/src/util/hsa_rsrc_factory.cpp -@@ -127,15 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize - if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); - if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); - -- // Get AqlProfile API table -- aqlprofile_api_ = {0}; --#ifdef ROCP_LD_AQLPROFILE -- status = LoadAqlProfileLib(&aqlprofile_api_); --#else -- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); --#endif -- CHECK_STATUS("aqlprofile API table load failed", status); -- - // Get Loader API table - loader_api_ = {0}; - status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_LOADER, 1, sizeof(loader_api_), &loader_api_); diff --git a/pkgs/development/libraries/rocprofiler/default.nix b/pkgs/development/libraries/rocprofiler/default.nix deleted file mode 100644 index e7e0c9fed65..00000000000 --- a/pkgs/development/libraries/rocprofiler/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-runtime -, rocm-thunk -, roctracer -, numactl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocprofiler"; - version = "5.4.3"; - - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "rocprofiler"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-CpD/+soMN8WTeSb5X7dsnZ596PMkw+4EVsVSvFtKCak="; - }; - - patches = [ ./0000-dont-require-hsa_amd_aqlprofile.patch ]; - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - rocm-thunk - rocm-runtime - numactl - ]; - - cmakeFlags = [ - "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - postPatch = '' - patchShebangs bin test - - substituteInPlace cmake_modules/env.cmake \ - --replace "FATAL_ERROR \"AQL_PROFILE" "WARNING \"AQL_PROFILE" - ''; - - postInstall = '' - patchelf --set-rpath $out/lib:${lib.makeLibraryPath finalAttrs.buildInputs} $out/lib/rocprofiler/librocprof-tool.so - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Profiling with perf-counters and derived metrics"; - homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler"; - license = with licenses; [ mit ]; # mitx11 - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor stdenv.cc.version; - }; -}) diff --git a/pkgs/development/libraries/rocr-debug-agent/default.nix b/pkgs/development/libraries/rocr-debug-agent/default.nix deleted file mode 100644 index 4361ffec345..00000000000 --- a/pkgs/development/libraries/rocr-debug-agent/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, hip -, git -, rocdbgapi -, rocm-runtime -, elfutils -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocr-debug-agent"; - version = "5.4.2"; - - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "rocr_debug_agent"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5l6svWSWCxVoyr1zJabxbt5rXQMtdZtHrf9gS2PcRKc="; - }; - - nativeBuildInputs = [ - cmake - hip - git - ]; - - buildInputs = [ - rocdbgapi - rocm-runtime - elfutils - ]; - - cmakeFlags = [ - "-DCMAKE_MODULE_PATH=${hip}/lib/cmake/hip" - "-DHIP_ROOT_DIR=${hip}" - "-DHIP_PATH=${hip}" - ]; - - # Weird install target - postInstall = '' - rm -rf $out/src - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Library that provides some debugging functionality for ROCr"; - homepage = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent"; - license = with licenses; [ ncsa ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocrand/default.nix b/pkgs/development/libraries/rocrand/default.nix deleted file mode 100644 index 5128e17376c..00000000000 --- a/pkgs/development/libraries/rocrand/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, hip -, gtest -, gbenchmark -, buildTests ? false -, buildBenchmarks ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocrand"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocRAND"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-xK1JRTW+7odlXRQV9WC6ZfXqRKow/TQ9grHCigw+/us="; - fetchSubmodules = true; # For inline hipRAND - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ]; - - buildInputs = lib.optionals buildTests [ - gtest - ] ++ lib.optionals buildBenchmarks [ - gbenchmark - ]; - - cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${hip}" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_TEST=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_BENCHMARK=ON" - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/test_* $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/benchmark_* $benchmark/bin - '' + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Generate pseudo-random and quasi-random numbers"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocsolver/default.nix b/pkgs/development/libraries/rocsolver/default.nix deleted file mode 100644 index 632e93fa6c0..00000000000 --- a/pkgs/development/libraries/rocsolver/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocblas -, hip -, fmt -, gtest -, gfortran -, lapack-reference -, buildTests ? false -, buildBenchmarks ? false -, gpuTargets ? [ ] # gpuTargets = [ "gfx803" "gfx900" "gfx906:xnack-" ] -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocsolver"; - version = "5.4.4"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocSOLVER"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-UHUcA9CVPuYFpE2DTvRrRMMj51yNPo5wMTKnByL2RTg="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - gfortran - ]; - - buildInputs = [ - rocblas - fmt - ] ++ lib.optionals buildTests [ - gtest - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - lapack-reference - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals (gpuTargets != [ ]) [ - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/rocsolver-test $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/rocsolver-bench $benchmark/bin - '' + lib.optionalString (buildTests || buildBenchmarks) '' - rmdir $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "ROCm LAPACK implementation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER"; - license = with licenses; [ bsd2 ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocsparse/default.nix b/pkgs/development/libraries/rocsparse/default.nix deleted file mode 100644 index d821ee69388..00000000000 --- a/pkgs/development/libraries/rocsparse/default.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchzip -, rocmUpdateScript -, cmake -, rocm-cmake -, rocprim -, hip -, gfortran -, git -, gtest -, boost -, python3Packages -, buildTests ? false -, buildBenchmarks ? false # Seems to depend on tests -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocsparse"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocSPARSE"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-jzHD55c4rlPab5IAj2UzHTJI9MKhTfevsLthSZKOEzQ="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - gfortran - ]; - - buildInputs = [ - rocprim - git - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - gtest - boost - python3Packages.python - python3Packages.pyyaml - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=hipcc" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DBUILD_CLIENTS_TESTS=ON" - "-DCMAKE_MATRICES_DIR=/build/source/matrices" - "-Dpython=python3" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" - ]; - - # We have to manually generate the matrices - postPatch = lib.optionalString (buildTests || buildBenchmarks) '' - mkdir -p matrices - - ln -s ${finalAttrs.passthru.matrices.matrix-01}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-02}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-03}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-04}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-05}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-06}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-07}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-08}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-09}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-10}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-11}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-12}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-13}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-14}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-15}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-16}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-17}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-18}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-19}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-20}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-21}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-22}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-23}/*.mtx matrices - ln -s ${finalAttrs.passthru.matrices.matrix-24}/*.mtx matrices - - # Not used by the original cmake, causes an error - rm matrices/*_b.mtx - - echo "deps/convert.cpp -> deps/mtx2csr" - hipcc deps/convert.cpp -O3 -o deps/mtx2csr - - for mat in $(ls -1 matrices | cut -d "." -f 1); do - echo "mtx2csr: $mat.mtx -> $mat.csr" - deps/mtx2csr matrices/$mat.mtx matrices/$mat.csr - unlink matrices/$mat.mtx - done - ''; - - postInstall = lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - cp -a $out/bin/* $benchmark/bin - rm $benchmark/bin/rocsparse-test - '' + lib.optionalString (buildTests || buildBenchmarks) '' - mkdir -p $test/bin - mv $out/bin/* $test/bin - rm $test/bin/rocsparse-bench || true - mv /build/source/matrices $test - rmdir $out/bin - ''; - - passthru = { - matrices = import ./deps.nix { - inherit fetchzip; - mirror1 = "https://sparse.tamu.edu/MM"; - mirror2 = "https://www.cise.ufl.edu/research/sparse/MM"; - }; - - updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - }; - - meta = with lib; { - description = "ROCm SPARSE implementation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocsparse/deps.nix b/pkgs/development/libraries/rocsparse/deps.nix deleted file mode 100644 index cef880ab323..00000000000 --- a/pkgs/development/libraries/rocsparse/deps.nix +++ /dev/null @@ -1,222 +0,0 @@ -{ fetchzip -, mirror1 -, mirror2 -}: - -{ - matrix-01 = fetchzip { - sha256 = "sha256-AHur5ZIDZTFRrO2GV0ieXrffq4KUiGWiZ59pv0fUtEQ="; - - urls = [ - "${mirror1}/SNAP/amazon0312.tar.gz" - "${mirror2}/SNAP/amazon0312.tar.gz" - ]; - }; - - matrix-02 = fetchzip { - sha256 = "sha256-0rSxaN4lQcdaCLsvlgicG70FXUxXeERPiEmQ4MzbRdE="; - - urls = [ - "${mirror1}/Muite/Chebyshev4.tar.gz" - "${mirror2}/Muite/Chebyshev4.tar.gz" - ]; - }; - - matrix-03 = fetchzip { - sha256 = "sha256-hDzDWDUnHEyFedX/tMNq83ZH8uWyM4xtZYUUAD3rizo="; - - urls = [ - "${mirror1}/FEMLAB/sme3Dc.tar.gz" - "${mirror2}/FEMLAB/sme3Dc.tar.gz" - ]; - }; - - matrix-04 = fetchzip { - sha256 = "sha256-GmN2yOt/MoX01rKe05aTyB3ypUP4YbQGOITZ0BqPmC0="; - - urls = [ - "${mirror1}/Williams/webbase-1M.tar.gz" - "${mirror2}/Williams/webbase-1M.tar.gz" - ]; - }; - - matrix-05 = fetchzip { - sha256 = "sha256-gQNjfVyWzNM9RwImJGhkhahRmZz74LzDs1oijL7mI7k="; - - urls = [ - "${mirror1}/Williams/mac_econ_fwd500.tar.gz" - "${mirror2}/Williams/mac_econ_fwd500.tar.gz" - ]; - }; - - matrix-06 = fetchzip { - sha256 = "sha256-87cdZjntNcTuz5BtO59irhcuRbPllWSbhCEX3Td02qc="; - - urls = [ - "${mirror1}/Williams/mc2depi.tar.gz" - "${mirror2}/Williams/mc2depi.tar.gz" - ]; - }; - - matrix-07 = fetchzip { - sha256 = "sha256-WRamuJX3D8Tm+k0q67RjUDG3DeNAxhKiaPkk5afY5eU="; - - urls = [ - "${mirror1}/Bova/rma10.tar.gz" - "${mirror2}/Bova/rma10.tar.gz" - ]; - }; - - matrix-08 = fetchzip { - sha256 = "sha256-5dhkm293Mc3lzakKxHy5W5XIn4Rw+gihVh7gyrjEHXo="; - - urls = [ - "${mirror1}/JGD_BIBD/bibd_22_8.tar.gz" - "${mirror2}/JGD_BIBD/bibd_22_8.tar.gz" - ]; - }; - - matrix-09 = fetchzip { - sha256 = "sha256-czjLWCjXAjZCk5TGYHaEkwSAzQu3TQ3QyB6eNKR4G88="; - - urls = [ - "${mirror1}/Hamm/scircuit.tar.gz" - "${mirror2}/Hamm/scircuit.tar.gz" - ]; - }; - - matrix-10 = fetchzip { - sha256 = "sha256-bYuLnJViAIcIejAkh69/bsNAVIDU4wfTLtD+nmHd6FM="; - - urls = [ - "${mirror1}/Sandia/ASIC_320k.tar.gz" - "${mirror2}/Sandia/ASIC_320k.tar.gz" - ]; - }; - - matrix-11 = fetchzip { - sha256 = "sha256-aDwn8P1khYjo2Agbq5m9ZBInJUxf/knJNvyptt0fak0="; - - urls = [ - "${mirror1}/GHS_psdef/bmwcra_1.tar.gz" - "${mirror2}/GHS_psdef/bmwcra_1.tar.gz" - ]; - }; - - matrix-12 = fetchzip { - sha256 = "sha256-8OJqA/byhlAZd869TPUzZFdsOiwOoRGfKyhM+RMjXoY="; - - urls = [ - "${mirror1}/HB/nos1.tar.gz" - "${mirror2}/HB/nos1.tar.gz" - ]; - }; - - matrix-13 = fetchzip { - sha256 = "sha256-FS0rKqmg+uHwsM/yGfQLBdd7LH/rUrdutkNGBD/Mh1I="; - - urls = [ - "${mirror1}/HB/nos2.tar.gz" - "${mirror2}/HB/nos2.tar.gz" - ]; - }; - - matrix-14 = fetchzip { - sha256 = "sha256-DANnlrNJikrI7Pst9vRedtbuxepyHmCIu2yhltc4Qcs="; - - urls = [ - "${mirror1}/HB/nos3.tar.gz" - "${mirror2}/HB/nos3.tar.gz" - ]; - }; - - matrix-15 = fetchzip { - sha256 = "sha256-21mUgqjWGUfYgiWwSrKh9vH8Vdt3xzcefmqYNYRpxiY="; - - urls = [ - "${mirror1}/HB/nos4.tar.gz" - "${mirror2}/HB/nos4.tar.gz" - ]; - }; - - matrix-16 = fetchzip { - sha256 = "sha256-FOuXvGqBBFNkVS6cexmkluret54hCfCOdK+DOZllE4c="; - - urls = [ - "${mirror1}/HB/nos5.tar.gz" - "${mirror2}/HB/nos5.tar.gz" - ]; - }; - - matrix-17 = fetchzip { - sha256 = "sha256-+7NI1rA/qQxYPpjXKHvAaCZ+LSaAJ4xuJvMRMBEUYxg="; - - urls = [ - "${mirror1}/HB/nos6.tar.gz" - "${mirror2}/HB/nos6.tar.gz" - ]; - }; - - matrix-18 = fetchzip { - sha256 = "sha256-q3NxJjbwGGcFiQ9nhWfUKgZmdVwCfPmgQoqy0AqOsNc="; - - urls = [ - "${mirror1}/HB/nos7.tar.gz" - "${mirror2}/HB/nos7.tar.gz" - ]; - }; - - matrix-19 = fetchzip { - sha256 = "sha256-0GAN6qmVfD+tprIigzuUUUwm5KVhkN9X65wMEvFltDY="; - - urls = [ - "${mirror1}/DNVS/shipsec1.tar.gz" - "${mirror2}/DNVS/shipsec1.tar.gz" - ]; - }; - - matrix-20 = fetchzip { - sha256 = "sha256-f28Du/Urxsiq5NkRmRO10Zz9vvGRjEchquzHzbZpZ7U="; - - urls = [ - "${mirror1}/Cote/mplate.tar.gz" - "${mirror2}/Cote/mplate.tar.gz" - ]; - }; - - matrix-21 = fetchzip { - sha256 = "sha256-O+Wy0NfCU1hVUOfNR1dJpvDHLBwwa301IRJDrQJnhak="; - - urls = [ - "${mirror1}/Bai/qc2534.tar.gz" - "${mirror2}/Bai/qc2534.tar.gz" - ]; - }; - - matrix-22 = fetchzip { - sha256 = "sha256-oxMnt8U5Cf1ILWcBdU6W9jdSMMm+U6bIVl8nm3n3+OA="; - - urls = [ - "${mirror1}/Chevron/Chevron2.tar.gz" - "${mirror2}/Chevron/Chevron2.tar.gz" - ]; - }; - - matrix-23 = fetchzip { - sha256 = "sha256-MFD9BxFI/3IS7yatW121BAI04fbqrXpgYDT5UKjeKcU="; - - urls = [ - "${mirror1}/Chevron/Chevron3.tar.gz" - "${mirror2}/Chevron/Chevron3.tar.gz" - ]; - }; - - matrix-24 = fetchzip { - sha256 = "sha256-ikS8O51pe1nt3BNyhvfvqCbVL0+bg/da9bqGqeBDkTg="; - - urls = [ - "${mirror1}/Chevron/Chevron4.tar.gz" - "${mirror2}/Chevron/Chevron4.tar.gz" - ]; - }; -} diff --git a/pkgs/development/libraries/rocthrust/default.nix b/pkgs/development/libraries/rocthrust/default.nix deleted file mode 100644 index 45099cb9f4c..00000000000 --- a/pkgs/development/libraries/rocthrust/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, rocprim -, hip -, gtest -, buildTests ? false -, buildBenchmarks ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rocthrust"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildTests [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocThrust"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-JT2PX53N39H+EaThPHo2ol+BUjDQniSQlKMLiYD8NoM="; - }; - - nativeBuildInputs = [ - cmake - rocm-cmake - rocprim - hip - ]; - - buildInputs = lib.optionals buildTests [ - gtest - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DHIP_ROOT_DIR=${hip}" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals buildTests [ - "-DBUILD_TEST=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_BENCHMARKS=ON" - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DCMAKE_CXX_FLAGS=-Wno-deprecated-builtins" # Too much spam - ]; - - postInstall = lib.optionalString buildTests '' - mkdir -p $test/bin - mv $out/bin/{test_*,*.hip} $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/benchmark_* $benchmark/bin - '' + lib.optionalString (buildTests || buildBenchmarks) '' - rm -rf $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "ROCm parallel algorithm library"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust"; - license = with licenses; [ asl20 ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/roctracer/default.nix b/pkgs/development/libraries/roctracer/default.nix deleted file mode 100644 index a81f7dc1896..00000000000 --- a/pkgs/development/libraries/roctracer/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, clang -, hip -, rocm-device-libs -, rocprofiler -, libxml2 -, doxygen -, graphviz -, gcc-unwrapped -, rocm-runtime -, python3Packages -, buildDocs ? false # Nothing seems to be generated, so not making the output -, buildTests ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "roctracer"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ] ++ lib.optionals buildTests [ - "test" - ]; - - src = fetchFromGitHub { - owner = "ROCm-Developer-Tools"; - repo = "roctracer"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-5vYUNczylB2ehlvhq1u/H8KUXt8ku2E+jawKrKsU7LY="; - }; - - nativeBuildInputs = [ - cmake - clang - hip - ] ++ lib.optionals buildDocs [ - doxygen - graphviz - ]; - - buildInputs = [ - rocm-device-libs - rocprofiler - libxml2 - python3Packages.python - python3Packages.cppheaderparser - ]; - - cmakeFlags = [ - "-DCMAKE_MODULE_PATH=${hip}/hip/cmake" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - - postPatch = '' - export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode - '' + lib.optionalString (!buildTests) '' - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(test)" "" - ''; - - # Tests always fail, probably need GPU - # doCheck = buildTests; - - postInstall = lib.optionalString buildDocs '' - mkdir -p $doc - '' + lib.optionalString buildTests '' - mkdir -p $test/bin - # Not sure why this is an install target - find $out/test -executable -type f -exec mv {} $test/bin \; - rm $test/bin/{*.sh,*.py} - patchelf --set-rpath $out/lib:${lib.makeLibraryPath ( - finalAttrs.buildInputs ++ [ hip gcc-unwrapped.lib rocm-runtime ])} $test/bin/* - rm -rf $out/test - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Tracer callback/activity library"; - homepage = "https://github.com/ROCm-Developer-Tools/roctracer"; - license = with licenses; [ mit ]; # mitx11 - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch b/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch deleted file mode 100644 index cee60367975..00000000000 --- a/pkgs/development/libraries/rocwmma/0000-dont-fetch-googletest.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index e1160bb..2a5462e 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -30,26 +30,6 @@ cmake_dependent_option( ROCWMMA_BUILD_VALIDATION_TESTS "Build validation tests" - cmake_dependent_option( ROCWMMA_BUILD_BENCHMARK_TESTS "Build benchmarking tests" OFF "ROCWMMA_BUILD_TESTS" OFF ) - cmake_dependent_option( ROCWMMA_BUILD_EXTENDED_TESTS "Build extended test parameter coverage" OFF "ROCWMMA_BUILD_TESTS" OFF ) - --# Test/benchmark requires additional dependencies --include( FetchContent ) -- --FetchContent_Declare( -- googletest -- GIT_REPOSITORY https://github.com/google/googletest.git -- GIT_TAG 609281088cfefc76f9d0ce82e1ff6c30cc3591e5 --) --FetchContent_GetProperties(googletest) --if(NOT googletest_POPULATED) -- # Fetch the content using default details -- FetchContent_Populate(googletest) -- # Save the shared libs setting, then force to static libs -- set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS}) -- set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build SHARED libraries" FORCE) -- # Add gtest targets as static libs -- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) -- # Restore shared libs setting -- set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE INTERNAL "Build SHARED libraries" FORCE) --endif() - - set(ROCWMMA_TEST_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) - set(ROCWMMA_COMMON_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/hip_device.cpp diff --git a/pkgs/development/libraries/rocwmma/default.nix b/pkgs/development/libraries/rocwmma/default.nix deleted file mode 100644 index 08667b6d3c9..00000000000 --- a/pkgs/development/libraries/rocwmma/default.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, cmake -, rocm-cmake -, hip -, openmp -, gtest -, rocblas -, texlive -, doxygen -, sphinx -, python3Packages -, buildDocs ? true -, buildTests ? false -, buildExtendedTests ? false -, buildBenchmarks ? false -, buildSamples ? false -, gpuTargets ? [ ] # gpuTargets = [ "gfx908:xnack-" "gfx90a:xnack-" "gfx90a:xnack+" ... ] -}: - -let - latex = lib.optionalAttrs buildDocs texlive.combine { - inherit (texlive) scheme-small - latexmk - tex-gyre - fncychap - wrapfig - capt-of - framed - needspace - tabulary - varwidth - titlesec; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "rocwmma"; - version = "5.4.3"; - - outputs = [ - "out" - ] ++ lib.optionals buildDocs [ - "doc" - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - "test" - ] ++ lib.optionals buildBenchmarks [ - "benchmark" - ] ++ lib.optionals buildSamples [ - "sample" - ]; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "rocWMMA"; - rev = "rocm-${finalAttrs.version}"; - hash = "sha256-HUJPb6IahBgl/v+W4kXludBTNAjRm8k6v0jxKAX+qZM="; - }; - - patches = lib.optionals (buildTests || buildBenchmarks) [ - ./0000-dont-fetch-googletest.patch - ]; - - nativeBuildInputs = [ - cmake - rocm-cmake - hip - ]; - - buildInputs = [ - openmp - ] ++ lib.optionals (buildTests || buildBenchmarks) [ - gtest - rocblas - ] ++ lib.optionals buildDocs [ - latex - doxygen - sphinx - python3Packages.sphinx-rtd-theme - python3Packages.breathe - ]; - - cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=hipcc" - "-DROCWMMA_BUILD_TESTS=${if buildTests || buildBenchmarks then "ON" else "OFF"}" - "-DROCWMMA_BUILD_VALIDATION_TESTS=ON" - "-DROCWMMA_BUILD_SAMPLES=${if buildSamples then "ON" else "OFF"}" - "-DROCWMMA_VALIDATE_WITH_ROCBLAS=ON" - # Manually define CMAKE_INSTALL_<DIR> - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ] ++ lib.optionals (gpuTargets != [ ]) [ - "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - ] ++ lib.optionals buildExtendedTests [ - "-DROCWMMA_BUILD_EXTENDED_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DROCWMMA_BUILD_BENCHMARK_TESTS=ON" - "-DROCWMMA_BENCHMARK_WITH_ROCBLAS=ON" - ]; - - postPatch = lib.optionalString buildDocs '' - patchShebangs docs/*.sh - ''; - - # Unfortunately, it seems like we have to call make on this manually - # -DROCWMMA_BUILD_DOCS=ON is invalid, despite being on the README - postBuild = lib.optionalString buildDocs '' - export HOME=$(mktemp -d) - ../docs/run_doc.sh - ''; - - postInstall = lib.optionalString buildDocs '' - mv ../docs/source/_build/html $out/share/doc/rocwmma - mv ../docs/source/_build/latex/rocWMMA.pdf $out/share/doc/rocwmma - '' + lib.optionalString (buildTests || buildBenchmarks) '' - mkdir -p $test/bin - mv $out/bin/{*_test,*-validate} $test/bin - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - mv $out/bin/*-bench $benchmark/bin - '' + lib.optionalString buildSamples '' - mkdir -p $sample/bin - mv $out/bin/sgemmv $sample/bin - mv $out/bin/simple_gemm $sample/bin - mv $out/bin/simple_dlrm $sample/bin - '' + lib.optionalString (buildTests || buildBenchmarks || buildSamples) '' - rm -rf $out/bin - ''; - - passthru.updateScript = rocmUpdateScript { - name = finalAttrs.pname; - owner = finalAttrs.src.owner; - repo = finalAttrs.src.repo; - }; - - meta = with lib; { - description = "Mixed precision matrix multiplication and accumulation"; - homepage = "https://github.com/ROCmSoftwarePlatform/rocWMMA"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor finalAttrs.version != versions.minor hip.version; - }; -}) diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/development/libraries/rure/Cargo.lock index 89fefcd9072..68a1719d080 100644 --- a/pkgs/development/libraries/rure/Cargo.lock +++ b/pkgs/development/libraries/rure/Cargo.lock @@ -4,30 +4,42 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "libc" -version = "0.2.140" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "regex" -version = "1.7.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -36,9 +48,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rure" diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/development/libraries/rustc-demangle/default.nix index 6dd6d46e30b..4e142c58452 100644 --- a/pkgs/development/libraries/rustc-demangle/default.nix +++ b/pkgs/development/libraries/rustc-demangle/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, rust, lib, stdenv }: +{ rustPlatform, fetchFromGitHub, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "rustc-demangle"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib - cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib + cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle.so $out/lib cp -R crates/capi/include $out ''; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 678aac37e89..73092a803d6 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.48"; + version = "1.3.56"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7C1syZAhMv0N+AuE/SuXqhatKhlzDOix4ZDxLRyuWOs="; + hash = "sha256-VS/85qu0Dc3HSeD0DYm2f4ur+ZRPhb1Srf7BeK7Pdfk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index d6d8919ccdd..0b4526e6e1e 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -1,9 +1,11 @@ { stdenv , lib , fetchFromGitHub +, bash , cmake , cfitsio , libusb1 +, kmod , zlib , boost , libev @@ -58,6 +60,15 @@ stdenv.mkDerivation rec { # Socket address collisions between tests enableParallelChecking = false; + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" + done + ''; + + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 2423a6e20e3..fdbdb4db24b 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -1,6 +1,8 @@ { stdenv , lib +, bash , cmake +, coreutils , cfitsio , libusb1 , zlib @@ -24,6 +26,10 @@ , firmware ? null }: +let + libusb-with-fxload = libusb1.override { withExamples = true;}; +in + stdenv.mkDerivation rec { pname = "indi-3rdparty"; @@ -68,6 +74,19 @@ stdenv.mkDerivation rec { "-DWITH_SBIG=off" ]; + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace $f --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \ + --replace "/lib/firmware/" "$out/lib/firmware/" \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" \ + --replace "/bin/cat" "${coreutils}/bin/cat" \ + --replace "/bin/echo" "${coreutils}/bin/echo" \ + --replace "/bin/sh" "${bash}/bin/sh" + done + ''; + + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Third party drivers for the INDI astronomical software suite"; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 7875051cbf7..102a8b901cc 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -1,7 +1,9 @@ { stdenv , lib +, bash , cmake , cfitsio +, coreutils , libusb1 , zlib , boost @@ -21,7 +23,9 @@ , src , autoPatchelfHook }: - +let + libusb-with-fxload = libusb1.override { withExamples = true;}; +in stdenv.mkDerivation rec { pname = "indi-firmware"; @@ -39,7 +43,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DRULES_INSTALL_DIR=lib/udev/rules.d" - "-DFIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware" + "-DFIRMWARE_INSTALL_DIR=lib/firmware" + "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" "-DCONF_DIR=etc" "-DBUILD_LIBS=1" "-DWITH_PENTAX=off" @@ -52,8 +57,17 @@ stdenv.mkDerivation rec { done ''; - postFixup = '' - rm $out/lib/udev/rules.d/99-fli.rules + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace "$f" --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" \ + --replace "/bin/cat" "${coreutils}/bin/cat" \ + --replace "/bin/echo" "${coreutils}/bin/echo" \ + --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/lib/firmware/" "$out/lib/firmware/" + sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i "$f" + done ''; meta = with lib; { diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix index 5ec1acdf21e..f1201df1d8a 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix @@ -1,4 +1,4 @@ -{ buildEnv, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }: +{ buildEnv, makeBinaryWrapper, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }: buildEnv { name = "${pname}-${version}"; @@ -6,5 +6,13 @@ buildEnv { indilib ] ++ extraDrivers; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + makeBinaryWrapper ${indilib}/bin/indiserver $out/bin/indiserver --set-default INDIPREFIX $out + ''; + + inherit (indilib) meta; } diff --git a/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/pkgs/development/libraries/science/astronomy/libxisf/default.nix index 17e454e13e2..8f2adb85424 100644 --- a/pkgs/development/libraries/science/astronomy/libxisf/default.nix +++ b/pkgs/development/libraries/science/astronomy/libxisf/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxisf"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitea { domain = "gitea.nouspiro.space"; owner = "nou"; repo = "libXISF"; rev = "v${finalAttrs.version}"; - hash = "sha256-Jh3NWtQSV0uePDMCDNzdI4qpRGbHTel3neRZAA3anQk="; + hash = "sha256-ME0x+1VyfuhJCldwJfjQCtfe9XQk1ptmhv4ghOyNuGA="; }; patches = [ diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index ff1cb5026fd..8c6eb60d1d2 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-HYNkpgkiRtA1ZsiFkmYk3MT3fKgs2d2neSExVXBbsPc="; + sha256 = "sha256-0bFGHlkZnAZlnxlj8tY3s9yTWgkNtSsPFfudB3uvyOA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index a7c388339de..349c3be82b9 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -83,8 +83,8 @@ stdenv.mkDerivation rec { export OPENMM_LIB_PATH=$out/lib export OPENMM_INCLUDE_PATH=$out/include cd python - ${python3Packages.python.pythonForBuild.interpreter} setup.py build - ${python3Packages.python.pythonForBuild.interpreter} setup.py install --prefix=$out + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --prefix=$out ''; postFixup = '' diff --git a/pkgs/development/libraries/science/chemistry/tblite/default.nix b/pkgs/development/libraries/science/chemistry/tblite/default.nix index 0f05315b9d8..7cc64937dc1 100644 --- a/pkgs/development/libraries/science/chemistry/tblite/default.nix +++ b/pkgs/development/libraries/science/chemistry/tblite/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , gfortran , blas @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { hash = "sha256-R7CAFG/x55k5Ieslxeq+DWq1wPip4cI+Yvn1cBbeVNs="; }; + patches = [ + # toml-f 0.4 compatibility + (fetchpatch { + url = "https://github.com/tblite/tblite/commit/da759fd02b8fbf470a5c6d3df9657cca6b1d0a9a.diff"; + hash = "sha256-VaeA2VyK+Eas432HMSpJ0lXxHBBNGpfkUO1eHeWpYl0="; + }) + ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ diff --git a/pkgs/development/libraries/science/chemistry/tblite/python.nix b/pkgs/development/libraries/science/chemistry/tblite/python.nix index f19c3377b17..3a72cfaaa6a 100644 --- a/pkgs/development/libraries/science/chemistry/tblite/python.nix +++ b/pkgs/development/libraries/science/chemistry/tblite/python.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, fetchpatch , meson , ninja , pkg-config @@ -42,17 +43,19 @@ buildPythonPackage { propagatedBuildInputs = [ tblite simple-dftd3 cffi numpy ]; - # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors - patches = [ ./0001-fix-multicharge-dep-needed-for-static-compilation.patch ]; - format = "other"; - pythonImportsCheck = [ "tblite" "tblite.interface" ]; - configurePhase = '' - runHook preConfigure + patches = [ + # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors + ./0001-fix-multicharge-dep-needed-for-static-compilation.patch - meson setup build -Dpython=true --prefix=$out - cd build + # Toml-f 0.4.0 compatibility https://github.com/tblite/tblite/pull/108 + (fetchpatch { + url = "https://github.com/tblite/tblite/commit/e4255519b58a5198a5fa8f3073bef1c78a4bbdbe.diff"; + hash = "sha256-BMwYsdWfK+vG3BFgzusLYfwo0WXrYSPxJoEJIyOvbPg="; + }) + ]; - runHook postConfigure - ''; + format = "other"; + pythonImportsCheck = [ "tblite" "tblite.interface" ]; + mesonFlags = [ "-Dpython=true" ]; } diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index 962e8e8e6ac..f6d00411221 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -6,10 +6,10 @@ # Enable BLAS interface with 64-bit integer width. , blas64 ? false -# Target architecture. "amd64" compiles kernels for all Zen +# Target architecture. "amdzen" compiles kernels for all Zen # generations. To build kernels for specific Zen generations, -# use "zen", "zen2", or "zen3". -, withArchitecture ? "amd64" +# use "zen", "zen2", "zen3", or "zen4". +, withArchitecture ? "amdzen" # Enable OpenMP-based threading. , withOpenMP ? true @@ -18,15 +18,16 @@ let threadingSuffix = lib.optionalString withOpenMP "-mt"; blasIntSize = if blas64 then "64" else "32"; + in stdenv.mkDerivation rec { pname = "amd-blis"; - version = "3.0"; + version = "4.1"; src = fetchFromGitHub { owner = "amd"; repo = "blis"; rev = version; - hash = "sha256-bbbeo1yOKse9pzbsB6lQ7pULKdzu3G7zJzTUgPXiMZY="; + hash = "sha256-1vd4uBg/+Vufqsr+MnAWSUW/THkribHNSMeq1/is8K4="; }; inherit blas64; @@ -54,8 +55,9 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libblas.so.3 - ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libcblas.so.3 + ls $out/lib + ln -s $out/lib/libblis${threadingSuffix}.so $out/lib/libblas.so.3 + ln -s $out/lib/libblis${threadingSuffix}.so $out/lib/libcblas.so.3 ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; diff --git a/pkgs/development/libraries/science/math/amd-libflame/add-lapacke.diff b/pkgs/development/libraries/science/math/amd-libflame/add-lapacke.diff deleted file mode 100644 index 3e3ef1e60ff..00000000000 --- a/pkgs/development/libraries/science/math/amd-libflame/add-lapacke.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Makefile b/Makefile -index 5549ce30..ac2ee51e 100644 ---- a/Makefile -+++ b/Makefile -@@ -583,14 +583,14 @@ endif - - # --- Shared library linker rules --- - --$(LIBFLAME_SO_PATH): $(MK_ALL_FLAMEC_OBJS) -+$(LIBFLAME_SO_PATH): $(MK_ALL_FLAMEC_OBJS) $(LAPACKE_A_PATH) - ifeq ($(ENABLE_VERBOSE),yes) - ifeq ($(FLA_ENABLE_MAX_ARG_LIST_HACK),yes) - $(CAT) $(AR_OBJ_LIST_FILE) | xargs -n$(AR_CHUNK_SIZE) $(AR) $(ARFLAGS) $(LIBFLAME_A) - ifeq ($(OS_NAME),Darwin) -- $(LINKER) $(SOFLAGS) -o $@ -Wl,-force_load,$(LIBFLAME_A) $(LDFLAGS) -+ $(LINKER) $(SOFLAGS) -o $@ -Wl,-force_load,$(LIBFLAME_A),$(LAPACKE_A_PATH) $(LDFLAGS) - else -- $(LINKER) $(SOFLAGS) -o $@ -Wl,--whole-archive,$(LIBFLAME_A),--no-whole-archive $(LDFLAGS) -+ $(LINKER) $(SOFLAGS) -o $@ -Wl,--whole-archive,$(LIBFLAME_A),$(LAPACKE_A_PATH)--no-whole-archive $(LDFLAGS) - endif - else - # NOTE: Can't use $^ automatic variable as long as $(AR_OBJ_LIST_FILE) is in -@@ -602,9 +602,9 @@ else - ifeq ($(FLA_ENABLE_MAX_ARG_LIST_HACK),yes) - @$(CAT) $(AR_OBJ_LIST_FILE) | xargs -n$(AR_CHUNK_SIZE) $(AR) $(ARFLAGS) $(LIBFLAME_A) - ifeq ($(OS_NAME),Darwin) -- @$(LINKER) $(SOFLAGS) -o $@ -Wl,-force_load,$(LIBFLAME_A) $(LDFLAGS) -+ @$(LINKER) $(SOFLAGS) -o $@ -Wl,-force_load,$(LIBFLAME_A),$(LAPACKE_A_PATH) $(LDFLAGS) - else -- @$(LINKER) $(SOFLAGS) -o $@ -Wl,--whole-archive,$(LIBFLAME_A),--no-whole-archive $(LDFLAGS) -+ @$(LINKER) $(SOFLAGS) -o $@ -Wl,--whole-archive,$(LIBFLAME_A),$(LAPACKE_A_PATH),--no-whole-archive $(LDFLAGS) - endif - else - # NOTE: Can't use $^ automatic variable as long as $(AR_OBJ_LIST_FILE) is in diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index a5b65737941..b03352c54e8 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -1,78 +1,62 @@ { lib , stdenv , fetchFromGitHub +, cmake , gfortran , python3 , amd-blis +, aocl-utils , withOpenMP ? true , blas64 ? false +, withAMDOpt ? true }: -# right now only LP64 is supported -assert !blas64; - stdenv.mkDerivation rec { pname = "amd-libflame"; - version = "3.0"; + version = "4.1"; src = fetchFromGitHub { owner = "amd"; repo = "libflame"; rev = version; - hash = "sha256-jESae5NqANw90RBbIHH2oGEq5/mudc4IONv50P/AeQ0="; + hash = "sha256-SZk11oOAnvn1vb7ucX6U9b0YtAJNxl3tQu4ExHpwwoo="; }; - patches = [ - # The LAPACKE interface is compiled as a separate static library, - # we want the main dynamic library to provide LAPACKE symbols. - # This patch adds lapacke.a to the shared library as well. - ./add-lapacke.diff - ]; - - passthru = { inherit blas64; }; - - nativeBuildInputs = [ gfortran python3 ]; + postPatch = '' + patchShebangs build - buildInputs = [ amd-blis ]; + # Enforce reproducible build compiler flags + substituteInPlace CMakeLists.txt --replace '-mtune=native' "" + ''; - configureFlags = [ - # Build a dynamic library with a LAPACK interface. - "--disable-static-build" - "--enable-dynamic-build" - "--enable-lapack2flame" + passthru = { inherit blas64; }; - # Use C BLAS interface. - "--enable-cblas-interfaces" + nativeBuildInputs = [ cmake gfortran python3 ]; - # Avoid overloading maximum number of arguments. - "--enable-max-arg-list-hack" + buildInputs = [ amd-blis aocl-utils ]; - # libflame by default leaves BLAS symbols unresolved and leaves it - # up to the application to explicitly link to a BLAS. This is - # problematic for us, since then the BLAS library becomes an - # implicit dependency. Moreover, since the point of the AMD forks - # is to optimized for recent AMD CPUs, link against AMD BLIS. - "LDFLAGS=-lcblas" + cmakeFlags = [ + "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include" + "-DENABLE_BUILTIN_LAPACK2FLAME=ON" + "-DENABLE_CBLAS_INTERFACES=ON" + "-DENABLE_EXT_LAPACK_INTERFACE=ON" ] - ++ lib.optionals withOpenMP [ "--enable-multithreading=openmp" ]; - - enableParallelBuilding = true; - - postPatch = '' - patchShebangs build - ''; + ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF" + ++ lib.optional blas64 "-DENABLE_ILP64=ON" + ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON"; postInstall = '' - ln -s $out/lib/libflame.so.${version} $out/lib/liblapack.so.3 - ln -s $out/lib/libflame.so.${version} $out/lib/liblapacke.so.3 + ln -s $out/lib/libflame.so $out/lib/liblapack.so.3 + ln -s $out/lib/libflame.so $out/lib/liblapacke.so.3 ''; meta = with lib; { description = "LAPACK-compatible linear algebra library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ maintainers.markuskowa ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index a418df7050e..744d565eddc 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +{ lib, stdenv, fetchFromGitHub, cmake , gfortran, blas, lapack, eigen , useMpi ? false , mpi , openssh +, igraph }: # MPI version can only be built with LP64 interface. @@ -11,25 +12,15 @@ assert useMpi -> !blas.isILP64; stdenv.mkDerivation rec { pname = "arpack"; - version = "3.8.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "opencollab"; repo = "arpack-ng"; rev = version; - sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA="; + sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0="; }; - patches = [ - # https://github.com/opencollab/arpack-ng/pull/301 - (fetchpatch { - name = "pkg-config-paths.patch"; - url = "https://github.com/opencollab/arpack-ng/commit/47fc83cb371a9cc8a8c058097de5e0298cd548f5.patch"; - excludes = [ "CHANGES" ]; - sha256 = "1aijvrfsxkgzqmkzq2dmaj8q3jdpg2hwlqpfl8ddk9scv17gh9m8"; - }) - ]; - nativeBuildInputs = [ cmake gfortran ]; buildInputs = assert (blas.isILP64 == lapack.isILP64); [ blas @@ -56,10 +47,16 @@ stdenv.mkDerivation rec { install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; - passthru = { inherit (blas) isILP64; }; + passthru = { + inherit (blas) isILP64; + tests = { + inherit igraph; + }; + }; meta = { homepage = "https://github.com/opencollab/arpack-ng"; + changelog = "https://github.com/opencollab/arpack-ng/blob/${src.rev}/CHANGES"; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue problems. diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 5b78afc15ed..2c9aa745ba1 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -48,8 +48,8 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ln -s $out/lib/libblis.so.3 $out/lib/libblas.so.3 - ln -s $out/lib/libblis.so.3 $out/lib/libcblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libcblas.so.3 ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix index 7f494b245c3..5a736f97695 100644 --- a/pkgs/development/libraries/science/math/bonmin/default.nix +++ b/pkgs/development/libraries/science/math/bonmin/default.nix @@ -17,13 +17,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "bonmin"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "coin-or"; repo = "Bonmin"; rev = "releases/${version}"; - sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y="; + sha256 = "sha256-nqjAQ1NdNJ/T4p8YljEWRt/uy2aDwyBeAsag0TmRc5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix index 6cb7666e568..60b9de0ab33 100644 --- a/pkgs/development/libraries/science/math/coin-utils/default.nix +++ b/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { - version = "2.11.9"; + version = "2.11.10"; pname = "coinutils"; src = fetchFromGitHub { owner = "coin-or"; repo = "CoinUtils"; rev = "releases/${version}"; - hash = "sha256-DgHVbcXd36WW6JQbiq1MUHAiKLs8CTau87rs0T76sGs="; + hash = "sha256-Rbm45HRbRKQ6Cdup+gvKJ1xkK1HKG3irR5AIjhLer7g="; }; + patches = [ + (fetchpatch { + url = "https://github.com/coin-or/CoinUtils/commit/1700ed92c2bc1562aabe65dee3b4885bd5c87fb9.patch"; + stripLen = 1; + extraPrefix = "CoinUtils/"; + hash = "sha256-8S6XteZvoJlL+5MWiOrW7HXsdcnzpuEFTyzX9qg7OUY="; + }) + ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index b1e03e35df1..b9f101d80fa 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -153,8 +153,14 @@ in description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; sourceProvenance = with sourceTypes; [binaryNativeCode]; - # TODO: consider marking unfreRedistributable when not using runfile - license = licenses.unfree; + license = { + shortName = "cuDNN EULA"; + fullName = "NVIDIA cuDNN Software License Agreement (EULA)"; + url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; + free = false; + } // lib.optionalAttrs (!useCudatoolkitRunfile) { + redistributable = true; + }; platforms = ["x86_64-linux"]; maintainers = with maintainers; [mdaiter samuela]; # Force the use of the default, fat output by default (even though `dev` exists, which diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 9b26b352cda..cea4d5b4c6f 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-cyV3tgmZz5AExxxdGJ12r+PPXn7v2AEhxb9icBxolS8="; + sha256 = "sha256-51isH1hlzgbD0JVtGp3NuaGY5l2CeS1S7oVeRYG+vWI="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index a47d8260714..47a6249ebdc 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { inherit version; pname = "libtorch"; - src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable; + src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable; nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index b3753a63339..6b8588207dc 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -18,16 +18,14 @@ , gfortran , cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , gpuTargets ? [ ] # Non-CUDA targets, that is HIP -, hip -, hipblas -, hipsparse +, rocmPackages , lapack , lib , libpthreadstubs , magmaRelease , ninja -, openmp -, rocmSupport ? false +, config +, rocmSupport ? config.rocmSupport , static ? false , stdenv , symlinkJoin @@ -47,7 +45,7 @@ let # NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.realArches. # For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must # remove it. - rocmArches = lists.map (x: strings.removePrefix "gfx" x) hip.gpuTargets; + rocmArches = lists.map (x: strings.removePrefix "gfx" x) rocmPackages.clr.gpuTargets; supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets; unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches; @@ -124,11 +122,13 @@ stdenv.mkDerivation { cuda_nvprof.dev # <cuda_profiler_api.h> ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ cuda_profiler_api.dev # <cuda_profiler_api.h> + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # <nv/target> ]) ++ lists.optionals rocmSupport [ - hip - hipblas - hipsparse - openmp + rocmPackages.clr + rocmPackages.hipblas + rocmPackages.hipsparse + rocmPackages.llvm.openmp ]; cmakeFlags = [ @@ -142,8 +142,8 @@ stdenv.mkDerivation { "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" "-DMAGMA_ENABLE_CUDA=ON" ] ++ lists.optionals rocmSupport [ - "-DCMAKE_C_COMPILER=${hip}/bin/hipcc" - "-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc" + "-DCMAKE_C_COMPILER=${rocmPackages.clr}/bin/hipcc" + "-DCMAKE_CXX_COMPILER=${rocmPackages.clr}/bin/hipcc" "-DMAGMA_ENABLE_HIP=ON" ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index c5c7b7e6427..d1df2645644 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,6 +1,7 @@ { lib , backendStdenv , fetchFromGitHub +, python3 , which , autoAddOpenGLRunpathHook , cuda_cccl @@ -17,13 +18,13 @@ let in backendStdenv.mkDerivation (finalAttrs: { pname = "nccl"; - version = "2.18.5-1"; + version = "2.19.3-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-vp2WitKateEt1AzSeeEvY/wM4NnUmV7XgL/gfPRUObY="; + hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; }; outputs = [ "out" "dev" ]; @@ -32,6 +33,7 @@ backendStdenv.mkDerivation (finalAttrs: { which autoAddOpenGLRunpathHook cuda_nvcc + python3 ]; buildInputs = [ @@ -46,7 +48,7 @@ backendStdenv.mkDerivation (finalAttrs: { ]; preConfigure = '' - patchShebangs src/collectives/device/gen_rules.sh + patchShebangs ./src/device/generate.py makeFlagsArray+=( "NVCC_GENCODE=${gencode}" ) @@ -77,7 +79,7 @@ backendStdenv.mkDerivation (finalAttrs: { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter orivej ]; + platforms = platforms.linux; + maintainers = with maintainers; [ mdaiter orivej ] ++ teams.cuda.members; }; }) diff --git a/pkgs/development/libraries/science/math/nccl/tests.nix b/pkgs/development/libraries/science/math/nccl/tests.nix index 69e45a6aee0..9d826b92f16 100644 --- a/pkgs/development/libraries/science/math/nccl/tests.nix +++ b/pkgs/development/libraries/science/math/nccl/tests.nix @@ -1,40 +1,47 @@ -{ config -, cudaPackages +{ backendStdenv +, config +, cuda_cccl +, cuda_cudart +, cuda_nvcc +, cudaVersion , fetchFromGitHub +, gitUpdater , lib -, mpiSupport ? false , mpi -, stdenv +, mpiSupport ? false +, nccl , which }: -cudaPackages.backendStdenv.mkDerivation (finalAttrs: { +backendStdenv.mkDerivation (finalAttrs: { pname = "nccl-tests"; - version = "2.13.6"; + version = "2.13.8"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-3gSBQ0g6mnQ/MFXGflE+BqqrIUoiBgp8+fWRQOvLVkw="; + hash = "sha256-dxLoflsTHDBnZRTzoXdm30OyKpLlRa73b784YWALBHg="; }; strictDeps = true; nativeBuildInputs = [ - cudaPackages.cuda_nvcc + cuda_nvcc which ]; buildInputs = [ - cudaPackages.cuda_cudart - cudaPackages.nccl + cuda_cudart + nccl + ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ + cuda_cccl.dev # <nv/target> ] ++ lib.optional mpiSupport mpi; makeFlags = [ - "CUDA_HOME=${cudaPackages.cuda_nvcc}" - "NCCL_HOME=${cudaPackages.nccl}" + "CUDA_HOME=${cuda_nvcc}" + "NCCL_HOME=${nccl}" ] ++ lib.optionals mpiSupport [ "MPI=1" ]; @@ -46,12 +53,17 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { cp -r build/* $out/bin/ ''; + passthru.updateScript = gitUpdater { + inherit (finalAttrs) pname version; + rev-prefix = "v"; + }; + meta = with lib; { description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations"; homepage = "https://github.com/NVIDIA/nccl-tests"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.bsd3; broken = !config.cudaSupport || (mpiSupport && mpi == null); - maintainers = with maintainers; [ jmillerpdt ]; + maintainers = with maintainers; [ jmillerpdt ] ++ teams.cuda.members; }; }) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 950402315a9..3fc533e848d 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.21"; + version = "0.3.24"; outputs = [ "out" "dev" ]; @@ -149,18 +149,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-F6cXPqQai4kA5zrsa8E0Q7dD9zZHlwZ+B16EOGNXoXs="; + sha256 = "sha256-IuXhrZRB3o7kbnivv/6En/aAeF2F18sQw9pKs1WEJc4="; }; - patches = lib.optionals stdenv.hostPlatform.isLoongArch64 [ - # https://github.com/xianyi/OpenBLAS/pull/3626 - (fetchpatch { - name = "openblas-0.3.21-fix-loong.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch?id=37ee4c70278eb41181f69e175575b0152b941655"; - hash = "sha256-iWy11l3wEvzNV08LbhOjnSPj1SjPH8RMnb3ORz7V+gc"; - }) - ]; - postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 4422a908838..14befd6d11f 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openspecfun"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openspecfun"; rev = "v${version}"; - sha256 = "sha256-fX2wc8LHUcF5nN/hiA60ZZ7emRTs0SznOm/0q6lD+Ko="; + sha256 = "sha256-4MPoRMtDTkdvDfhNXKk/80pZjXRNEPcysLNTb5ohxWk="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 55438c63a5e..5cbc2358989 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { url = "https://github.com/google/or-tools/commit/edd1544375bd55f79168db315151a48faa548fa0.patch"; hash = "sha256-S//1YM3IoRCp3Ghg8zMF0XXgIpVmaw4gH8cVb9eUbqM="; }) + # Don't use non-existent member of string_view. Partial patch from commit + # https://github.com/google/or-tools/commit/c5a2fa1eb673bf652cb9ad4f5049d054b8166e17.patch + ./fix-stringview-compile.patch ]; # or-tools normally attempts to build Protobuf for the build platform when @@ -60,16 +63,16 @@ stdenv.mkDerivation rec { "-DFETCH_PYTHON_DEPS=OFF" "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" - "-DPython3_EXECUTABLE=${python.pythonForBuild.interpreter}" + "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}" ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; nativeBuildInputs = [ cmake ensureNewerSourcesForZipFilesHook pkg-config - python.pythonForBuild + python.pythonOnBuildForHost swig4 unzip - ] ++ (with python.pythonForBuild.pkgs; [ + ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf ]); diff --git a/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch b/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch new file mode 100644 index 00000000000..760ab80a38e --- /dev/null +++ b/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch @@ -0,0 +1,36 @@ +diff --git a/ortools/lp_data/lp_parser.cc b/ortools/lp_data/lp_parser.cc +index 58286306e5..bd26c019ab 100644 +--- a/ortools/lp_data/lp_parser.cc ++++ b/ortools/lp_data/lp_parser.cc +@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece line) { + + bool LPParser::ParseConstraint(StringPiece constraint) { + const StatusOr<ParsedConstraint> parsed_constraint_or_status = +- ::operations_research::glop::ParseConstraint(constraint.as_string()); ++ ::operations_research::glop::ParseConstraint(constraint); + if (!parsed_constraint_or_status.ok()) return false; + const ParsedConstraint& parsed_constraint = + parsed_constraint_or_status.value(); +@@ -342,10 +342,9 @@ TokenType LPParser::ConsumeToken(StringPiece* sp) { + + } // namespace + +-StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) { ++StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint) { + ParsedConstraint parsed_constraint; + // Get the name, if present. +- StringPiece constraint{constraint_view}; + StringPiece constraint_copy{constraint}; + std::string consumed_name; + Fractional consumed_coeff; +@@ -413,8 +412,8 @@ StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) { + right_bound = consumed_coeff; + if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) != + TokenType::END) { +- return absl::InvalidArgumentError(absl::StrCat( +- "End of input was expected, found: ", constraint.as_string())); ++ return absl::InvalidArgumentError( ++ absl::StrCat("End of input was expected, found: ", constraint)); + } + } + diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 8ee048c2819..a6bc5a08625 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.8"; + version = "0.108.9"; src = fetchFromGitHub { owner = "coin-or"; repo = "Osi"; rev = "releases/${version}"; - hash = "sha256-Wyxeyn49QWzGvW6bMwCp39iLkB1eMQUEpIxUgpLcxgA="; + hash = "sha256-ueIa9CL4K5ygKpkMRvfuWR0emEG6omg65ZKCsConWsw="; }; buildInputs = diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index e2a5e76c558..81bcec50447 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt ''; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 67dfef186e7..dd2eb9478f7 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ] ; + env = lib.optionalAttrs stdenv.isDarwin { + # Ensure that there is enough space for the `fixDarwinDylibNames` hook to + # update the install names of the output dylibs. + NIX_LDFLAGS = "-headerpad_max_install_names"; + }; + buildFlags = [ # Build individual shared libraries, not demos "library" diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 26dd00d9606..f99e86ffe47 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { "-DUSE_XSDK_DEFAULTS=true" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + patches = [ ./add-superlu-lib-as-dependency-for-the-unit-tests.patch ]; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 13344db9ebc..bdaf6e6284e 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # name of library file ("libzn_poly.so") libbasename = "libzn_poly"; - libext = stdenv.targetPlatform.extensions.sharedLibrary; + libext = stdenv.hostPlatform.extensions.sharedLibrary; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index f515253026b..dd28553d60e 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -39,7 +39,7 @@ , dia , tetex ? null , ghostscript ? null -, texlive ? null +, texliveMedium ? null # generates python bindings , pythonSupport ? true @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { # ncurses is a hidden dependency of waf when checking python buildInputs = lib.optionals pythonSupport [ castxml ncurses ] ++ lib.optionals enableDoxygen [ doxygen graphviz imagemagick ] - ++ lib.optionals withManual [ dia tetex ghostscript imagemagick texlive.combined.scheme-medium ] + ++ lib.optionals withManual [ dia tetex ghostscript imagemagick texliveMedium ] ++ [ libxml2 pythonEnv diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index 40c00dfea88..4d820c0e36d 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sdbus-cpp"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - hash = "sha256-S/8/I2wmWukpP+RGPxKbuO44wIExzeYZL49IO+KOqg4="; + hash = "sha256-AOqwC7CABvQsG9P1PnUg2DIhNmHqYpgbKzm9C2gWNIQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index 9f6ac99c6f0..95ba1dc68e5 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-x9xqcQQQS6hUcZaF8Ei8OmDXUP+y3prVyjlzwm4+4ko="; + hash = "sha256-pEFfs8xjc+6r+60aJF4Sjjy/oSU/+ADWgOBpS3t9rWI="; }; nativeBuildInputs = [ @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { breakpad ]; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DSENTRY_BREAKPAD_SYSTEM=On" ]; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index be5db122d24..c3ecd3a9866 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { extraPrefix = ""; sha256 = "sha256-9dNawJaYtkugR+2NvhQOhgsf6w9ZXHkBgsDRh8yAJc0="; }) + (fetchpatch { + url = "https://github.com/SFML/SFML/commit/bf92efe9a4035fee0258386173d53556aa196e49.patch"; + hash = "sha256-1htwPfpn7Z6s/3b+/i1tQ+btjr/tWv5m6IyDVMBNqQA="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index f0afda7a900..fe17da91e58 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; teams.geospatial.members ++ [ ehmry ]; }; } diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 0e73ed979eb..53a5e09413c 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.2.3"; + version = "3.6.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-h15IyPYvIUPDOJ03KgEDyRhXe0Oi8XCR5LnzSpPc4PI="; + sha256 = "sha256-g1jrjRls9tJWh0koMg7MsUgRSNaty8YI+ivlwL6FCsk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 0ef61ca360b..c66dfb3fdcc 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.18"; + version = "2020.3.19"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-bMHPJVaxckB5KezyurJDLG+wXuFt0ZAm6QNp8lc2Nso="; + sha256 = "sha256-O5N8W5RCJHjl15EUvc1seOQ6Cm/7qXVEqG1EHD+ejDo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 88b1d1ade17..10e055d5acd 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,27 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, swig4 +, lua +, elastix +, itk +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "simpleitk"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; - rev = "refs/tags/v${version}"; - hash = "sha256-0YxmixUTXpjegZQv7DDCNTWFTH8QEWqQQszee7aQ5EI="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-JmZUlIdcCQ9yEqxoUwRaxvr/Q7xZm41QA3mtDtoSdyI="; }; - nativeBuildInputs = [ cmake swig4 ]; - buildInputs = [ lua itk ]; + nativeBuildInputs = [ + cmake + swig4 + ]; + buildInputs = [ + elastix + lua + itk + ]; # 2.0.0: linker error building examples - cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DSimpleITK_USE_ELASTIX=ON" + ]; meta = with lib; { homepage = "https://www.simpleitk.org"; description = "Simplified interface to ITK"; + changelog = "https://github.com/SimpleITK/SimpleITK/releases/tag/v${finalAttrs.version}"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; license = licenses.asl20; }; -} +}) diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index f25ac14df86..099a3d838bb 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { pname = "smpeg"; @@ -16,8 +16,24 @@ stdenv.mkDerivation rec { ./gcc6.patch ./libx11.patch ./gtk.patch + # These patches remove use of the `register` storage class specifier, + # allowing smpeg to build with clang 16, which defaults to C++17. + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/cc114ba0dd8644c0d6205bbce2384781daeff44b.patch"; + hash = "sha256-GxSD82j05pw0r2SxmPYAe/BXX4iUc+iHWhB9Ap4GzfA="; + }) + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/b369feca5bf99d6cff50d8eb316395ef48acf24f.patch"; + hash = "sha256-U+a6dbc5cm249KlUcf4vi79yUiT4hgEvMv522K4PqUc="; + }) ]; + postPatch = '' + substituteInPlace video/gdith.cpp \ + --replace 'register int' 'int' \ + --replace 'register Uint16' 'Uint16' + ''; + enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index f2f9b6ec885..b9f34eeb974 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.16"; + version = "1.13.17"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mYJhA/ylJDr45IL9CxEZ2WJA/DIRj8RDCwkznsi1KcI="; + sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/libraries/sol2/default.nix b/pkgs/development/libraries/sol2/default.nix new file mode 100644 index 00000000000..5ec61594254 --- /dev/null +++ b/pkgs/development/libraries/sol2/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub +, lib +, stdenv +, cmake +, lua +}: +stdenv.mkDerivation (finalAttrs: { + pname = "sol2"; + version = "3.3.1"; + src = fetchFromGitHub { + owner = "ThePhD"; + repo = "sol2"; + rev = "v${finalAttrs.version}"; + hash = "sha256-7QHZRudxq3hdsfEAYKKJydc4rv6lyN6UIt/2Zmaejx8="; + }; + + nativeBuildInputs = [ cmake lua ]; + + cmakeFlags = [ + "-DSOL2_LUA_VERSION=${lua.version}" + "-DSOL2_BUILD_LUA=FALSE" + ]; + + meta = with lib;{ + description = "Lua API wrapper with advanced features and top notch performance"; + longDescription = '' + sol2 is a C++ library binding to Lua. + It currently supports all Lua versions 5.1+ (LuaJIT 2.0+ and MoonJIT included). + sol2 aims to be easy to use and easy to add to a project. + The library is header-only for easy integration with projects, and a single header can be used for drag-and-drop start up. + ''; + homepage = "https://github.com/ThePhD/sol2"; + license = licenses.mit; + maintainers = with maintainers; [ mrcjkb ]; + }; +}) diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index bcf6b804ed6..c7b83db5348 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchpatch , fetchFromGitHub , ncurses , python3 @@ -10,65 +9,70 @@ , libuuid , numactl , openssl -, fetchurl +, pkg-config +, zlib +, libpcap +, libnl +, libelf +, jansson +, ensureNewerSourcesForZipFilesHook }: -let - # The old version has some CVEs howver they should not affect SPDK's usage of the framework: https://github.com/NixOS/nixpkgs/pull/171648#issuecomment-1121964568 - dpdk' = dpdk.overrideAttrs (old: rec { - name = "dpdk-21.11"; - src = fetchurl { - url = "https://fast.dpdk.org/rel/${name}.tar.xz"; - sha256 = "sha256-Mkbj7WjuKzaaXYviwGzxCKZp4Vf01Bxby7sha/Wr06E="; - }; - }); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "spdk"; - version = "21.10"; + + version = "23.09"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-pFynTbbSF1g58VD9bOhe3c4oCozeqE+35kECTQwDBDM="; + sha256 = "sha256-P10NDa+MIEY8B3bu34Dq2keyuv2a24XV5Wf+Ah701b8="; + fetchSubmodules = true; }; - patches = [ - # Backport of upstream patch for ncurses-6.3 support. - # Will be in next release after 21.10. - ./ncurses-6.3.patch - - # DPDK 21.11 compatibility. - (fetchpatch { - url = "https://github.com/spdk/spdk/commit/f72cab94dd35d7b45ec5a4f35967adf3184ca616.patch"; - sha256 = "sha256-sSetvyNjlM/hSOUsUO3/dmPzAliVcteNDvy34yM5d4A="; - }) - ]; - nativeBuildInputs = [ python3 + python3.pkgs.setuptools + pkg-config + ensureNewerSourcesForZipFilesHook ]; buildInputs = [ - cunit dpdk' libaio libbsd libuuid numactl openssl ncurses + cunit + dpdk + jansson + libaio + libbsd + libelf + libuuid + libpcap + libnl + numactl + openssl + ncurses + zlib + ]; + + patches = [ + # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 + ./setuptools.patch ]; postPatch = '' patchShebangs . - - # glibc-2.36 adds arc4random, so we don't need the custom implementation - # here anymore. Fixed upstream in https://github.com/spdk/spdk/commit/43a3984c6c8fde7201d6c8dfe1b680cb88237269, - # but the patch doesn't apply here. - sed -i -e '1i #define HAVE_ARC4RANDOM 1' lib/iscsi/iscsi.c ''; enableParallelBuilding = true; - configureFlags = [ "--with-dpdk=${dpdk'}" ]; + configureFlags = [ + "--with-dpdk=${dpdk}" + "--pydir=${placeholder "out"}/${python3.sitePackages}" + ]; env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling - NIX_LDFLAGS = "-lbsd"; + env.NIX_LDFLAGS = "-lbsd"; meta = with lib; { description = "Set of libraries for fast user-mode storage"; diff --git a/pkgs/development/libraries/spdk/ncurses-6.3.patch b/pkgs/development/libraries/spdk/ncurses-6.3.patch deleted file mode 100644 index 174c9b6435e..00000000000 --- a/pkgs/development/libraries/spdk/ncurses-6.3.patch +++ /dev/null @@ -1,48 +0,0 @@ -Backport of upstream https://review.spdk.io/gerrit/c/spdk/spdk/+/10300 ---- a/app/spdk_top/spdk_top.c -+++ b/app/spdk_top/spdk_top.c -@@ -1012 +1012 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali -- mvwprintw(win, row, col, tmp_str); -+ mvwprintw(win, row, col, "%s", tmp_str); -@@ -1944 +1944 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%" PRIu64, -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%d", -@@ -1949 +1949 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); -@@ -1951 +1951 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); -@@ -1954 +1954 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); -@@ -1956 +1956 @@ display_thread(struct rpc_thread_info *thread_info) -- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); -+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); -@@ -2111 +2111 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time); -+ mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time); -@@ -2118 +2118 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time); -+ mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time); -@@ -2124 +2124 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); -+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); -@@ -2137 +2137 @@ show_core(uint8_t current_page) -- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); -+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); -@@ -2214 +2214 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, -+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s", -@@ -2216 +2216 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name); -+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name); -@@ -2231 +2231 @@ show_poller(uint8_t current_page) -- mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period); -+ mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period); -@@ -2264 +2264 @@ print_bottom_error_message(char *msg) -- mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg); -+ mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg); -@@ -2434 +2434 @@ show_stats(pthread_t *data_thread) -- mvprintw(g_max_row - 1, 1, current_page_str); -+ mvprintw(g_max_row - 1, 1, "%s", current_page_str); diff --git a/pkgs/development/libraries/spdk/setuptools.patch b/pkgs/development/libraries/spdk/setuptools.patch new file mode 100644 index 00000000000..b3e7644c007 --- /dev/null +++ b/pkgs/development/libraries/spdk/setuptools.patch @@ -0,0 +1,25 @@ +From 3a72290ba7e2d71ca887225fc0eb8792ca863be2 Mon Sep 17 00:00:00 2001 +From: Jörg Thalheim <joerg@thalheim.io> +Date: Tue, 24 Oct 2023 14:30:53 +0200 +Subject: [PATCH] python: drop deprecated distutils + +This is scheduled for removal in python 3.12: https://docs.python.org/3/whatsnew/3.12.html + +Change-Id: I728dc0cf4ed20f22016d3d58cca8aee3af2bcd8b +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + +diff --git a/python/setup.py b/python/setup.py +index 47e2104..ae4dff7 100755 +--- a/python/setup.py ++++ b/python/setup.py +@@ -2,8 +2,7 @@ + # SPDX-License-Identifier: BSD-3-Clause + # Copyright (C) 2023 Intel Corporation. All rights reserved. + +-from distutils.core import setup +-from setuptools import find_packages ++from setuptools import setup, find_packages + from spdk import __version__ + + diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 3b34ab92829..8bee16fef75 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, alsa-lib, ncurses }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, ncurses +, alsa-lib +, CoreServices +, AudioUnit +, Cocoa +}: stdenv.mkDerivation rec { pname = "speech_tools"; @@ -9,7 +18,25 @@ stdenv.mkDerivation rec { sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; - buildInputs = [ alsa-lib ncurses ]; + patches = [ + # Fix build on Apple Silicon. Remove in the next release. + (fetchpatch { + url = "https://github.com/festvox/speech_tools/commit/06141f69d21bf507a9becb5405265dc362edb0df.patch"; + hash = "sha256-tRestCBuRhak+2ccsB6mvDxGm/TIYX4eZ3oppCOEP9s="; + }) + ]; + + buildInputs = [ + ncurses + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + AudioUnit + Cocoa + ]; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ]; # Workaround build failure on -fno-common toolchains: # ld: libestools.a(editline.o):(.bss+0x28): multiple definition of @@ -42,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Text-to-speech engine"; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.free; }; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 5e6f27f434a..f73ebe0141a 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, fftw +, withFftw3 ? true +}: stdenv.mkDerivation rec { pname = "speexdsp"; @@ -15,11 +22,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ fftw ]; + buildInputs = lib.optionals withFftw3 [ fftw ]; - configureFlags = [ - "--with-fft=gpl-fftw3" - ] ++ lib.optional stdenv.isAarch64 "--disable-neon"; + configureFlags = lib.optionals withFftw3 [ "--with-fft=gpl-fftw3" ] + ++ lib.optional stdenv.isAarch64 "--disable-neon"; meta = with lib; { homepage = "https://www.speex.org/"; diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 7cb99f06505..73de0a287cb 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gtest, openmp }: +{ stdenv, lib, fetchFromGitHub, cmake, gfortran, gtest, openmp }: stdenv.mkDerivation rec { pname = "spglib"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ="; }; - nativeBuildInputs = [ cmake gtest ]; + nativeBuildInputs = [ cmake gfortran gtest ]; buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + cmakeFlags = [ "-DSPGLIB_WITH_Fortran=On" ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 16a68ed67ea..d160a6a5f6d 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -36,6 +36,7 @@ , wayland-protocols , wayland-scanner , zlib +, wrapGAppsHook , withPolkit ? stdenv.isLinux }: @@ -88,18 +89,16 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing python3.pkgs.six vala + wrapGAppsHook ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ mesonEmulatorHook ] ++ lib.optionals stdenv.isLinux [ wayland-scanner ]; - propagatedBuildInputs = [ + buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - ]; - - buildInputs = [ cyrus_sasl libepoxy gtk3 diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 44ad21d6a14..3e18424d6b7 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "sdk-${version}"; - hash = "sha256-P/ZD53Xa4Fk9+N/bW5HhsfA+LjUnCbBsQDHvXesKu5M="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-uOnSTih14bUPtrJgp7vVb3/UfdKsF6jFQqjlFeJ81AI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index cc26df385a5..ec4cc458c4b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -7,6 +7,8 @@ , interactive ? false # TODO: can be removed since 3.36 since it is the default now. , enableDeserialize ? false + +, gitUpdater }: let @@ -15,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.42.0"; + version = "3.43.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-erz9FhxuJ0LKXGwIldH4U8lA8gMwSgtJ2k4eyl0IjKY="; + hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA="; }; outputs = [ "bin" "dev" "out" ]; @@ -87,9 +89,18 @@ stdenv.mkDerivation rec { doCheck = false; # fails to link against tcl - passthru.tests = { - inherit (python3Packages) sqlalchemy; - inherit sqldiff sqlite-analyzer tracker; + passthru = { + tests = { + inherit (python3Packages) sqlalchemy; + inherit sqldiff sqlite-analyzer tracker; + }; + + updateScript = gitUpdater { + # No nicer place to look for patest version. + url = "https://github.com/sqlite/sqlite.git"; + # Expect tags like "version-3.43.0". + rev-prefix = "version-"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index c30ce8d45d9..6028c638a7e 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.42.0"; + version = "3.43.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-OMpWoxe+N/sAvZK8KA2bkgm9QAiyl9SDxB7B9geb+20="; + hash = "sha256-62ZRUj9XpccPJC/Ba8QWuB7QLVkmOb+34JnyAeL5otM="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 001123ead60..bf84345be2d 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "lf_cv_sane_realloc=yes" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libxcb xcbutil ]; meta = { - homepage = "http://www.freedesktop.org/software/startup-notification"; + homepage = "https://www.freedesktop.org/software/startup-notification"; description = "Application startup notification and feedback library"; license = lib.licenses.lgpl2; }; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 845e815be59..e848b433095 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libiconv ]; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + preBuild = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 47a512b56a8..92012655636 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.6.0"; + version = "6.6.1"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-+QApuNqEbI+v9VMP0fpIRweRiNBAVU9VwdXR4EdD0p0="; + hash = "sha256-IfceSu+VsY+VTIu9yQtih3RDlQUz1ZXGgFGrdot2mEs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 0fb207e4e0f..aa759ddbbb0 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -3,24 +3,33 @@ , fetchFromGitHub , cmake , zlib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taglib"; - version = "1.13"; + version = "1.13.1"; src = fetchFromGitHub { owner = "taglib"; repo = "taglib"; - rev = "v${version}"; - sha256 = "sha256-DRALRH+/7c2lBvCpLp8hop3Xxsf76F1q8L7F9qehqQA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + # Workaround unconditional ${prefix} until upstream is fixed: + # https://github.com/taglib/taglib/issues/1098 + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { homepage = "https://taglib.org/"; @@ -33,5 +42,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl3 mpl11 ]; maintainers = with maintainers; [ ttuegel ]; + pkgConfigModules = [ "taglib" "taglib_c" ]; }; -} +}) diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index ff6a3343837..b6cc969b9f7 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ + # error: variable 'val' set but not used + lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; diff --git a/pkgs/development/libraries/tbox/default.nix b/pkgs/development/libraries/tbox/default.nix index ef4d6603e86..6f65ded6f10 100644 --- a/pkgs/development/libraries/tbox/default.nix +++ b/pkgs/development/libraries/tbox/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tbox"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "tboox"; repo = pname; rev = "v${version}"; - hash = "sha256-b461JNTS7jNI/qawumDjL2vfC4fAaWB7a++9PpUUDB0="; + hash = "sha256-VM6LOTVwM47caXYiH+6c7t174i0W5MY1dg2Y5yutlcc="; }; configureFlags = [ diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index b3802c3a451..118dc26f2f5 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.16"; + version = "1.8.19"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "cde095db6c75827fe4bd237039574aad373ad96b"; - hash = "sha256-m/RN6g0GxPiSvDZbiOaJFcT2j0K7sIaVGaxKWMVn6v8="; + rev = "2589c3fd46925f5d57e4ec79233cd1bd0f5d0c09"; + hash = "sha256-mbhxuJjrV3nC8Ja7N0WWF9ByHovJLmoLLuuzoU4khjU="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 7163f24815c..4c6ec8e0169 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { --replace "stripprog=" "stripprog=\$STRIP # " ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = { description = "Command-line editing library"; homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; diff --git a/pkgs/development/libraries/tensile/default.nix b/pkgs/development/libraries/tensile/default.nix deleted file mode 100644 index c6117167855..00000000000 --- a/pkgs/development/libraries/tensile/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rocmUpdateScript -, buildPythonPackage -, pyyaml -, msgpack -, pandas -}: - -buildPythonPackage rec { - pname = "tensile"; - version = "5.4.2"; - - src = fetchFromGitHub { - owner = "ROCmSoftwarePlatform"; - repo = "Tensile"; - rev = "rocm-${version}"; - hash = "sha256-W6yr6mptfsiJSSzPCImgqI1EmsUv+l99SjqkoZsOjag="; - }; - - buildInputs = [ - pyyaml - msgpack - pandas - ]; - - passthru.updateScript = rocmUpdateScript { - name = pname; - owner = src.owner; - repo = src.repo; - }; - - meta = with lib; { - description = "GEMMs and tensor contractions"; - homepage = "https://github.com/ROCmSoftwarePlatform/Tensile"; - license = with licenses; [ mit ]; - maintainers = teams.rocm.members; - platforms = platforms.linux; - broken = versions.minor version != versions.minor stdenv.cc.version; - }; -} diff --git a/pkgs/development/libraries/text-engine/default.nix b/pkgs/development/libraries/text-engine/default.nix index f578ae000ba..0a9004d01a5 100644 --- a/pkgs/development/libraries/text-engine/default.nix +++ b/pkgs/development/libraries/text-engine/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , json-glib @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes="; }; + patches = [ + # Fixes build with newer versions of clang + (fetchpatch { + url = "https://github.com/mjakeman/text-engine/commit/749c94d853c0b0e29e79a1b270ec61947b65c319.patch"; + hash = "sha256-vs/a8IBovArw8tc1ZLUsaDHRVyA71KMB1NGENOKNOdk="; + }) + ]; + nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ]; buildInputs = [ libadwaita json-glib libxml2 ]; diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 69d88f508da..9b0fe4de9e4 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-GOvdnmutSQcsNT57tADLSkJAUX0JDVsualII+y21a+I="; + hash = "sha256-6bEd8KzOfBse5sQ2zp+cZtEAu8xIl3GqrpxSZ7h/edI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 0e67ce8adea..c12178d833d 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libtirpc"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=0fb94eef5062d2657d75eee686fa47238fafa312;sf=tgz"; - sha256 = "sha256-3P3xYKeAmLbBI4TdsG1VZBO7py9ktiwhXNtGsnryGNI="; + url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz"; + sha256 = "sha256-fmZxpdyl98z+QBHpEccGB8A+YktuWONw6k0p06AImDw="; name = "${pname}-${version}.tar.gz"; }; @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; + strictDeps = true; preConfigure = '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; + enableParallelBuilding = true; + preInstall = '' mkdir -p $out/etc ''; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 21c63f71221..ea41b8156f7 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { postPatch = '' mkdir -p build/externals/src/ep_catch ln -sf ${catch2}/include/catch2 build/externals/src/ep_catch/single_include + + sed -i '38i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ + cmake/Modules/FindOpenSSL_EP.cmake ''; doCheck = true; diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/development/libraries/tinycdb/default.nix index 63e71064391..2d9cb53e794 100644 --- a/pkgs/development/libraries/tinycdb/default.nix +++ b/pkgs/development/libraries/tinycdb/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sed -i 's,set --, set -x; set --,' Makefile ''; pname = "tinycdb"; - version = "0.78"; + version = "0.80"; # In general, static library (.a) goes to "dev", shared (.so) to # "lib". In case of static build, there is no .so library, so "lib" # output is useless and empty. @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.corpit.ru/mjt/tinycdb/${pname}-${version}.tar.gz"; - sha256 = "0g6n1rr3lvyqc85g6z44lw9ih58f2k1i3v18yxlqvnla5m1qyrsh"; + sha256 = "sha256-wyG5BekCwsqZo/+Kjd39iCMkf+Ht7IpLuF+Dhpxjn7g="; }; meta = with lib; { diff --git a/pkgs/development/libraries/tinycompress/default.nix b/pkgs/development/libraries/tinycompress/default.nix deleted file mode 100644 index 96b82bc696f..00000000000 --- a/pkgs/development/libraries/tinycompress/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "tinycompress"; - version = "1.2.8"; - - src = fetchurl { - url = "mirror://alsa/tinycompress/${pname}-${version}.tar.bz2"; - hash = "sha256-L4l+URLNO8pnkLXOz9puBmLIvF7g+6uXKyR6DMYg1mw="; - }; - - meta = with lib; { - homepage = "http://www.alsa-project.org/"; - description = "a userspace library for anyone who wants to use the ALSA compressed APIs"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ k900 ]; - }; -} diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index ab973c957ae..57a9b617d95 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -22,7 +22,7 @@ tcl.mkTclDerivation { substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done '' - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11") '' + + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' substituteInPlace unix/configure* \ --replace " -framework UniformTypeIdentifiers" "" ''; diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix index d28447c4004..696e41ac71c 100644 --- a/pkgs/development/libraries/toml-f/default.nix +++ b/pkgs/development/libraries/toml-f/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "toml-f"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-8FbnUkeJUP4fiuJCroAVDo6U2M7ZkFLpG2OYrapMYtU="; + hash = "sha256-sCU0uMdcXIA5O964hlK37cOrLTlk1CJeTcWD9FhevOs="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix index a865f88f707..dda352d0769 100644 --- a/pkgs/development/libraries/tomlplusplus/default.nix +++ b/pkgs/development/libraries/tomlplusplus/default.nix @@ -6,24 +6,24 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tomlplusplus"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "marzer"; - repo = pname; - rev = "v${version}"; - hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; + repo = "tomlplusplus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; }; nativeBuildInputs = [ meson cmake ninja ]; - meta = with lib;{ + meta = with lib; { homepage = "https://github.com/marzer/tomlplusplus"; description = "Header-only TOML config file parser and serializer for C++17"; license = licenses.mit; maintainers = with maintainers; [ Scrumplex ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index dc849677a58..63a86ed55b5 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -11,6 +11,7 @@ , gexiv2 , tracker , meson +, mesonEmulatorHook , ninja , pkg-config , vala @@ -47,11 +48,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QPuR+svZRo4m6+zHEdg2Mc2K6TkcYV1o27A8vKsbbGk="; + hash = "sha256-drjVB3EOiX6FPsN/Ju906XqVU3CLYLjEE0lF+bgWU8s="; }; patches = [ @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_45 gettext + glib itstool libxslt meson @@ -75,6 +77,8 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsNoGuiHook + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; # TODO: add libenca, libosinfo @@ -83,7 +87,6 @@ stdenv.mkDerivation rec { dbus exempi giflib - glib gexiv2 totem-pl-parser tracker diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index ce54681799b..c8c220927fa 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -10,7 +10,7 @@ , asciidoc , gobject-introspection , buildPackages -, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , vala , python3 , gi-docgen @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { wrapGAppsNoGuiHook gi-docgen graphviz - (python3.pythonForBuild.withPackages (p: [ p.pygobject3 ])) + (python3.pythonOnBuildForHost.withPackages (p: [ p.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gobject-introspection vala diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index ff43ef249ea..9df3196ee1f 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "sha256-oCDsvpH9P5onME/t+o7VGttk1cHUpneODz21/0RkVkk="; + sha256 = "sha256-x/Chzho6RTfyOb/Is7bAM8KrvipEqQ/+a6pVCuTG108="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/development/libraries/ucc/default.nix index e26e6e603f8..a92c6bea37d 100644 --- a/pkgs/development/libraries/ucc/default.nix +++ b/pkgs/development/libraries/ucc/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-7Mo9zU0sogGyDdWIfTgUPoR5Z8D722asC2y7sHnKbzs="; }; + outputs = [ "out" "dev" ]; + enableParallelBuilding = true; postPatch = '' @@ -42,6 +44,12 @@ stdenv.mkDerivation rec { ++ lib.optional enableAvx "--with-avx" ++ lib.optional enableCuda "--with-cuda=${cudatoolkit}"; + postInstall = '' + find $out/lib/ -name "*.la" -exec rm -f \{} \; + + moveToOutput bin/ucc_info $dev + ''; + meta = with lib; { description = "Collective communication operations API"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 4ded9c2860a..627cac56bb7 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -3,8 +3,8 @@ , config , enableCuda ? config.cudaSupport , cudatoolkit -, enableRocm ? false -, rocm-core, rocm-runtime, rocm-device-libs, hip +, enableRocm ? config.rocmSupport +, rocmPackages }: let @@ -13,23 +13,28 @@ let inherit (cudatoolkit) name meta; paths = [ cudatoolkit cudatoolkit.lib ]; }; + + rocmList = with rocmPackages; [ rocm-core rocm-runtime rocm-device-libs clr ]; + rocm = symlinkJoin { name = "rocm"; - paths = [ rocm-core rocm-runtime rocm-device-libs hip ]; + paths = rocmList; }; in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "sha256-oAigiCgbr27pX+kNl+RW1P10TKYFSKrHDK4U4z8WMko="; + sha256 = "sha256-VxIxrk9qKM6Ncfczl4p2EhXiLNgPaYTmjhqi6/w2ZNY="; }; + outputs = [ "out" "doc" "dev" ]; + nativeBuildInputs = [ autoreconfHook doxygen pkg-config ]; buildInputs = [ @@ -40,17 +45,25 @@ stdenv.mkDerivation rec { rdma-core zlib ] ++ lib.optional enableCuda cudatoolkit - ++ lib.optionals enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ]; + ++ lib.optionals enableRocm rocmList; configureFlags = [ - "--with-rdmacm=${rdma-core}" + "--with-rdmacm=${lib.getDev rdma-core}" "--with-dc" "--with-rc" "--with-dm" - "--with-verbs=${rdma-core}" + "--with-verbs=${lib.getDev rdma-core}" ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}" ++ lib.optional enableRocm "--with-rocm=${rocm}"; + postInstall = '' + find $out/lib/ -name "*.la" -exec rm -f \{} \; + + moveToOutput bin/ucx_info $dev + + moveToOutput share/ucx/examples $doc + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 90398e5aef2..8587ad6d2c3 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "unixODBC"; - version = "2.3.11"; + version = "2.3.12"; src = fetchurl { urls = [ "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" "https://www.unixodbc.org/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w="; + sha256 = "sha256-8hBQFEXOIb9ge6Ue+MEl4Q4i3/3/7Dd2RkYt9fAZFew="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index d29ea557b1f..e692d58a7c8 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -1,6 +1,19 @@ -{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fetchFromGitHub }: - -# I haven't done any parameter tweaking.. So the defaults provided here might be bad +{ fetchurl, stdenv, unixODBC, cmake, postgresql, mariadb, sqlite, zlib, libxml2, dpkg, lib, openssl, libkrb5, libuuid, patchelf, libiconv, fixDarwinDylibNames, fetchFromGitHub }: + +# Each of these ODBC drivers can be configured in your odbcinst.ini file using +# the various passthru and meta values. Of note are: +# +# * `passthru.fancyName`, the typical name used to reference the driver +# * `passthru.driver`, the path to the driver within the built package +# * `meta.description`, a short description of the ODBC driver +# +# For example, you might generate it as follows: +# +# '' +# [${package.fancyName}] +# Description = ${package.meta.description} +# Driver = ${package}/${package.driver} +# '' { psql = stdenv.mkDerivation rec { @@ -14,6 +27,7 @@ buildInputs = [ unixODBC postgresql ]; + # see the top of the file for an explanation passthru = { fancyName = "PostgreSQL"; driver = "lib/psqlodbcw.so"; @@ -41,8 +55,14 @@ fetchSubmodules = true; }; + patches = [ + # Fix `call to undeclared function 'sleep'` with clang 16 + ./mariadb-connector-odbc-unistd.patch + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ unixODBC openssl libiconv ]; + buildInputs = [ unixODBC openssl libiconv zlib ] + ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; preConfigure = '' # we don't want to build a .pkg @@ -52,6 +72,7 @@ ''; cmakeFlags = [ + "-DWITH_EXTERNAL_ZLIB=ON" "-DODBC_LIB_DIR=${lib.getLib unixODBC}/lib" "-DODBC_INCLUDE_DIR=${lib.getDev unixODBC}/include" "-DWITH_OPENSSL=ON" @@ -59,6 +80,7 @@ "-DWITH_IODBC=OFF" ]; + # see the top of the file for an explanation passthru = { fancyName = "MariaDB"; driver = "lib/libmaodbc${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -87,6 +109,7 @@ cmakeFlags = [ "-DWITH_UNIXODBC=1" ]; + # see the top of the file for an explanation passthru = { fancyName = "MySQL"; driver = "lib/libmyodbc3-3.51.12.so"; @@ -122,6 +145,7 @@ mv "$out"/*.* "$out/lib" ''; + # see the top of the file for an explanation passthru = { fancyName = "SQLite"; driver = "lib/libsqlite3odbc.so"; @@ -165,14 +189,15 @@ $out/lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional} ''; + # see the top of the file for an explanation passthru = { - fancyName = "ODBC Driver 17 for SQL Server"; + fancyName = "ODBC Driver ${versionMajor} for SQL Server"; driver = "lib/libmsodbcsql-${versionMajor}.${versionMinor}.so.${versionAdditional}"; }; meta = with lib; { broken = stdenv.isDarwin; - description = "ODBC Driver 17 for SQL Server"; + description = "ODBC Driver ${versionMajor} for SQL Server"; homepage = "https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-2017"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; @@ -181,6 +206,90 @@ }; }; + msodbcsql18 = stdenv.mkDerivation(finalAttrs: { + pname = "msodbcsql${finalAttrs.versionMajor}"; + version = "${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.${finalAttrs.versionAdditional}${finalAttrs.versionSuffix}"; + + versionMajor = "18"; + versionMinor = "1"; + versionAdditional = "1.1"; + versionSuffix = lib.optionalString stdenv.isLinux "-1"; + + src = fetchurl { + url = { + x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_amd64.deb"; + aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}_arm64.deb"; + x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-amd64.tar.gz"; + aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/${finalAttrs.pname}-${finalAttrs.version}-arm64.tar.gz"; + }.${stdenv.system} or (throw "Unsupported platform"); + hash = { + x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52"; + aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a"; + x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d"; + aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x"; + }.${stdenv.system} or (throw "Unsupported platform"); + }; + + nativeBuildInputs = + if stdenv.isDarwin + then + [ + # Fix up the names encoded into the dylib, and make them absolute. + fixDarwinDylibNames + ] + else + [ + dpkg + patchelf + ]; + + unpackPhase = lib.optionalString stdenv.isLinux '' + dpkg -x $src ./ + ''; + + installPhase = + if stdenv.isDarwin + then + '' + mkdir -p $out + tar xf $src --strip-components=1 -C $out + '' + else + '' + mkdir -p $out + mkdir -p $out/lib + cp -r opt/microsoft/msodbcsql${finalAttrs.versionMajor}/lib64 opt/microsoft/msodbcsql${finalAttrs.versionMajor}/share $out/ + ''; + + # Replace the hard-coded paths in the dylib with nixpkgs equivalents. + fixupPhase = lib.optionalString stdenv.isDarwin '' + ${stdenv.cc.bintools.targetPrefix}install_name_tool \ + -change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib \ + -change /opt/homebrew/lib/libodbcinst.2.dylib ${unixODBC}/lib/libodbcinst.2.dylib \ + $out/${finalAttrs.passthru.driver} + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --set-rpath ${lib.makeLibraryPath [ unixODBC openssl libkrb5 libuuid stdenv.cc.cc ]} \ + $out/${finalAttrs.passthru.driver} + ''; + + # see the top of the file for an explanation + passthru = { + fancyName = "ODBC Driver ${finalAttrs.versionMajor} for SQL Server"; + driver = "lib/libmsodbcsql${if stdenv.isDarwin then ".${finalAttrs.versionMajor}.dylib" else "-${finalAttrs.versionMajor}.${finalAttrs.versionMinor}.so.${finalAttrs.versionAdditional}"}"; + }; + + meta = with lib; { + description = finalAttrs.passthru.fancyName; + homepage = "https://learn.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.unix; + license = licenses.unfree; + maintainers = with maintainers; [ SamirTalwar ]; + }; + }); + redshift = stdenv.mkDerivation rec { pname = "redshift-odbc"; version = "1.4.49.1000"; @@ -210,6 +319,7 @@ buildInputs = [ unixODBC ]; + # see the top of the file for an explanation passthru = { fancyName = "Amazon Redshift (x64)"; driver = "lib/libamazonredshiftodbc64.so"; diff --git a/pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch b/pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch new file mode 100644 index 00000000000..8c976885eb6 --- /dev/null +++ b/pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch @@ -0,0 +1,12 @@ +diff -ur a/test/use_result.c b/test/use_result.c +--- a/test/use_result.c 1969-12-31 19:00:01.000000000 -0500 ++++ b/test/use_result.c 2023-09-05 00:08:12.979889343 -0400 +@@ -23,6 +23,8 @@ + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <unistd.h> ++ + #include "tap.h" + + SQLINTEGER my_max_rows= 100; diff --git a/pkgs/development/libraries/updfparser/default.nix b/pkgs/development/libraries/updfparser/default.nix index 1eae1782b77..aa25f9f2dff 100644 --- a/pkgs/development/libraries/updfparser/default.nix +++ b/pkgs/development/libraries/updfparser/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "updfparser"; - version = "unstable-2023-01-10"; - rev = "a421098092ba600fb1686a7df8fc58cd67429f59"; + version = "unstable-2023-08-08"; + rev = "c5ce75b9eea8ebb2746b13eeb0f335813c615115"; src = fetchzip { url = "https://indefero.soutade.fr/p/updfparser/source/download/${rev}/"; - sha256 = "sha256-Kt1QDj7E0GaT615kJW2MQKF9BeU5U7/95TQKODpxgNI="; + hash = "sha256-RT7mvu43Izp0rHhKq4wR4kt0TDfzHvB2NGMR+fxO5UM="; extension = "zip"; }; diff --git a/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/pkgs/development/libraries/usrsctp/clang-fix-build.patch new file mode 100644 index 00000000000..eb136e8be30 --- /dev/null +++ b/pkgs/development/libraries/usrsctp/clang-fix-build.patch @@ -0,0 +1,183 @@ +diff --git a/usrsctplib/netinet/sctp_cc_functions.c b/usrsctplib/netinet/sctp_cc_functions.c +index 57bcdaa..70cf8b7 100755 +--- a/usrsctplib/netinet/sctp_cc_functions.c ++++ b/usrsctplib/netinet/sctp_cc_functions.c +@@ -764,7 +764,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + #if defined(__FreeBSD__) && !defined(__Userspace__) + int old_cwnd; + #endif +- uint32_t t_ssthresh, t_cwnd, incr; ++ uint32_t t_ssthresh, incr; + uint64_t t_ucwnd_sbw; + uint64_t t_path_mptcp; + uint64_t mptcp_like_alpha; +@@ -773,7 +773,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + + /* MT FIXME: Don't compute this over and over again */ + t_ssthresh = 0; +- t_cwnd = 0; + t_ucwnd_sbw = 0; + t_path_mptcp = 0; + mptcp_like_alpha = 1; +@@ -783,7 +782,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + max_path = 0; + TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) { + t_ssthresh += net->ssthresh; +- t_cwnd += net->cwnd; + /* lastsa>>3; we don't need to devide ...*/ + srtt = net->lastsa; + if (srtt > 0) { +diff --git a/usrsctplib/netinet/sctp_indata.c b/usrsctplib/netinet/sctp_indata.c +index 3bce9e9..42ce111 100755 +--- a/usrsctplib/netinet/sctp_indata.c ++++ b/usrsctplib/netinet/sctp_indata.c +@@ -3320,7 +3320,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + struct sctp_tmit_chunk *tp1; + int strike_flag = 0; + struct timeval now; +- int tot_retrans = 0; + uint32_t sending_seq; + struct sctp_nets *net; + int num_dests_sacked = 0; +@@ -3691,7 +3690,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + } + + tp1->rec.data.doing_fast_retransmit = 1; +- tot_retrans++; + /* mark the sending seq for possible subsequent FR's */ + /* + * SCTP_PRINTF("Marking TSN for FR new value %x\n", +diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c +index 6a7dff9..a914b3b 100755 +--- a/usrsctplib/netinet/sctp_output.c ++++ b/usrsctplib/netinet/sctp_output.c +@@ -9970,7 +9970,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + struct mbuf *m, *endofchain; + struct sctp_nets *net = NULL; + uint32_t tsns_sent = 0; +- int no_fragmentflg, bundle_at, cnt_thru; ++ int no_fragmentflg, bundle_at; + unsigned int mtu; + int error, i, one_chunk, fwd_tsn, ctl_cnt, tmr_started; + struct sctp_auth_chunk *auth = NULL; +@@ -10046,7 +10046,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + } + } + one_chunk = 0; +- cnt_thru = 0; + /* do we have control chunks to retransmit? */ + if (m != NULL) { + /* Start a timer no matter if we succeed or fail */ +@@ -10368,7 +10367,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + /* (void)SCTP_GETTIME_TIMEVAL(&net->last_sent_time); */ + + /* For auto-close */ +- cnt_thru++; + if (*now_filled == 0) { + (void)SCTP_GETTIME_TIMEVAL(&asoc->time_last_sent); + *now = asoc->time_last_sent; +@@ -13416,7 +13414,7 @@ sctp_lower_sosend(struct socket *so, + struct epoch_tracker et; + #endif + ssize_t sndlen = 0, max_len, local_add_more; +- int error, len; ++ int error; + struct mbuf *top = NULL; + int queue_only = 0, queue_only_for_init = 0; + int free_cnt_applied = 0; +@@ -14035,7 +14033,6 @@ sctp_lower_sosend(struct socket *so, + */ + local_add_more = sndlen; + } +- len = 0; + if (non_blocking) { + goto skip_preblock; + } +@@ -14265,7 +14262,6 @@ skip_preblock: + } + sctp_snd_sb_alloc(stcb, sndout); + atomic_add_int(&sp->length, sndout); +- len += sndout; + if (sinfo_flags & SCTP_SACK_IMMEDIATELY) { + sp->sinfo_flags |= SCTP_SACK_IMMEDIATELY; + } +diff --git a/usrsctplib/netinet/sctp_pcb.c b/usrsctplib/netinet/sctp_pcb.c +index 89a66bc..a952921 100755 +--- a/usrsctplib/netinet/sctp_pcb.c ++++ b/usrsctplib/netinet/sctp_pcb.c +@@ -7943,7 +7943,7 @@ sctp_drain_mbufs(struct sctp_tcb *stcb) + } + + void +-sctp_drain() ++sctp_drain(void) + { + /* + * We must walk the PCB lists for ALL associations here. The system +diff --git a/usrsctplib/netinet/sctp_sysctl.c b/usrsctplib/netinet/sctp_sysctl.c +index bb49e17..8b77f7e 100755 +--- a/usrsctplib/netinet/sctp_sysctl.c ++++ b/usrsctplib/netinet/sctp_sysctl.c +@@ -61,7 +61,7 @@ FEATURE(sctp, "Stream Control Transmission Protocol"); + */ + + void +-sctp_init_sysctls() ++sctp_init_sysctls(void) + { + SCTP_BASE_SYSCTL(sctp_sendspace) = SCTPCTL_MAXDGRAM_DEFAULT; + SCTP_BASE_SYSCTL(sctp_recvspace) = SCTPCTL_RECVSPACE_DEFAULT; +diff --git a/usrsctplib/user_socket.c b/usrsctplib/user_socket.c +index 513a5a9..89e9eb2 100755 +--- a/usrsctplib/user_socket.c ++++ b/usrsctplib/user_socket.c +@@ -2857,7 +2857,6 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip *ip; + struct udphdr *udp; + struct sockaddr_in dst; +@@ -2930,16 +2929,13 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip) + sizeof(struct udphdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + +@@ -3002,7 +2998,6 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip6_hdr *ip6; + struct udphdr *udp; + struct sockaddr_in6 dst; +@@ -3076,16 +3071,13 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip6_hdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + if (m != NULL) { diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix index af8979c79d1..9723f887b82 100644 --- a/pkgs/development/libraries/usrsctp/default.nix +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; }; + patches = [ + # usrsctp fails to build with clang 15+ due to set but unused variable and missing prototype + # errors. These issues are fixed in the master branch, but a new release with them has not + # been made. The following patch can be dropped once a release has been made. + ./clang-fix-build.patch + ]; + nativeBuildInputs = [ cmake ]; # https://github.com/sctplab/usrsctp/issues/662 diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix index c32c6e1e52f..764f991c446 100644 --- a/pkgs/development/libraries/utf8cpp/default.nix +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-cpy1lg/9pWgI5uyOO9lfSt8llfGEjnu/O4P9688XVEA="; + sha256 = "sha256-cWiGggn2GP25K/8eopvnFPq6iwcBteNI3i9Lo1Sr+ig="; }; cmakeFlags = [ @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/nemtrif/utfcpp"; + changelog = "https://github.com/nemtrif/utfcpp/releases/tag/v${version}"; description = "UTF-8 with C++ in a Portable Way"; license = licenses.boost; maintainers = with maintainers; [ jobojeha ]; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index f9a6bdd7002..7bdb9747472 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/lSD78kj133rpcSAOh8T8XFW/Z0c3JKkGQM5Z6DcMtU="; + sha256 = "sha256-Sgh8vTbclUV+lFZdR29PtNUy8F+9L/OAXk647B+l2mg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 73ff8403400..7edf2cdf7c4 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin ''use_lld=false''; env.NIX_CFLAGS_COMPILE = "-O2"; - FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; + FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12"; nativeBuildInputs = [ myGn @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; + maintainers = with maintainers; [ proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 684982e5364..242294462ed 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "63"; + version = "65"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-6ITmzz1xJN/UnzVl0aAO8VNs0Go8zGcswwGpJUwwLB8="; + sha256 = "sha256-HrTXhRoKSFeLXYQM7W2FvYf7yCD1diSZGtPop9urrSk="; }; patches = [ diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix index 064893a3dbc..f962634b131 100644 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ b/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -36,7 +36,7 @@ plugins: let $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" ''; - ext = stdenv.targetPlatform.extensions.sharedLibrary; + ext = stdenv.hostPlatform.extensions.sharedLibrary; in runCommand "${vapoursynth.name}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 559ef8d2070..02b202365b9 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Vc"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "sha256-fv0FHAl0xvAFybR/jwhX2LkozwEDy1TNcbVAmRRnLVU="; + sha256 = "sha256-tbHDGbul68blBAvok17oz7AfhHpEY9Y7RIEsqCQvOJ0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 8b86df2e1c1..e7e818cbea5 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; + homepage = "https://vcg.isti.cnr.it/vcglib/install.html"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 42ce297d456..f64de57fcb8 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3 , libGLU, libepoxy, libX11, libdrm, mesa }: stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.10.4"; + version = "1.0.0"; src = fetchurl { - url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "sha256-qqvnko2sN4bdm9+F0PVjDW5FsiL5k3UAfjPSTqG+73c="; + url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2"; + hash = "sha256-KMGPP2MeuATHFXKr5oW9HuFOMmmYpmkVLvMvQi0cEdg="; }; separateDebugInfo = true; buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; - nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; - - dontUseCmakeConfigure = true; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; meta = with lib; { description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; diff --git a/pkgs/development/libraries/vkd3d/default.nix b/pkgs/development/libraries/vkd3d/default.nix index 77a275b20df..9febc120e67 100644 --- a/pkgs/development/libraries/vkd3d/default.nix +++ b/pkgs/development/libraries/vkd3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.8"; + version = "1.9"; nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "wine"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-v2UhJvfB5Clupmgoykei3AoWYBOp5l9pQFkUEQVlajs="; + sha256 = "sha256-IF7TOKxNEWr1p4DpIqoRCeVzi9b3yN8XrmWTMvfoOqw="; }; meta = with lib; { diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index bf1d1ae7c1f..02309b275bd 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -1,7 +1,7 @@ { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch -, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv +, enableQt ? false, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support , AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -11,11 +11,12 @@ let inherit (lib) optionalString optionals optional; + version = "${majorVersion}.${minorVersion}"; pythonMajor = lib.substring 0 1 python.pythonVersion; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "vtk${optionalString enableQt "-qvtk"}"; - version = "${majorVersion}.${minorVersion}"; + inherit version; src = fetchurl { url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz"; @@ -25,9 +26,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng libtiff ] - ++ optionals enableQt (if lib.versionOlder majorVersion "9" - then [ qtbase qtx11extras qttools ] - else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ]) + ++ optionals enableQt [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ] ++ optionals stdenv.isLinux [ libGLU xorgproto @@ -66,8 +65,8 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" - "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_PNG" else "VTK_MODULE_USE_EXTERNAL_vtkpng"}=ON" - "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_TIFF" else "VTK_MODULE_USE_EXTERNAL_vtktiff"}=1" + "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON" + "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] ++ [ @@ -76,9 +75,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_BINDIR=bin" "-DVTK_VERSIONED_INSTALL=OFF" ] ++ optionals enableQt [ - "-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}" - ] ++ optionals (enableQt && lib.versionOlder version "8.0") [ - "-DVTK_QT_VERSION=5" + "-DVTK_GROUP_ENABLE_Qt:STRING=YES" ] ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ @@ -86,6 +83,10 @@ in stdenv.mkDerivation rec { "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + 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 @@ -105,7 +106,5 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ]; platforms = with platforms; unix; - # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope - broken = stdenv.isDarwin && (lib.versions.major majorVersion == "8"); }; } diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 48e036ad030..f6c9dcb953e 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.261"; + version = "1.3.268.0"; nativeBuildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "v${version}"; - hash = "sha256-zKHew7SGUq1C3XGp/HrCle6KyqB4cziPcTYVqAr814s="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-CDjWTXXnUgj9QaLDNuSVy+wf8If5LehwOZ0t0Fuh2Ro="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index 7f6292ed23b..da4e42ded84 100755 --- a/pkgs/development/libraries/vulkan-headers/update.sh +++ b/pkgs/development/libraries/vulkan-headers/update.sh @@ -3,7 +3,7 @@ set -euf -o pipefail -V_PACKAGES=( +SDK_PACKAGES=( "vulkan-headers" "vulkan-loader" "vulkan-validation-layers" @@ -11,9 +11,6 @@ V_PACKAGES=( "vulkan-tools-lunarg" "vulkan-extension-layer" "vulkan-utility-libraries" -) - -SDK_PACKAGES=( "spirv-headers" "spirv-cross" "spirv-tools" @@ -21,10 +18,6 @@ SDK_PACKAGES=( nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit -for P in "${V_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:v)(.*)" --commit -done - for P in "${SDK_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:sdk-)(.*)" --commit + nix-update "$P" --version-regex "(?:vulkan-sdk-)(.*)" --commit done diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 6e994eaa78c..163cea7565c 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "v${version}"; - hash = "sha256-5QCVHfvjE98EnL2Dr7g9fdrJAg+np1Q6hgqcuZCWReQ="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-TDn8eVz1fhGfvUiGcxqOk2BN9tuIF5+ssIXtOo3weS0="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch index 42295a67d46..b9c5e8ad453 100644 --- a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch +++ b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -5,8 +5,8 @@ index 153815577..584b15273 100644 @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@ --includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR_PC@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@ +libdir=@CMAKE_INSTALL_LIBDIR@ +includedir=@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 54e7afb3e58..c79f599f5c6 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.261"; + version = "1.3.270"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "v${finalAttrs.version}"; - hash = "sha256-szkBKNcxTHMYhhHFWr5WjD91Vf/AyZaGymvlDU9ff7s="; + hash = "sha256-P1v5UEAooTDGA10K4uck8lhcrbW2ccl44gWIGVnZ6uo="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 098dc64cf15..48b075add0b 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,23 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +, unzip +, cmake +, libtiff +, expat +, zlib +, libpng +, libjpeg +}: + +stdenv.mkDerivation (finalAttrs: { pname = "vxl"; version = "3.5.0"; src = fetchFromGitHub { owner = "vxl"; repo = "vxl"; - rev = "v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E="; }; - nativeBuildInputs = [ cmake unzip ]; - buildInputs = [ libtiff expat zlib libpng libjpeg ]; + nativeBuildInputs = [ + cmake + unzip + ]; + buildInputs = [ + libtiff + expat + zlib + libpng + libjpeg + ]; + + # test failure on aarch64-linux; unknown reason: + cmakeFlags = lib.optionals stdenv.isAarch64 [ "-DCMAKE_CTEST_ARGUMENTS='-E vgl_test_frustum_3d'" ]; + + doCheck = true; meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = "https://vxl.sourceforge.net/"; - license = "VXL License"; - maintainers = with lib.maintainers; [viric]; + homepage = "https://vxl.sourceforge.net"; + # license appears contradictory; see https://github.com/vxl/vxl/issues/752 + # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch) + license = [ lib.licenses.unfree ]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index e2a90d2e284..b24c8262794 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "waffle"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "waffle"; rev = "v${version}"; - sha256 = "sha256-dwDNMLgZrILb559yGs4sNA7D+nD60972+JOy0PKfL0w="; + sha256 = "sha256-GVULv/TkCS9CgSFWlskIamw5Z402n684G6jeTLMCPNc="; }; buildInputs = [ diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 0dce309ef5c..4c49788464d 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "19"; + version = "20"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "WebAssembly"; repo = "wasi-libc"; rev = "refs/tags/wasi-sdk-${version}"; - hash = "sha256-yQSKoSil/C/1lIHwEO9eQKC/ye3PJIFGYjHyNDn61y4="; + hash = "sha256-H92PDrH1FL7S3eMCK1+wqclryjhwghl21bOlRCAr1U4="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index dc53bbb54d2..0fadb103ce3 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.32"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 - doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 57168b2cc17..8192dded7e4 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -27,6 +27,7 @@ , libxkbcommon , libavif , libepoxy +, libjxl , at-spi2-core , libxml2 , libsoup @@ -34,7 +35,6 @@ , libxslt , harfbuzz , libpthreadstubs -, pcre , nettle , libtasn1 , p11-kit @@ -51,7 +51,6 @@ , openjpeg , geoclue2 , sqlite -, enableGLES ? true , gst-plugins-base , gst-plugins-bad , woff2 @@ -71,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.40.5"; + version = "2.42.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -82,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-feBRomNmhiHZGmGl6xw3cdGnzskABD1K/vBsMmwWA38="; + hash = "sha256-VyCqPoYn8bn2MlIYfU3w+CM65x1pexeW6/vlynUL0Rg="; }; patches = lib.optionals stdenv.isLinux [ @@ -132,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { enchant2 libavif libepoxy + libjxl gnutls gst-plugins-bad gst-plugins-base @@ -153,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: { nettle openjpeg p11-kit - pcre sqlite woff2 ] ++ (with xorg; [ @@ -219,8 +218,6 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_GTK4=ON" ] ++ lib.optionals (!systemdSupport) [ "-DENABLE_JOURNALD_LOG=OFF" - ] ++ lib.optionals (stdenv.isLinux && enableGLES) [ - "-DENABLE_GLES2=ON" ]; postPatch = '' diff --git a/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch index f46c0fe8a15..48e7d9cca74 100644 --- a/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch +++ b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch @@ -3,7 +3,7 @@ @@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process #if PLATFORM(WAYLAND) - if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) { + if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland && parameters.dmaBufRendererBufferMode.isEmpty()) { - wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); + wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1"); if (AcceleratedBackingStoreWayland::checkRequirements()) { diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index f78d8b35e2a..ad2b12de891 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,45 +1,45 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchFromGitLab , darwin , abseil-cpp , meson , ninja +, pkg-config }: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; - version = "1.0"; + version = "1.3"; - src = fetchurl { - url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v${version}/webrtc-audio-processing-v${version}.tar.gz"; - sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pulseaudio"; + repo = "webrtc-audio-processing"; + rev = "v${version}"; + hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ meson ninja + pkg-config ]; - buildInputs = [ + propagatedBuildInputs = [ abseil-cpp - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + ]; - patchPhase = '' - # this is just incorrect upstream - # see https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4 - substituteInPlace meson.build \ - --replace "absl_flags_registry" "absl_flags_reflection" - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 - ''; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); meta = with lib; { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h - platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86); - # attempts to inline 256bit AVX instructions on x86 - # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 - broken = stdenv.isx86_32; + # x86-32 disabled due to https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 + platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86_64); }; } diff --git a/pkgs/development/libraries/wfa2-lib/default.nix b/pkgs/development/libraries/wfa2-lib/default.nix index 9555b9faea6..1543484868b 100644 --- a/pkgs/development/libraries/wfa2-lib/default.nix +++ b/pkgs/development/libraries/wfa2-lib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "wfa2-lib"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "smarco"; repo = "WFA2-lib"; rev = "v${version}"; - hash = "sha256-PLZhxKMBhKm6E/ENFZ/yWMWIwJG5voaJls2in44OGoQ="; + hash = "sha256-h4e+f+JkQr3qqaBUDly24ZvKxaEGzeJtMXejh8aD5D0="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Wavefront alignment algorithm library v2"; homepage = "https://github.com/smarco/WFA2-lib"; license = licenses.mit; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 4c60ccf6c8b..d4357124747 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,41 +1,77 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , Security , autoreconfHook , util-linux , openssl +, cacert +# The primary --enable-XXX variant. 'all' enables most features, but causes build-errors for some software, +# requiring to build a special variant for that software. Example: 'haproxy' +, variant ? "all" +, extraConfigureFlags ? [] +, enableLto ? !(stdenv.isDarwin || stdenv.hostPlatform.isStatic || stdenv.cc.isClang) }: - -stdenv.mkDerivation rec { - pname = "wolfssl"; - version = "5.6.3"; +stdenv.mkDerivation (finalAttrs: { + pname = "wolfssl-${variant}"; + version = "5.6.4"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "refs/tags/v${version}-stable"; - hash = "sha256-UN4zs+Rxh/bsLD1BQA+f1YN/UOJ6OB2HduhoetEp10Y="; + rev = "refs/tags/v${finalAttrs.version}-stable"; + hash = "sha256-a9a3ca4Zb/XTS5YfPJwnXPYbDjmgD8qylhPQg5pjzJM="; }; + patches = [ + (fetchpatch { + name = "fix-expected-test-response.patch"; + url = "https://github.com/wolfSSL/wolfssl/commit/ca694938fd053a8557f9f08b1b4265292d8bef65.patch"; + hash = "sha256-ETxszjjEMk0WdYgXHWTxTaWZPpyDs9jdko0jtkjzgwI="; + }) + ]; + postPatch = '' patchShebangs ./scripts - # ocsp tests require network access - sed -i -e '/ocsp\.test/d' -e '/ocsp-stapling\.test/d' scripts/include.am + # ocsp stapling tests require network access, so skip them + sed -i -e'2s/.*/exit 77/' scripts/ocsp-stapling.test # ensure test detects musl-based systems too substituteInPlace scripts/ocsp-stapling2.test \ --replace '"linux-gnu"' '"linux-"' ''; - # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed configureFlags = [ - "--enable-all" - "--enable-base64encode" + "--enable-${variant}" + "--enable-reproducible-build" + ] ++ lib.optionals (variant == "all") [ + # Extra feature flags to add while building the 'all' variant. + # Since they conflict while building other variants, only specify them for this one. "--enable-pkcs11" "--enable-writedup" - "--enable-reproducible-build" - "--enable-tls13" - ]; + "--enable-base64encode" + ] ++ [ + # We're not on tiny embedded machines. + # Increase TLS session cache from 33 sessions to 20k. + "--enable-bigcache" + + # Use WolfSSL's Single Precision Math with timing-resistant cryptography. + "--enable-sp=yes${lib.optionalString (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch) ",asm"}" + "--enable-sp-math-all" + "--enable-harden" + ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ + # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID. + "--enable-intelasm" + "--enable-aesni" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + # No runtime detection under ARM and no platform function checks like for X86. + # However, all ARM macOS systems have the supported extensions autodetected in the configure script. + "--enable-armasm=inline" + ] ++ extraConfigureFlags; + + # LTO should help with the C implementations. + env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; + env.NIX_LDFLAGS_COMPILE = lib.optionalString enableLto "-flto"; outputs = [ "dev" @@ -57,22 +93,23 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ openssl + cacert ]; postInstall = '' - # fix recursive cycle: - # wolfssl-config points to dev, dev propagates bin - moveToOutput bin/wolfssl-config "$dev" - # moveToOutput also removes "$out" so recreate it - mkdir -p "$out" + # fix recursive cycle: + # wolfssl-config points to dev, dev propagates bin + moveToOutput bin/wolfssl-config "$dev" + # moveToOutput also removes "$out" so recreate it + mkdir -p "$out" ''; meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; - changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${version}-stable"; + changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${finalAttrs.version}-stable"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab vifino ]; }; -} +}) diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index c3ad173b093..ca5157c6d71 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir unzipped diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 7b018c89f50..5e9b9f2fcb7 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , cairo +, expat , ffmpeg , libexif , pango @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo + expat ffmpeg libexif pango diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 5dc9829b1a3..f058ac7ed0e 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.4"; + version = "4.9.6"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-aM79DI/Kj1QEIJ1HMttlfqK/WZER9RJhQbrnbPto57U="; + hash = "sha256-ah9EFj15cP9soVJATVJk4XGYItxcrt4HB6ZTfpsVhS8="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 45de5b603b6..91a0b00670c 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.2.1"; + version = "3.2.4"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-u+INjo9EkW433OYoCDZpw5pcW1DyF/t/J5ntLZX+6aA="; + hash = "sha256-YkV150sDsfBEHvHne0GF6i8Y5881NrByPkLtPAmb24E="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 2fb4f995fe4..7e62812df89 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -26,26 +26,6 @@ let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; isCross = stdenv.buildPlatform != stdenv.hostPlatform; - - cmakeCommonFlags = [ - "-Wno-dev" - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag debugSupport "CHECKED_BUILD") - (mkFlag ppaSupport "ENABLE_PPA") - (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag - ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF"; - - cmakeStaticLibFlags = [ - "-DHIGH_BIT_DEPTH=ON" - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DEXPORT_C_API=OFF" - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le - ]; - in stdenv.mkDerivation rec { @@ -96,32 +76,54 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + cmakeFlags = [ + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") + (mkFlag debugSupport "CHECKED_BUILD") + (mkFlag ppaSupport "ENABLE_PPA") + (mkFlag vtuneSupport "ENABLE_VTUNE") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ]; + + cmakeStaticLibFlags = [ + "-DHIGH_BIT_DEPTH=ON" + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DEXPORT_C_API=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ]; + + preConfigure = lib.optionalString multibitdepthSupport '' + cmake -B build-10bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags + cmake -B build-12bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags -DMAIN12=ON + cmakeFlagsArray+=( + -DEXTRA_LIB="x265-10.a;x265-12.a" + -DEXTRA_LINK_FLAGS=-L. + -DLINKED_10BIT=ON + -DLINKED_12BIT=ON + ) + '' + '' + cmakeFlagsArray+=( + -DGIT_ARCHETYPE=1 # https://bugs.gentoo.org/814116 + ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"} + -DHIGH_BIT_DEPTH=OFF + -DENABLE_HDR10_PLUS=ON + ${mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM"} + ${mkFlag cliSupport "ENABLE_CLI"} + ${mkFlag unittestsSupport "ENABLE_TESTS"} + ) + ''; + # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted # (we are in x265_<version>/source/build) - preBuild = lib.optionalString (multibitdepthSupport) '' - cmake -S ../ -B ../build-10bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} + preBuild = lib.optionalString multibitdepthSupport '' make -C ../build-10bits -j $NIX_BUILD_CORES - cmake -S ../ -B ../build-12bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} -DMAIN12=ON make -C ../build-12bits -j $NIX_BUILD_CORES ln -s ../build-10bits/libx265.a ./libx265-10.a ln -s ../build-12bits/libx265.a ./libx265-12.a ''; - cmakeFlags = cmakeCommonFlags ++ [ - "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 - "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DHIGH_BIT_DEPTH=OFF" - "-DENABLE_HDR10_PLUS=ON" - (mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM") - (mkFlag cliSupport "ENABLE_CLI") - (mkFlag unittestsSupport "ENABLE_TESTS") - ] ++ lib.optionals (multibitdepthSupport) [ - "-DEXTRA_LIB=x265-10.a;x265-12.a" - "-DEXTRA_LINK_FLAGS=-L." - "-DLINKED_10BIT=ON" - "-DLINKED_12BIT=ON" - ]; - doCheck = unittestsSupport; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index c70b5e19570..73c3b1b5717 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -28,8 +28,6 @@ let doCheck = true; env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; - # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = lib.optionalString stdenv.isDarwin '' @@ -46,7 +44,7 @@ let homepage = "https://xapian.org/"; changelog = "https://xapian.org/docs/xapian-core-${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; }; }; @@ -54,5 +52,5 @@ in { # Don't forget to change the hashes in xapian-omega and # python3Packages.xapian. They inherit the version from this package, and # should always be built with the equivalent xapian version. - xapian_1_4 = generic "1.4.22" "sha256-BYhK8AsGcCzkhgV9YqO/vmYGz5Za2g9epXCzKKL6Hqg="; + xapian_1_4 = generic "1.4.24" "sha256-7aWubc9rBVOoZ2r2Sx/TBOmYzSD3eQMcyq96uaNzUxo="; } diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch deleted file mode 100644 index d763a2a2b43..00000000000 --- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc ---- xapian-core.old/tests/api_db.cc -+++ xapian-core.new/tests/api_db.cc -@@ -1020,6 +1020,7 @@ - - // test for keepalives - DEFINE_TESTCASE(keepalive1, remote) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); - - /* Test that keep-alives work */ -diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc ---- xapian-core.old/tests/api_scalability.cc -+++ xapian-core.new/tests/api_scalability.cc -@@ -53,6 +53,7 @@ - } - - DEFINE_TESTCASE(bigoaddvalue1, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - // O(n*n) is bad, but O(n*log(n)) is acceptable. - test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); - return true; -diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc ---- xapian-core.old/tests/api_serialise.cc -+++ xapian-core.new/tests/api_serialise.cc -@@ -110,6 +110,7 @@ - - // Test for serialising a document obtained from a database. - DEFINE_TESTCASE(serialise_document2, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Document origdoc; - origdoc.add_term("foo", 2); - origdoc.add_posting("foo", 10); diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index f5ae2ecfaa5..cba74b977de 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - hash = "sha256-Z0yXn7kPH0mQ64qQntq4jKSgCUF9/Vqwy6GeAsepVSg="; + hash = "sha256-0IdW5PM7GJFsyKJJPTEfHL647UNXvUD6XBdErcCA6/8="; }; buildInputs = [ xapian perl pcre2 zlib libmagic ]; diff --git a/pkgs/development/libraries/xeus-zmq/default.nix b/pkgs/development/libraries/xeus-zmq/default.nix index bde2dfefee7..8940ec270f9 100644 --- a/pkgs/development/libraries/xeus-zmq/default.nix +++ b/pkgs/development/libraries/xeus-zmq/default.nix @@ -13,13 +13,13 @@ clangStdenv.mkDerivation rec { pname = "xeus-zmq"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = "xeus-zmq"; rev = "${version}"; - hash = "sha256-j23NPgqwjQ7x4QriCb+N7CtBWhph+pCmBC0AULEDL1U="; + hash = "sha256-sfGXo6CPJu5TJrkecLLoaQxrGaJbeQG+QiCkltAwuI8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/xeus/default.nix b/pkgs/development/libraries/xeus/default.nix index 5e7380fc974..172fd0e7357 100644 --- a/pkgs/development/libraries/xeus/default.nix +++ b/pkgs/development/libraries/xeus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xeus"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "jupyter-xeus"; repo = pname; rev = version; - sha256 = "sha256-jZZe8SegQuFLoH2Qp+etoKELGEWdlYQPXj14DNIMJ/0="; + sha256 = "sha256-kGIVcsgLG6weNfBwgEVTMa8NA9MXSztzi9ML5/gDqAQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 31d064c2af6..2a44ffc4438 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "1.7.6"; + version = "2.0.1"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-i7smd56rLbNY0qXysq818VYWYbjrnFbyIjQkIgf9aOs="; + hash = "sha256-tRx6kJwIoVSN701ppuyZpIFUQIFy4LBMFyirLtwApjA="; }; nativeBuildInputs = [ cmake ] diff --git a/pkgs/development/libraries/xsimd/10.nix b/pkgs/development/libraries/xsimd/10.nix new file mode 100644 index 00000000000..afea6b94ef3 --- /dev/null +++ b/pkgs/development/libraries/xsimd/10.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doctest +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xsimd"; + version = "10.0.0"; + + src = fetchFromGitHub { + owner = "xtensor-stack"; + repo = "xsimd"; + rev = finalAttrs.version; + sha256 = "sha256-+ewKbce+rjNWQ0nQzm6O4xSwgzizSPpDPidkQYuoSTU="; + }; + + nativeBuildInputs = [ + cmake + ]; + patches = lib.optionals stdenv.isDarwin [ + # https://github.com/xtensor-stack/xsimd/issues/807 + ./disable-test_error_gamma-test.patch + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # https://github.com/xtensor-stack/xsimd/issues/798 + ./disable-polar-test.patch + ]; + + cmakeFlags = [ + "-DBUILD_TESTS=${if (finalAttrs.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" + ]; + + doCheck = true; + nativeCheckInputs = [ + doctest + ]; + checkTarget = "xtest"; + + meta = with lib; { + description = "C++ wrappers for SIMD intrinsics"; + homepage = "https://github.com/xtensor-stack/xsimd"; + license = licenses.bsd3; + maintainers = with maintainers; [ tobim ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index a481a12932f..8b53db0388f 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -5,13 +5,13 @@ , doctest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xsimd"; version = "11.1.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-l6IRzndjb95hIcFCCm8zmlNHWtKduqy2t/oml/9Xp+w="; }; patches = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DBUILD_TESTS=${if (doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" + "-DBUILD_TESTS=${if (finalAttrs.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" ]; doCheck = true; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ tobim ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index 45c1ce936a6..7873da993fd 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -2,36 +2,54 @@ , stdenv , fetchFromGitHub , cmake -, gtest -, xsimd +, doctest +, enableAssertions ? false +, enableBoundChecks ? false # Broadcasts don't pass bound checks +, nlohmann_json , xtl +# Although this dependency is of the same GitHub organization, xtensor don't +# support xsimd 11 yet, see: +# https://github.com/xtensor-stack/xtensor/issues/2721 +, xsimd10 }: -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "xtensor"; - version = "0.23.10"; + version = "0.24.7"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtensor"; - rev = version; - sha256 = "1ayrhyh9x33b87ic01b4jzxc8x27yxpxzya5x54ikazvz8p71n14"; + rev = finalAttrs.version; + hash = "sha256-dVbpcBW+jK9nIl5efk5LdKdBm8CkaJWEZ0ZY7ZuApwk="; }; - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ xtl xsimd ]; + nativeBuildInputs = [ + cmake + ]; + propagatedBuildInputs = [ + nlohmann_json + xtl + ] ++ lib.optionals (!(stdenv.isAarch64 && stdenv.isLinux)) [ + # xsimd support is broken on aarch64-linux, see: + # https://github.com/xtensor-stack/xsimd/issues/945 + xsimd10 + ]; - cmakeFlags = [ "-DBUILD_TESTS=ON" ]; + cmakeFlags = let + cmakeBool = x: if x then "ON" else "OFF"; + in [ + "-DBUILD_TESTS=${cmakeBool finalAttrs.doCheck}" + "-DXTENSOR_ENABLE_ASSERT=${cmakeBool enableAssertions}" + "-DXTENSOR_CHECK_DIMENSION=${cmakeBool enableBoundChecks}" + ]; doCheck = true; - nativeCheckInputs = [ gtest ]; + nativeCheckInputs = [ + doctest + ]; checkTarget = "xtest"; - # https://github.com/xtensor-stack/xtensor/issues/2542 - postPatch = '' - substituteInPlace xtensor.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - meta = with lib; { description = "Multi-dimensional arrays with broadcasting and lazy computing."; homepage = "https://github.com/xtensor-stack/xtensor"; @@ -39,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cpcloud ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch b/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch new file mode 100644 index 00000000000..05c8f19dacb --- /dev/null +++ b/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch @@ -0,0 +1,89 @@ +From 768be8b9f98e30a8bd2d51576be9dfcf2cb838ea Mon Sep 17 00:00:00 2001 +From: Kiskae <Kiskae@users.noreply.github.com> +Date: Tue, 26 Sep 2023 20:53:00 +0200 +Subject: [PATCH] simplify compilation of static/shared with cmake + +Signed-off-by: Kiskae <Kiskae@users.noreply.github.com> +--- + CMakeLists.txt | 2 ++ + example/CMakeLists.txt | 2 +- + perf/CMakeLists.txt | 2 +- + src/CMakeLists.txt | 7 ++----- + test/parsing/CMakeLists.txt | 2 +- + 5 files changed, 7 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 471eee13..9af25203 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,6 +16,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + + PROJECT(YetAnotherJSONParser C) + ++option(BUILD_SHARED_LIBS "Build using shared libraries" ON) ++ + SET (YAJL_MAJOR 2) + SET (YAJL_MINOR 1) + SET (YAJL_MICRO 1) +diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt +index 0a7f6220..62ddf14c 100644 +--- a/example/CMakeLists.txt ++++ b/example/CMakeLists.txt +@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(parse_config ${SRCS}) + +-TARGET_LINK_LIBRARIES(parse_config yajl_s) ++TARGET_LINK_LIBRARIES(parse_config yajl) +diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt +index b438d7a1..924a2681 100644 +--- a/perf/CMakeLists.txt ++++ b/perf/CMakeLists.txt +@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(perftest ${SRCS}) + +-TARGET_LINK_LIBRARIES(perftest yajl_s) ++TARGET_LINK_LIBRARIES(perftest yajl) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 789ddf99..78875032 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -35,9 +35,7 @@ SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig + # set the output path for libraries + SET(LIBRARY_OUTPUT_PATH ${libDir}) + +-ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) +- +-ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) ++ADD_LIBRARY(yajl ${SRCS} ${HDRS} ${PUB_HDRS}) + + #### setup shared library version number + SET_TARGET_PROPERTIES(yajl PROPERTIES +@@ -69,7 +67,7 @@ FOREACH (header ${PUB_HDRS}) + + EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir}) + +- ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD ++ ADD_CUSTOM_COMMAND(TARGET yajl POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) + ENDFOREACH (header ${PUB_HDRS}) + +@@ -81,7 +79,6 @@ INSTALL(TARGETS yajl + RUNTIME DESTINATION lib${LIB_SUFFIX} + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +-INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) + INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) + INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) +diff --git a/test/parsing/CMakeLists.txt b/test/parsing/CMakeLists.txt +index c22a3887..f445920d 100644 +--- a/test/parsing/CMakeLists.txt ++++ b/test/parsing/CMakeLists.txt +@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(yajl_test ${SRCS}) + +-TARGET_LINK_LIBRARIES(yajl_test yajl_s) ++TARGET_LINK_LIBRARIES(yajl_test yajl) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 022284b0b13..dad884c2484 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,18 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, which, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yajl"; - version = "2.1.0"; + version = "unstable-2022-04-20"; src = fetchFromGitHub { - owner = "lloyd"; + owner = "containers"; repo = "yajl"; - rev = "refs/tags/${version}"; - sha256 = "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml"; + rev = "49923ccb2143e36850bcdeb781e2bcdf5ce22f15"; + hash = "sha256-9bMPA5FpyBp8fvG/kkT/MnhYtdqg3QzOnmDFXKwJVW0="; }; + patches = [ + # https://github.com/containers/yajl/pull/1 + ./cmake-shared-static-fix.patch + ]; + nativeBuildInputs = [ cmake ]; + doCheck = true; + nativeCheckInputs = [ which ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + meta = { description = "Yet Another JSON Library"; longDescription = '' @@ -21,7 +33,8 @@ stdenv.mkDerivation rec { ''; homepage = "http://lloyd.github.com/yajl/"; license = lib.licenses.isc; + pkgConfigModules = [ "yajl" ]; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ maggesi ]; }; -} +}) diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix index c9468b10b99..20d546e346b 100644 --- a/pkgs/development/libraries/yaml-cpp/default.nix +++ b/pkgs/development/libraries/yaml-cpp/default.nix @@ -3,36 +3,19 @@ , fetchFromGitHub , gitUpdater , cmake -, fetchpatch }: stdenv.mkDerivation rec { pname = "yaml-cpp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; - rev = "yaml-cpp-${version}"; - hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; + rev = version; + hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI="; }; - patches = [ - # https://github.com/jbeder/yaml-cpp/issues/774 - # https://github.com/jbeder/yaml-cpp/pull/1037 - (fetchpatch { - name = "yaml-cpp-Fix-generated-cmake-config.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; - hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; - }) - # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available - (fetchpatch { - name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; - hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -47,9 +30,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - passthru.updateScript = gitUpdater { - rev-prefix = "yaml-cpp-"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A YAML parser and emitter for C++"; diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 4af4ba65a39..2d83211ac0d 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-mZc8DC26c4hZzHsozhBmuvaIjL3ifQ7GYYGDEsBBPKc="; + hash = "sha256-wmbnkxJHFyqntULxzXF16lt+TfwywLdZamQXvcfSFVM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 9fa429f9a4c..6a0e173db3a 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , pkg-config @@ -11,25 +10,15 @@ stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; + sha256 = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; - patches = [ - # Backport gcc-13 fix: - # https://github.com/zeromq/libzmq/pull/4480 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch"; - hash = "sha256-tSTYSrQzgnfbY/70QhPdOnpEXX05VAYwVYuW8P1LWf0="; - }) - ]; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; @@ -41,7 +30,7 @@ stdenv.mkDerivation rec { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; - license = licenses.lgpl3Plus; + license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/development/libraries/zlib-ng/default.nix index 3f2ba22ea43..2d3ba583cfd 100644 --- a/pkgs/development/libraries/zlib-ng/default.nix +++ b/pkgs/development/libraries/zlib-ng/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zlib-ng"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "zlib-ng"; rev = version; - hash = "sha256-DC4KPPaMuqML0HEhWJmWjyox4WEbExPDfNnpnWzoaHc="; + hash = "sha256-okNmobCVAC9y7tjZqFd0DBhOjs3WWRPK8jvK1j9G29k="; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 9c4302433ff..ce539d9eb1c 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; - hash = "sha512-ttYbATvfe+uRYhQWfeG1WGXl5GOztcrITfl/4EQierAzSaDvTmVxSb582hYQOdBpxw2QrVbIdnTm3/Xt4ifecg=="; + hash = "sha512-V1SFPtSytFZMyiR/cgwLA9zPUK5xuarP3leQCQiSfelUHnYMB+R6ZQfSHMHD9t+URvLc+KRFSriLTzethspkpA=="; }; sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c"; diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index 9cd78b7b56a..1c010638693 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { - inherit (python3.pkgs) zxing_cpp; + inherit (python3.pkgs) zxing-cpp; }; updateScript = gitUpdater { rev-prefix = "v"; |