diff options
Diffstat (limited to 'pkgs/development/libraries')
966 files changed, 4651 insertions, 3747 deletions
diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix deleted file mode 100644 index 0a2954f4a7dd4..0000000000000 --- a/pkgs/development/libraries/CoinMP/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "CoinMP"; - version = "1.8.4"; - - src = fetchurl { - url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz"; - sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; - }; - - enableParallelBuilding = true; - - env = lib.optionalAttrs stdenv.cc.isClang { - CXXFLAGS = "-std=c++14"; - }; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - homepage = "https://projects.coin-or.org/CoinMP/"; - description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"; - platforms = platforms.unix; - license = licenses.epl10; - }; -} diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/development/libraries/LASzip/LASzip2.nix deleted file mode 100644 index 4f63dfe8059c8..0000000000000 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - version = "2.2.0"; - pname = "LASzip"; - - src = fetchFromGitHub { - owner = "LASzip"; - repo = "LASzip"; - rev = "v${version}"; - sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; - homepage = "https://laszip.org"; - license = licenses.lgpl2; - maintainers = [ maintainers.michelk ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix deleted file mode 100644 index ee6e74aa7bc23..0000000000000 --- a/pkgs/development/libraries/LASzip/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, fixDarwinDylibNames -}: - -stdenv.mkDerivation (finalAttrs: { - version = "3.4.3"; - pname = "LASzip"; - - src = fetchFromGitHub { - owner = "LASzip"; - repo = "LASzip"; - rev = finalAttrs.version; - hash = "sha256-9fzal54YaocONtguOCxnP7h1LejQPQ0dKFiCzfvTjCY="; - }; - - nativeBuildInputs = [ - cmake - ] ++ lib.optionals stdenv.isDarwin [ - fixDarwinDylibNames - ]; - - meta = { - description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; - homepage = "https://laszip.org"; - changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.rev}"; - license = lib.licenses.lgpl2; - maintainers = [ lib.maintainers.michelk ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 2e81550c28a54..8038407090b43 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A cross-platform multimedia library"; + description = "Cross-platform multimedia library"; mainProgram = "sdl-config"; homepage = "http://www.libsdl.org/"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 1e63f3bfdef18..91903c9f68516 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.2"; + version = "2.30.3"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-yYYtsF6+IKynXpfay0rUmCQPdL8vp6dlmon8N7UG89A="; + hash = "sha256-ycY/AkWulV3vAu/+vKw+j/b6jTZWjqKjIgjRwqNHFl8="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -179,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A cross-platform multimedia library"; + description = "Cross-platform multimedia library"; mainProgram = "sdl2-config"; homepage = "http://www.libsdl.org/"; changelog = "https://github.com/libsdl-org/SDL/releases/tag/release-${finalAttrs.version}"; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix deleted file mode 100644 index 83b57b42c7cd1..0000000000000 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "SDL2_gfx"; - version = "1.0.4"; - - src = fetchurl { - url = "http://www.ferzkopp.net/Software/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33"; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isDarwin darwin.libobjc; - - 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"; - - longDescription = '' - The SDL_gfx library evolved out of the SDL_gfxPrimitives code - which provided basic drawing routines such as lines, circles or - polygons and SDL_rotozoom which implemented a interpolating - rotozoomer for SDL surfaces. - - The current components of the SDL_gfx library are: - - * Graphic Primitives (SDL_gfxPrimitves.h) - * Rotozoomer (SDL_rotozoom.h) - * Framerate control (SDL_framerate.h) - * MMX image filters (SDL_imageFilter.h) - * Custom Blit functions (SDL_gfxBlitFunc.h) - - The library is backwards compatible to the above mentioned - code. Its is written in plain C and can be used in C++ code. - ''; - - homepage = "http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"; - license = licenses.zlib; - maintainers = with maintainers; [ cpages ]; - platforms = platforms.unix; - pkgConfigModules = [ "SDL2_gfx" ]; - }; -}) diff --git a/pkgs/development/libraries/SDL2_sound/default.nix b/pkgs/development/libraries/SDL2_sound/default.nix deleted file mode 100644 index 056991c9aca45..0000000000000 --- a/pkgs/development/libraries/SDL2_sound/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, SDL2 -, flac -, libmikmod -, libvorbis -, timidity -, AudioToolbox -, CoreAudio -}: - -stdenv.mkDerivation rec { - pname = "SDL2_sound"; - version = "2.0.1"; - - src = fetchFromGitHub { - owner = "icculus"; - repo = "SDL_sound"; - rev = "v${version}"; - sha256 = "sha256-N2znqy58tMHgYa07vEsSedWLRhoJzDoINcsUu0UYLnA="; - }; - - patches = [ - (fetchpatch { - # https://github.com/icculus/SDL_sound/pull/32 - fix build on darwin - # can be dropped on the next update - url = "https://github.com/icculus/SDL_sound/commit/c15d75b7720113b28639baad284f45f943846294.patch"; - sha256 = "sha256-4GL8unsZ7eNkzjLXq9QdaxFQMzX2tdP0cBR1jTaRLc0="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DSDLSOUND_DECODER_MIDI=1" ]; - - buildInputs = [ SDL2 flac libmikmod libvorbis timidity ] - ++ lib.optionals stdenv.isDarwin [ AudioToolbox CoreAudio ]; - - meta = with lib; { - description = "SDL2 sound library"; - mainProgram = "playsound"; - platforms = platforms.unix; - license = licenses.zlib; - homepage = "https://www.icculus.org/SDL_sound/"; - }; -} diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix deleted file mode 100644 index 3407478b39b1c..0000000000000 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL, testers }: - -stdenv.mkDerivation (finalAttrs: { - pname = "SDL2_ttf"; - version = "2.22.0"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM="; - }; - - configureFlags = [ "--disable-harfbuzz-builtin" ] - ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ SDL2 freetype harfbuzz ] - ++ 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_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix deleted file mode 100644 index e24af838c65ed..0000000000000 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchpatch, fetchurl, SDL, autoreconfHook, pango, pkg-config }: - -stdenv.mkDerivation rec { - pname = "SDL_Pango"; - version = "0.1.2"; - - src = fetchurl { - url = "mirror://sourceforge/sdlpango/${pname}-${version}.tar.gz"; - sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz"; - }; - - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch"; - sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld"; - }) - ./fixes.patch - ]; - - preConfigure = "autoreconf -i -f"; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ SDL pango ]; - - meta = with lib; { - description = "Connects the Pango rendering engine to SDL"; - license = licenses.lgpl21Plus; - platforms = platforms.all; - homepage = "https://sdlpango.sourceforge.net/"; - maintainers = with maintainers; [ puckipedia ]; - }; -} diff --git a/pkgs/development/libraries/SDL_Pango/fixes.patch b/pkgs/development/libraries/SDL_Pango/fixes.patch deleted file mode 100644 index 9703c0d4918f5..0000000000000 --- a/pkgs/development/libraries/SDL_Pango/fixes.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/SDL_Pango.pc.in b/SDL_Pango.pc.in -index 750d091..3af38ff 100644 ---- a/SDL_Pango.pc.in -+++ b/SDL_Pango.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: SDL_Pango - Description: SDL library for internationalized text rendering - Version: @VERSION@ --Requires: pango -+Requires: pango pangoft2 - Libs: -L${libdir} -lSDL_Pango - Cflags: -I${includedir} -\ No newline at end of file -diff --git a/src/SDL_Pango.c b/src/SDL_Pango.c -index b969bc1..cc2c3f5 100644 ---- a/src/SDL_Pango.c -+++ b/src/SDL_Pango.c -@@ -231,6 +231,41 @@ - - #include "SDL_Pango.h" - -+const SDLPango_Matrix _MATRIX_WHITE_BACK -+ = {255, 0, 0, 0, -+ 255, 0, 0, 0, -+ 255, 0, 0, 0, -+ 255, 255, 0, 0,}; -+const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK; -+ -+const SDLPango_Matrix _MATRIX_BLACK_BACK -+ = {0, 255, 0, 0, -+ 0, 255, 0, 0, -+ 0, 255, 0, 0, -+ 255, 255, 0, 0,}; -+const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK; -+ -+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER -+ = {0, 0, 0, 0, -+ 0, 0, 0, 0, -+ 0, 0, 0, 0, -+ 0, 255, 0, 0,}; -+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER; -+ -+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER -+ = {255, 255, 0, 0, -+ 255, 255, 0, 0, -+ 255, 255, 0, 0, -+ 0, 255, 0, 0,}; -+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER; -+ -+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER -+ = {255, 255, 0, 0, -+ 255, 255, 0, 0, -+ 255, 255, 0, 0, -+ 0, 0, 0, 0,}; -+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER; -+ - //! non-zero if initialized - static int IS_INITIALIZED = 0; - -diff --git a/src/SDL_Pango.h b/src/SDL_Pango.h -index 6ebdf78..b7e5e58 100644 ---- a/src/SDL_Pango.h -+++ b/src/SDL_Pango.h -@@ -47,57 +47,32 @@ typedef struct _SDLPango_Matrix { - Uint8 m[4][4]; /*! Matrix variables */ - } SDLPango_Matrix; - --const SDLPango_Matrix _MATRIX_WHITE_BACK -- = {255, 0, 0, 0, -- 255, 0, 0, 0, -- 255, 0, 0, 0, -- 255, 255, 0, 0,}; - - /*! - Specifies white back and black letter. - */ --const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK; -+extern const SDLPango_Matrix *MATRIX_WHITE_BACK; - --const SDLPango_Matrix _MATRIX_BLACK_BACK -- = {0, 255, 0, 0, -- 0, 255, 0, 0, -- 0, 255, 0, 0, -- 255, 255, 0, 0,}; - /*! - Specifies black back and white letter. - */ --const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK; -+extern const SDLPango_Matrix *MATRIX_BLACK_BACK; - --const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER -- = {0, 0, 0, 0, -- 0, 0, 0, 0, -- 0, 0, 0, 0, -- 0, 255, 0, 0,}; - /*! - Specifies transparent back and black letter. - */ --const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER; -+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER; - --const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER -- = {255, 255, 0, 0, -- 255, 255, 0, 0, -- 255, 255, 0, 0, -- 0, 255, 0, 0,}; - /*! - Specifies transparent back and white letter. - */ --const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER; -+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER; - --const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER -- = {255, 255, 0, 0, -- 255, 255, 0, 0, -- 255, 255, 0, 0, -- 0, 0, 0, 0,}; - /*! - Specifies transparent back and transparent letter. - This is useful for KARAOKE like rendering. - */ --const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER; -+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER; - - /*! - Specifies direction of text. See Pango reference for detail -@@ -186,7 +161,8 @@ extern DECLSPEC void SDLCALL SDLPango_SetBaseDirection( - SDLPango_Direction direction); - - --#ifdef __FT2_BUILD_UNIX_H__ -+ -+#ifdef __PANGO_H__ - - extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface( - const FT_Bitmap *bitmap, -@@ -194,11 +170,8 @@ extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface( - const SDLPango_Matrix *matrix, - SDL_Rect *rect); - --#endif /* __FT2_BUILD_UNIX_H__ */ - - --#ifdef __PANGO_H__ -- - extern DECLSPEC PangoFontMap* SDLCALL SDLPango_GetPangoFontMap( - SDLPango_Context *context); - diff --git a/pkgs/development/libraries/SDL_audiolib/default.nix b/pkgs/development/libraries/SDL_audiolib/default.nix deleted file mode 100644 index 9b8a163b206c2..0000000000000 --- a/pkgs/development/libraries/SDL_audiolib/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, SDL2 -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "SDL_audiolib"; - version = "unstable-2022-04-17"; - - src = fetchFromGitHub { - owner = "realnc"; - repo = "SDL_audiolib"; - rev = "908214606387ef8e49aeacf89ce848fb36f694fc"; - sha256 = "sha256-11KkwIhG1rX7yDFSj92NJRO9L2e7XZGq2gOJ54+sN/A="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - SDL2 - ]; - - cmakeFlags = [ - "-DUSE_RESAMP_SRC=OFF" - "-DUSE_RESAMP_SOXR=OFF" - "-DUSE_DEC_DRFLAC=OFF" - "-DUSE_DEC_OPENMPT=OFF" - "-DUSE_DEC_XMP=OFF" - "-DUSE_DEC_MODPLUG=OFF" - "-DUSE_DEC_MPG123=OFF" - "-DUSE_DEC_SNDFILE=OFF" - "-DUSE_DEC_LIBVORBIS=OFF" - "-DUSE_DEC_LIBOPUSFILE=OFF" - "-DUSE_DEC_MUSEPACK=OFF" - "-DUSE_DEC_FLUIDSYNTH=OFF" - "-DUSE_DEC_BASSMIDI=OFF" - "-DUSE_DEC_WILDMIDI=OFF" - "-DUSE_DEC_ADLMIDI=OFF" - ]; - - meta = with lib; { - description = "Audio decoding, resampling and mixing library for SDL"; - homepage = "https://github.com/realnc/SDL_audiolib"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index f7d997cd52e59..3c3df10f91672 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A cross-platform multimedia library - build SDL 1.2 applications against 2.0"; + description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0"; mainProgram = "sdl-config"; homepage = "https://www.libsdl.org/"; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix deleted file mode 100644 index bccc11f43d418..0000000000000 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, SDL }: - -stdenv.mkDerivation rec { - pname = "SDL_gfx"; - version = "2.0.27"; - - src = fetchurl { - url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${pname}-${version}.tar.gz"; - sha256 = "sha256-37FaxfjOeklS3BLSrtl0dRjF5rM1wOMWNtI/k8Yw9Bk="; - }; - - # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h - propagatedBuildInputs = [ SDL ]; - buildInputs = [ SDL ] ; - - configureFlags = [ "--disable-mmx" ] - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - - meta = with lib; { - description = "SDL graphics drawing primitives and support functions"; - - longDescription = '' - The SDL_gfx library evolved out of the SDL_gfxPrimitives code - which provided basic drawing routines such as lines, circles or - polygons and SDL_rotozoom which implemented a interpolating - rotozoomer for SDL surfaces. - - The current components of the SDL_gfx library are: - - * Graphic Primitives (SDL_gfxPrimitves.h) - * Rotozoomer (SDL_rotozoom.h) - * Framerate control (SDL_framerate.h) - * MMX image filters (SDL_imageFilter.h) - * Custom Blit functions (SDL_gfxBlitFunc.h) - - The library is backwards compatible to the above mentioned - code. Its is written in plain C and can be used in C++ code. - ''; - - homepage = "https://sourceforge.net/projects/sdlgfx/"; - license = licenses.zlib; - - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix deleted file mode 100644 index dc52e6afeea77..0000000000000 --- a/pkgs/development/libraries/SDL_gpu/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: - -stdenv.mkDerivation { - pname = "SDL_gpu-unstable"; - version = "2019-01-24"; - - src = fetchFromGitHub { - owner = "grimfang4"; - repo = "sdl-gpu"; - rev = "e3d350b325a0e0d0b3007f69ede62313df46c6ef"; - sha256 = "0kibcaim01inb6xxn4mr6affn4hm50vz9kahb5k9iz8dmdsrhxy1"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 libGLU ]; - - cmakeFlags = [ - "-DSDL_gpu_BUILD_DEMOS=OFF" - "-DSDL_gpu_BUILD_TOOLS=OFF" - "-DSDL_gpu_BUILD_VIDEO_TEST=OFF" - "-DSDL_gpu_BUILD_TESTS=OFF" - ]; - - patchPhase = '' - sed -ie '210s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt - sed -ie '213s#''${OUTPUT_DIR}/lib#''${CMAKE_INSTALL_LIBDIR}#' src/CMakeLists.txt - ''; - - meta = with lib; { - description = "A library for high-performance, modern 2D graphics with SDL written in C"; - homepage = "https://github.com/grimfang4/sdl-gpu"; - license = licenses.mit; - maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix deleted file mode 100644 index 30f71bd3e520e..0000000000000 --- a/pkgs/development/libraries/SDL_image/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm, pkg-config }: - -stdenv.mkDerivation rec { - pname = "SDL_image"; - version = "1.2.12"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_image/release/${pname}-${version}.tar.gz"; - sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2017-2887"; - url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch"; - includes = [ "IMG_xcf.c" ]; - sha256 = "174ka2r95i29nlshzgp6x5vc68v7pi8lhzf33and2b1ms49g4jb7"; - }) - ]; - - configureFlags = [ - # Disable its dynamic loading or dlopen will fail because of no proper rpath - "--disable-jpg-shared" - "--disable-png-shared" - "--disable-tif-shared" - ] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL libpng libjpeg libtiff giflib libXpm ]; - - meta = with lib; { - description = "SDL image library"; - homepage = "http://www.libsdl.org/projects/SDL_image/"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - license = licenses.zlib; - }; -} diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix deleted file mode 100644 index 12b50cd476ba9..0000000000000 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch -, SDL, libogg, libvorbis, smpeg, libmikmod -, fluidsynth, pkg-config -, enableNativeMidi ? false -}: - -stdenv.mkDerivation rec { - pname = "SDL_mixer"; - version = "1.2.12"; - - src = fetchurl { - url = "http://www.libsdl.org/projects/${pname}/release/${pname}-${version}.tar.gz"; - 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 ]; - - configureFlags = [ "--disable-music-ogg-shared" "--disable-music-mod-shared" ] - ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl" - ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; - - meta = with lib; { - description = "SDL multi-channel audio mixer library"; - homepage = "http://www.libsdl.org/projects/SDL_mixer/"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - license = licenses.zlib; - }; -} diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix deleted file mode 100644 index e902213c9710f..0000000000000 --- a/pkgs/development/libraries/SDL_net/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, SDL, pkg-config }: - -stdenv.mkDerivation rec { - pname = "SDL_net"; - version = "1.2.8"; - - src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_net/release/${pname}-${version}.tar.gz"; - sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; - }; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ SDL ]; - - meta = with lib; { - description = "SDL networking library"; - platforms = platforms.unix; - license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html"; - }; -} diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix deleted file mode 100644 index 189fdee05b268..0000000000000 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel }: - -stdenv.mkDerivation { - pname = "SDL_sixel"; - version = "1.2-nightly"; - - src = fetchFromGitHub { - owner = "saitoha"; - repo = "SDL1.2-SIXEL"; - rev = "ab3fccac6e34260a617be511bd8c2b2beae41952"; - sha256 = "0gm2vngdac17lzw9azkhzazmfq3byjddms14gqjk18vnynfqp5wp"; - }; - - configureFlags = [ "--enable-video-sixel" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libsixel ]; - - meta = with lib; { - description = "A cross-platform multimedia library, that supports sixel graphics on consoles"; - mainProgram = "sdl-config"; - homepage = "https://github.com/saitoha/SDL1.2-SIXEL"; - maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix deleted file mode 100644 index bdc97e98f3414..0000000000000 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }: - -stdenv.mkDerivation rec { - pname = "SDL_sound"; - version = "1.0.3"; - - src = fetchurl { - url = "https://icculus.org/SDL_sound/downloads/${pname}-${version}.tar.gz"; - sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r"; - }; - - buildInputs = [ SDL libvorbis flac libmikmod ]; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - meta = with lib; { - description = "SDL sound library"; - platforms = platforms.unix; - license = licenses.lgpl21; - homepage = "https://www.icculus.org/SDL_sound/"; - }; -} diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix deleted file mode 100644 index 99f86dd258b37..0000000000000 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl, SDL }: - -stdenv.mkDerivation rec { - pname = "SDL_stretch"; - version = "0.3.1"; - - src = fetchurl { - url = "mirror://sourceforge/sdl-stretch/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw"; - }; - - buildInputs = [ SDL ]; - - meta = with lib; { - description = "Stretch Functions For SDL"; - homepage = "https://sdl-stretch.sourceforge.net/"; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix deleted file mode 100644 index 5d353e3a6c0dd..0000000000000 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, SDL, freetype }: - -stdenv.mkDerivation rec { - pname = "SDL_ttf"; - version = "2.0.11"; - - src = fetchurl { - url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"; - }; - - patches = [ - # Bug #830: TTF_RenderGlyph_Shaded is broken - (fetchpatch { - url = "https://bugzilla-attachments.libsdl.org/attachment.cgi?id=830"; - sha256 = "0cfznfzg1hs10wl349z9n8chw80i5adl3iwhq4y102g0xrjyb72d"; - }) - ]; - - patchFlags = [ "-p0" ]; - - buildInputs = [ SDL freetype ]; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - meta = with lib; { - description = "SDL TrueType library"; - license = licenses.zlib; - platforms = platforms.all; - homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html"; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 59294496f80ae..04af3153719a3 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "An open-source collection of C++ code designed to augment the C++ standard library"; + description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix index 0c1a173eca44b..303f0c60d6390 100644 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , static ? stdenv.hostPlatform.isStatic , cxxStandard ? null @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "An open-source collection of C++ code designed to augment the C++ standard library"; + description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix index 5dda078a3a901..b8eb30773a067 100644 --- a/pkgs/development/libraries/abseil-cpp/202206.nix +++ b/pkgs/development/libraries/abseil-cpp/202206.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "An open-source collection of C++ code designed to augment the C++ standard library"; + description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix index b2d4f437473f3..62d98d77a38f3 100644 --- a/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/pkgs/development/libraries/abseil-cpp/202301.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest ]; meta = with lib; { - description = "An open-source collection of C++ code designed to augment the C++ standard library"; + description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/abseil-cpp/202308.nix b/pkgs/development/libraries/abseil-cpp/202308.nix index f3aac7d1388bd..f03ee08ea58ec 100644 --- a/pkgs/development/libraries/abseil-cpp/202308.nix +++ b/pkgs/development/libraries/abseil-cpp/202308.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest ]; meta = with lib; { - description = "An open-source collection of C++ code designed to augment the C++ standard library"; + description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/abseil-cpp/202401.nix b/pkgs/development/libraries/abseil-cpp/202401.nix index 73e663b0d0c6f..8352007b3413a 100644 --- a/pkgs/development/libraries/abseil-cpp/202401.nix +++ b/pkgs/development/libraries/abseil-cpp/202401.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest ]; meta = with lib; { - description = "An open-source collection of C++ code designed to augment the C++ standard library"; + description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index 97b2230f03116..8dd01cc4eabe3 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSHARED=ON" ]; meta = with lib; { - description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; + description = "Audio encoder which generates compressed audio streams based on ATSC A/52 specification"; homepage = "https://aften.sourceforge.net/"; license = licenses.lgpl21Only; platforms = platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 311bdd595c681..cb0d12a3edfb2 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; - description = "A new Categories library"; + description = "New Categories library"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ alexarice turion ]; diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index d7b49893b96f7..9779277b5e7cf 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { passthru.tests = { inherit (nixosTests) agda; }; meta = with lib; { homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; - description = "A standard library for use with the Agda compiler"; + description = "Standard library for use with the Agda compiler"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with maintainers; [ jwiegley mudri alexarice turion ]; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 6f73c47f49d1a..800cee267f4a7 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec ''; meta = with lib; { - description = "An open framework for storing and sharing scene data"; + description = "Open framework for storing and sharing scene data"; homepage = "http://alembic.io/"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/development/libraries/alglib/default.nix index 1ff34a8d1f161..b2e13cdc06651 100644 --- a/pkgs/development/libraries/alglib/default.nix +++ b/pkgs/development/libraries/alglib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alglib3"; - version = "3.18.0"; + version = "4.01.0"; src = fetchurl { url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; - sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq"; + sha256 = "sha256-lejqQbMskjRvSaaUdZ54bF86EIe0AaklnvWSwO6kvvs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index eaf227fa60d14..94dd96dae0e72 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,6 @@ , cmake , enet , fetchFromGitHub -, fetchpatch , flac , freetype , gtk3 @@ -99,7 +98,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; meta = with lib; { - description = "A game programming library"; + description = "Game programming library"; homepage = "https://liballeg.org/"; license = licenses.zlib; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 0318c3133d636..be521257f1955 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ]; meta = with lib; { - description = "A game programming library"; + description = "Game programming library"; homepage = "https://liballeg.org/"; license = licenses.giftware; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index a1bb5798b0e98..a367b765874bd 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ openal ]; meta = with lib; { - description = "A utility library to help manage common tasks with OpenAL applications"; + description = "Utility library to help manage common tasks with OpenAL applications"; homepage = "https://github.com/kcat/alure"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix index fa42c4fd53a3d..f18a2a3434e16 100644 --- a/pkgs/development/libraries/alure2/default.nix +++ b/pkgs/development/libraries/alure2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openal libvorbis opusfile libsndfile ]; meta = with lib; { - description = "A utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming"; + description = "Utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming"; homepage = "https://github.com/kcat/alure"; license = licenses.zlib; platforms = platforms.linux; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 74e4958671c76..f62ed8b7d0fd1 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.Q4.2"; + version = "2024.Q2.2"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "CmlFqHxP6WM4b/MnXbRhd2TvV3qhMiC6rHrn/SHtRdc="; + sha256 = "MBO7XE2C4y2ZODLGnNw17n1TlKDjD5yyjuvzvTSaQIU="; }; buildInputs = [ @@ -59,7 +59,10 @@ in stdenv.mkDerivation rec { perl pkg-config python3 - ]; + ] ++ (with python3.pkgs; [ + jinja2 + ruamel-yaml + ]); rpath = lib.makeLibraryPath [ libdrm diff --git a/pkgs/development/libraries/antic/default.nix b/pkgs/development/libraries/antic/default.nix index 5a8e00d90f5a3..3534b40122f14 100644 --- a/pkgs/development/libraries/antic/default.nix +++ b/pkgs/development/libraries/antic/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "An algebraic number theory library"; + description = "Algebraic number theory library"; homepage = "https://github.com/flintlib/antic"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ smasher164 ]; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index bd32ad45c47ba..68205d83a42d1 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apr.apache.org/"; - description = "A companion library to APR, the Apache Portable Runtime"; + description = "Companion library to APR, the Apache Portable Runtime"; mainProgram = "apu-1-config"; maintainers = [ maintainers.eelco ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 6428489173daa..11bdd53945d06 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }: +{ lib, stdenv, fetchurl, buildPackages, autoreconfHook }: stdenv.mkDerivation rec { pname = "apr"; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apr.apache.org/"; - description = "The Apache Portable Runtime library"; + description = "Apache Portable Runtime library"; mainProgram = "apr-1-config"; platforms = platforms.all; license = licenses.asl20; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 102703107c488..8d5b597d26610 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext ]; meta = with lib; { - description = "An interface to banking tasks, file formats and country information"; + description = "Interface to banking tasks, file formats and country information"; homepage = "https://www.aquamaniac.de/rdm/"; hydraPlatforms = []; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index 2ab8339b00a70..87072265abb26 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A library for arbitrary-precision interval arithmetic"; + description = "Library for arbitrary-precision interval arithmetic"; homepage = "https://arblib.org/"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 4ee5baa38bed0..cedc8edce3952 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.8.3"; + version = "12.8.4"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-KSJYn2OHeWUEs0Daa7lUvvPYdXTCmFFYkyie3S2JAVE="; + hash = "sha256-VY/lJrmQoWY2eO/zr27JP3nuEoyBpMiu8nrTKPrmETg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 5c4336572b8f4..d52191c56533f 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -213,7 +213,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A general-purpose library for parallel and massively-parallel computations"; + description = "General-purpose library for parallel and massively-parallel computations"; longDescription = '' A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices."; ''; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index ba5b3d6ddd515..60f11fd23d84c 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -189,6 +189,7 @@ in rec { fullName = "Afrikaans"; filename = "aspell"; sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; + meta.license = lib.licenses.lgpl21Only; }; am = buildOfficialDict { @@ -197,6 +198,7 @@ in rec { fullName = "Amharic"; filename = "aspell6"; sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; + meta.license = lib.licenses.publicDomain; }; ar = buildOfficialDict { @@ -205,6 +207,7 @@ in rec { fullName = "Arabic"; filename = "aspell6"; sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; + meta.license = lib.licenses.gpl2Only; }; ast = buildOfficialDict { @@ -213,6 +216,7 @@ in rec { fullName = "Asturian"; filename = "aspell6"; sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; + meta.license = lib.licenses.gpl2Only; }; az = buildOfficialDict { @@ -221,6 +225,7 @@ in rec { fullName = "Azerbaijani"; filename = "aspell6"; sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; + meta.license = lib.licenses.gpl2Only; }; be = buildOfficialDict { @@ -229,6 +234,7 @@ in rec { fullName = "Belarusian"; filename = "aspell5"; sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; + meta.license = lib.licenses.gpl2Only; }; bg = buildOfficialDict { @@ -237,6 +243,7 @@ in rec { fullName = "Bulgarian"; filename = "aspell6"; sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; + meta.license = lib.licenses.gpl2Only; }; bn = buildOfficialDict { @@ -245,6 +252,7 @@ in rec { fullName = "Bengali"; filename = "aspell6"; sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; + meta.license = lib.licenses.gpl2Only; }; br = buildOfficialDict { @@ -253,6 +261,7 @@ in rec { fullName = "Breton"; filename = "aspell"; sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; + meta.license = lib.licenses.gpl2Only; }; ca = buildOfficialDict { @@ -261,6 +270,7 @@ in rec { fullName = "Catalan"; filename = "aspell6"; sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; + meta.license = lib.licenses.gpl2Only; }; cs = buildOfficialDict { @@ -269,6 +279,7 @@ in rec { fullName = "Czech"; filename = "aspell6"; sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; + meta.license = lib.licenses.gpl2Only; }; csb = buildOfficialDict { @@ -277,6 +288,7 @@ in rec { fullName = "Kashubian"; filename = "aspell6"; sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; + meta.license = lib.licenses.gpl2Only; }; cy = buildOfficialDict { @@ -285,6 +297,7 @@ in rec { fullName = "Welsh"; filename = "aspell"; sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; + meta.license = lib.licenses.gpl2Only; }; da = buildOfficialDict { @@ -293,6 +306,7 @@ in rec { fullName = "Danish"; filename = "aspell5"; sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; + meta.license = lib.licenses.gpl2Only; }; de = buildOfficialDict { @@ -301,6 +315,7 @@ in rec { fullName = "German"; filename = "aspell6"; sha256 = "0wamclvp66xfmv5wff96v6gdlnfv4y8lx3f8wvxyzm5imwgms4n2"; + meta.license = lib.licenses.gpl2Plus; }; de-alt = buildOfficialDict { @@ -309,6 +324,7 @@ in rec { fullName = "German - Old Spelling"; filename = "aspell6"; sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; + meta.license = lib.licenses.gpl2Only; }; el = buildOfficialDict { @@ -317,6 +333,7 @@ in rec { fullName = "Greek"; filename = "aspell6"; sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; + meta.license = lib.licenses.gpl2Only; }; en = buildOfficialDict { @@ -325,6 +342,13 @@ in rec { fullName = "English"; filename = "aspell6"; sha256 = "1cwzqkm8gr1w51rpckwlvb43sb0b5nbwy7s8ns5vi250515773sc"; + # some parts are under a custom free license others are just stated to be"public domain" + # see the Copyright file in the source for further information + meta.license = with lib.licenses; [ + free + publicDomain + bsdOriginalUC + ]; }; eo = buildOfficialDict { @@ -333,6 +357,7 @@ in rec { fullName = "Esperanto"; filename = "aspell6"; sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; + meta.license = lib.licenses.gpl2Only; }; es = buildOfficialDict { @@ -341,6 +366,7 @@ in rec { fullName = "Spanish"; filename = "aspell6"; sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; + meta.license = lib.licenses.gpl2Only; }; et = buildOfficialDict { @@ -349,6 +375,7 @@ in rec { fullName = "Estonian"; filename = "aspell6"; sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; + meta.license = lib.licenses.lgpl21Only; }; fa = buildOfficialDict { @@ -357,6 +384,7 @@ in rec { fullName = "Persian"; filename = "aspell6"; sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; + meta.license = lib.licenses.gpl2Only; }; fi = buildOfficialDict { @@ -365,6 +393,7 @@ in rec { fullName = "Finnish"; filename = "aspell6"; sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; + meta.license = lib.licenses.gpl2Only; }; fo = buildOfficialDict { @@ -373,6 +402,7 @@ in rec { fullName = "Faroese"; filename = "aspell5"; sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; + meta.license = lib.licenses.gpl2Only; }; fr = buildOfficialDict { @@ -381,6 +411,7 @@ in rec { fullName = "French"; filename = "aspell"; sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; + meta.license = lib.licenses.gpl2Only; }; fy = buildOfficialDict { @@ -389,6 +420,7 @@ in rec { fullName = "Frisian"; filename = "aspell6"; sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; + meta.license = lib.licenses.gpl2Only; }; ga = buildOfficialDict { @@ -397,6 +429,7 @@ in rec { fullName = "Irish"; filename = "aspell5"; sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; + meta.license = lib.licenses.gpl2Only; }; gd = buildOfficialDict { @@ -405,6 +438,7 @@ in rec { fullName = "Scottish Gaelic"; filename = "aspell5"; sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; + meta.license = lib.licenses.gpl2Only; }; gl = buildOfficialDict { @@ -413,6 +447,7 @@ in rec { fullName = "Galician"; filename = "aspell6"; sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; + meta.license = lib.licenses.gpl2Only; }; grc = buildOfficialDict { @@ -421,6 +456,7 @@ in rec { fullName = "Ancient Greek"; filename = "aspell6"; sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; + meta.license = lib.licenses.gpl3Only; }; gu = buildOfficialDict { @@ -429,6 +465,7 @@ in rec { fullName = "Gujarati"; filename = "aspell6"; sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; + meta.license = lib.licenses.gpl2Only; }; gv = buildOfficialDict { @@ -437,6 +474,7 @@ in rec { fullName = "Manx Gaelic"; filename = "aspell"; sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; + meta.license = lib.licenses.gpl2Only; }; he = buildOfficialDict { @@ -445,6 +483,7 @@ in rec { fullName = "Hebrew"; filename = "aspell6"; sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; + meta.license = lib.licenses.gpl2Only; }; hi = buildOfficialDict { @@ -453,6 +492,7 @@ in rec { fullName = "Hindi"; filename = "aspell6"; sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; + meta.license = lib.licenses.gpl2Only; }; hil = buildOfficialDict { @@ -461,6 +501,7 @@ in rec { fullName = "Hiligaynon"; filename = "aspell5"; sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; + meta.license = lib.licenses.gpl2Only; }; hr = buildOfficialDict { @@ -469,6 +510,7 @@ in rec { fullName = "Croatian"; filename = "aspell"; sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; + meta.license = lib.licenses.lgpl21Only; }; hsb = buildOfficialDict { @@ -477,6 +519,7 @@ in rec { fullName = "Upper Sorbian"; filename = "aspell6"; sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; + meta.license = lib.licenses.gpl2Only; }; hu = buildOfficialDict { @@ -485,6 +528,7 @@ in rec { fullName = "Hungarian"; filename = "aspell6"; sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; + meta.license = lib.licenses.gpl2Only; }; hus = buildOfficialDict { @@ -493,6 +537,7 @@ in rec { fullName = "Huastec"; filename = "aspell6"; sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; + meta.license = lib.licenses.gpl3Only; }; hy = buildOfficialDict { @@ -501,6 +546,7 @@ in rec { fullName = "Armenian"; filename = "aspell6"; sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; + meta.license = lib.licenses.gpl2Only; }; ia = buildOfficialDict { @@ -509,6 +555,7 @@ in rec { fullName = "Interlingua"; filename = "aspell"; sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; + meta.license = lib.licenses.lgpl21Only; }; id = buildOfficialDict { @@ -517,6 +564,7 @@ in rec { fullName = "Indonesian"; filename = "aspell5"; sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; + meta.license = lib.licenses.gpl2Only; }; is = buildOfficialDict { @@ -525,6 +573,7 @@ in rec { fullName = "Icelandic"; filename = "aspell"; sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; + meta.license = lib.licenses.gpl2Only; }; it = buildOfficialDict { @@ -533,6 +582,7 @@ in rec { fullName = "Italian"; filename = "aspell6"; sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; + meta.license = lib.licenses.gpl2Plus; }; kn = buildOfficialDict { @@ -541,6 +591,7 @@ in rec { fullName = "Kannada"; filename = "aspell6"; sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; + meta.license = lib.licenses.gpl3Only; }; ku = buildOfficialDict { @@ -549,6 +600,7 @@ in rec { fullName = "Kurdi"; filename = "aspell5"; sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; + meta.license = lib.licenses.gpl2Only; }; ky = buildOfficialDict { @@ -557,6 +609,7 @@ in rec { fullName = "Kirghiz"; filename = "aspell6"; sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; + meta.license = lib.licenses.gpl2Only; }; la = buildOfficialDict { @@ -565,6 +618,7 @@ in rec { fullName = "Latin"; filename = "aspell6"; sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; + meta.license = lib.licenses.gpl2Only; }; lt = buildOfficialDict { @@ -573,6 +627,7 @@ in rec { fullName = "Lithuanian"; filename = "aspell6"; sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; + meta.license = lib.licenses.bsd3; }; lv = buildOfficialDict { @@ -581,6 +636,7 @@ in rec { fullName = "Latvian"; filename = "aspell6"; sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; + meta.license = lib.licenses.gpl2Only; }; mg = buildOfficialDict { @@ -589,6 +645,7 @@ in rec { fullName = "Malagasy"; filename = "aspell5"; sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; + meta.license = lib.licenses.gpl2Only; }; mi = buildOfficialDict { @@ -597,6 +654,7 @@ in rec { fullName = "Maori"; filename = "aspell"; sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; + meta.license = lib.licenses.lgpl21Only; }; mk = buildOfficialDict { @@ -605,6 +663,7 @@ in rec { fullName = "Macedonian"; filename = "aspell"; sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; + meta.license = lib.licenses.gpl2Only; }; ml = buildOfficialDict { @@ -613,6 +672,7 @@ in rec { fullName = "Malayalam"; filename = "aspell6"; sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; + meta.license = lib.licenses.gpl3Only; }; mn = buildOfficialDict { @@ -621,6 +681,7 @@ in rec { fullName = "Mongolian"; filename = "aspell6"; sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; + meta.license = lib.licenses.gpl2Only; }; mr = buildOfficialDict { @@ -629,6 +690,7 @@ in rec { fullName = "Marathi"; filename = "aspell6"; sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; + meta.license = lib.licenses.gpl2Only; }; ms = buildOfficialDict { @@ -637,6 +699,7 @@ in rec { fullName = "Malay"; filename = "aspell"; sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; + meta.license = lib.licenses.fdl12Only; }; mt = buildOfficialDict { @@ -645,6 +708,7 @@ in rec { fullName = "Maltese"; filename = "aspell"; sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; + meta.license = lib.licenses.lgpl21Only; }; nb = buildOfficialDict { @@ -653,6 +717,7 @@ in rec { fullName = "Norwegian Bokmal"; filename = "aspell"; sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; + meta.license = lib.licenses.gpl2Only; }; nds = buildOfficialDict { @@ -661,6 +726,7 @@ in rec { fullName = "Low Saxon"; filename = "aspell6"; sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; + meta.license = lib.licenses.lgpl21Only; }; nl = buildOfficialDict { @@ -673,6 +739,11 @@ in rec { postInstall = '' echo "add nl.rws" > $out/lib/aspell/nederlands.multi ''; + # from the Copyright file: + # > The nl-aspell package includes the GPL COPYRIGHT file but no explicit copyright + # > notice. Since he was using autoconf this could have been added automatically. + # wtf whatever + meta.license = lib.licenses.free; }; nn = buildOfficialDict { @@ -681,6 +752,7 @@ in rec { fullName = "Norwegian Nynorsk"; filename = "aspell"; sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; + meta.license = lib.licenses.gpl2Only; }; ny = buildOfficialDict { @@ -689,6 +761,7 @@ in rec { fullName = "Chichewa"; filename = "aspell5"; sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; + meta.license = lib.licenses.gpl2Only; }; or = buildOfficialDict { @@ -697,6 +770,7 @@ in rec { fullName = "Oriya"; filename = "aspell6"; sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; + meta.license = lib.licenses.gpl2Only; }; pa = buildOfficialDict { @@ -705,6 +779,7 @@ in rec { fullName = "Punjabi"; filename = "aspell6"; sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; + meta.license = lib.licenses.gpl2Only; }; pl = buildOfficialDict { @@ -713,6 +788,12 @@ in rec { fullName = "Polish"; filename = "aspell6"; sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; + meta.license = with lib.licenses; [ + gpl2Only + lgpl21Only + mpl11 + cc-sa-10 + ]; }; pt_BR = buildOfficialDict { @@ -721,6 +802,11 @@ in rec { fullName = "Brazilian Portuguese"; filename = "aspell6"; sha256 = "1xqlpk21s93c6blkdnpk7l62q9fxjvzdv2x86chl8p2x1gdrj3gb"; + meta.license = with lib.licenses; [ + lgpl21Only + lgpl21Plus + gpl3Plus + ]; }; pt_PT = buildOfficialDict { @@ -729,6 +815,11 @@ in rec { fullName = "Portuguese"; filename = "aspell6"; sha256 = "0ld0d0ily4jqifjfsxfv4shbicz6ymm2gk56fq9gbzra1j4qnw75"; + meta.license = with lib.licenses; [ + lgpl21Plus + gpl3Plus + mpl11 + ]; }; qu = buildOfficialDict { @@ -737,6 +828,7 @@ in rec { fullName = "Quechua"; filename = "aspell6"; sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; + meta.license = lib.licenses.gpl2Only; }; ro = buildOfficialDict { @@ -745,6 +837,7 @@ in rec { fullName = "Romanian"; filename = "aspell5"; sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; + meta.license = lib.licenses.gpl2Only; }; ru = buildOfficialDict { @@ -753,6 +846,7 @@ in rec { fullName = "Russian"; filename = "aspell6"; sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; + meta.license = lib.licenses.free; }; rw = buildOfficialDict { @@ -761,6 +855,7 @@ in rec { fullName = "Kinyarwanda"; filename = "aspell"; sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; + meta.license = lib.licenses.gpl2Only; }; sc = buildOfficialDict { @@ -769,6 +864,7 @@ in rec { fullName = "Sardinian"; filename = "aspell5"; sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; + meta.license = lib.licenses.gpl2Only; }; sk = buildOfficialDict { @@ -777,6 +873,11 @@ in rec { fullName = "Slovak"; filename = "aspell6"; sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; + meta.license = with lib.licenses; [ + lgpl21Only + gpl2Only + mpl11 + ]; }; sl = buildOfficialDict { @@ -785,6 +886,7 @@ in rec { fullName = "Slovenian"; filename = "aspell"; sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; + meta.license = lib.licenses.gpl2Only; }; sr = buildOfficialDict { @@ -793,6 +895,7 @@ in rec { fullName = "Serbian"; filename = "aspell6"; sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; + meta.license = lib.licenses.lgpl21Only; }; sv = buildOfficialDict { @@ -801,6 +904,7 @@ in rec { fullName = "Swedish"; filename = "aspell"; sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; + meta.license = lib.licenses.lgpl21Only; }; sw = buildOfficialDict { @@ -809,6 +913,7 @@ in rec { fullName = "Swahili"; filename = "aspell"; sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; + meta.license = lib.licenses.lgpl21Only; }; ta = buildOfficialDict { @@ -817,6 +922,7 @@ in rec { fullName = "Tamil"; filename = "aspell6"; sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; + meta.license = lib.licenses.gpl2Only; }; te = buildOfficialDict { @@ -825,6 +931,7 @@ in rec { fullName = "Telugu"; filename = "aspell6"; sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; + meta.license = lib.licenses.gpl2Only; }; tet = buildOfficialDict { @@ -833,6 +940,7 @@ in rec { fullName = "Tetum"; filename = "aspell5"; sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; + meta.license = lib.licenses.gpl2Only; }; tk = buildOfficialDict { @@ -841,6 +949,7 @@ in rec { fullName = "Turkmen"; filename = "aspell5"; sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; + meta.license = lib.licenses.gpl2Only; }; tl = buildOfficialDict { @@ -849,6 +958,7 @@ in rec { fullName = "Tagalog"; filename = "aspell5"; sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; + meta.license = lib.licenses.gpl2Only; }; tn = buildOfficialDict { @@ -857,6 +967,7 @@ in rec { fullName = "Setswana"; filename = "aspell5"; sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; + meta.license = lib.licenses.gpl2Only; }; tr = buildOfficialDict { @@ -865,6 +976,7 @@ in rec { fullName = "Turkish"; filename = "aspell"; sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; + meta.license = lib.licenses.gpl2Only; }; uk = buildOfficialDict { @@ -873,6 +985,10 @@ in rec { fullName = "Ukrainian"; filename = "aspell6"; sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; + meta.license = with lib.licenses; [ + lgpl2Plus + gpl2Plus + ]; }; uz = buildOfficialDict { @@ -881,6 +997,7 @@ in rec { fullName = "Uzbek"; filename = "aspell6"; sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; + meta.license = lib.licenses.gpl2Only; }; vi = buildOfficialDict { @@ -889,6 +1006,7 @@ in rec { fullName = "Vietnamese"; filename = "aspell6"; sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; + meta.license = lib.licenses.gpl2Only; }; wa = buildOfficialDict { @@ -897,6 +1015,7 @@ in rec { fullName = "Walloon"; filename = "aspell"; sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; + meta.license = lib.licenses.gpl2Only; }; yi = buildOfficialDict { @@ -905,6 +1024,7 @@ in rec { fullName = "Yiddish"; filename = "aspell6"; sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; + meta.license = lib.licenses.gpl2Only; }; zu = buildOfficialDict { @@ -913,6 +1033,7 @@ in rec { fullName = "Zulu"; filename = "aspell"; sha256 = "15k7gaxrnqnssdyk9l6g27dq317dqp9jz5yzafd25ri01g6mb8iz"; + meta.license = lib.licenses.lgpl21Only; }; ### Jargons @@ -937,6 +1058,7 @@ in rec { meta = { homepage = "https://mrsatterly.com/spelling.html"; + license = lib.licenses.wtfpl; # as a comment the source file }; }; @@ -945,13 +1067,13 @@ in rec { fullName = "English Scientific Jargon"; src1 = fetchurl { - url = "http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt"; - sha256 = "1nf4py2mg0mlv9s5a7had2wn29z2v6bcca0fs6rbpdn4nqc4s7dm"; + url = "https://web.archive.org/web/20180806094650if_/http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt"; + hash = "sha256-I5d/jf/5v9Nptu2H9qfvMBzSwJYoQOTEzJfQTxKoWN8="; }; src2 = fetchurl { - url = "http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt"; - sha256 = "0f88il1ds6qazy1ghxviqcwsywrbf6pzl2lmzf4f3qvhdfb6f1y0"; + url = "https://web.archive.org/web/20180131231829if_/http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt"; + hash = "sha256-oT4nUiev5q4QjHeuF8jNVBcyyHE9fdH9+uDMkZsOWp8="; }; langInputs = [ en ]; @@ -965,7 +1087,9 @@ in rec { installPhase = "aspell-install en_US-science en_GB-science"; meta = { - homepage = "http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/"; + homepage = "https://web.archive.org/web/20210425104207/http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/"; + # no license is given so we have to assume it is unfree + license = lib.licenses.unfree; }; }; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 8019c6cc943f1..87df1e7f6aec1 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.3.1"; + version = "5.4.1"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-/1A8n7oe9WsF3FpbLZxhifzrdj38t9l5Kc8Q5jfDoyY="; + hash = "sha256-F3aaEaHZyOLES6zOYqHRG0BtaKk9d/bAHCtal6FsIWc="; }; nativeBuildInputs = [ cmake ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]); meta = with lib; { - description = "A library to import various 3D model formats"; + description = "Library to import various 3D model formats"; mainProgram = "assimp"; homepage = "https://www.assimp.org/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 89f81e26de407..6702eb91c9b17 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; - dontAddWafCrossFlags = true; wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; postPatch = '' diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix index c189cd7e1ea4a..9dfc216a22695 100644 --- a/pkgs/development/libraries/audiality2/default.nix +++ b/pkgs/development/libraries/audiality2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A realtime scripted modular audio engine for video games and musical applications"; + description = "Realtime scripted modular audio engine for video games and musical applications"; mainProgram = "a2play"; homepage = "http://audiality.org"; license = licenses.zlib; diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix index 0f420745baef6..bf0c6108520c4 100644 --- a/pkgs/development/libraries/audio/game-music-emu/default.nix +++ b/pkgs/development/libraries/audio/game-music-emu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home"; - description = "A collection of video game music file emulators"; + description = "Collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = with maintainers; [ luc65r lheckemann ]; diff --git a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix index 8d5ef86a89671..50495d1633592 100644 --- a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A libmodplug emulation layer based on libopenmpt"; + description = "Libmodplug emulation layer based on libopenmpt"; homepage = "https://lib.openmpt.org/libopenmpt/"; license = licenses.bsd3; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index da288f145613e..0f4c3509244d8 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.6"; + version = "0.7.7"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-Fi1yowa7LhFMJPolJn0NCgrBbzn9laXA38daZm7l5PU="; + hash = "sha256-WMaiiXISaCim9ljghK7nqo+L/bdaC9DjRcf/Km2e8Iw="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index 6737d76538e0e..064a167bfb773 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; meta = with lib; { - description = "A C library for reading and writing Standard MIDI Files"; + description = "C library for reading and writing Standard MIDI Files"; homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index c17b27a7aa6ff..4e83452874624 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://drobilla.net/software/lilv"; - description = "A C library to make the use of LV2 plugins"; + description = "C library to make the use of LV2 plugins"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 473b246f3f9d1..d9952877d80de 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://lv2plug.in"; - description = "A plugin standard for audio systems"; + description = "Plugin standard for audio systems"; mainProgram = "lv2_validate"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index b1a6adaaeca2e..b340dafbc3158 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A set C++ wrappers around the LV2 C API"; + description = "Set C++ wrappers around the LV2 C API"; mainProgram = "ttl2c"; homepage = "https://lvtk.org/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index 01a3933fe2b3e..92024cd81fb8f 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; meta = with lib; { - description = "A C++ library of functions for DSP and Music Informatics purposes"; + description = "C++ library of functions for DSP and Music Informatics purposes"; homepage = "https://code.soundsoftware.ac.uk/projects/qm-dsp"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index c200d4ab79c52..cd8c3d3a70f3c 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = with lib; { - description = "A C++ utility library primarily aimed at audio/musical applications"; + description = "C++ utility library primarily aimed at audio/musical applications"; homepage = "http://drobilla.net/software/raul"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index cbb580413c2b0..4654e29a835fd 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -16,12 +16,14 @@ opensslSupport ? true, openssl, soxSupport ? true, - sox + sox, + libsndfileSupport ? true, + libsndfile }: stdenv.mkDerivation rec { pname = "roc-toolkit"; - version = "0.3.0"; + version = "0.4.0"; outputs = [ "out" "dev" ]; @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { owner = "roc-streaming"; repo = "roc-toolkit"; rev = "v${version}"; - hash = "sha256-tC0rjb3eDtEciUk0NmVye+N//Y/RFsi5d3kFS031y8I="; + hash = "sha256-53irDq803dTg0YqtC1SOXmYNGypSMAEK+9HJ65pR5PA="; }; nativeBuildInputs = [ @@ -46,7 +48,8 @@ stdenv.mkDerivation rec { ++ lib.optional libunwindSupport libunwind ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional opensslSupport openssl - ++ lib.optional soxSupport sox; + ++ lib.optional soxSupport sox + ++ lib.optional libsndfileSupport libsndfile; sconsFlags = [ "--build=${stdenv.buildPlatform.config}" @@ -56,6 +59,7 @@ stdenv.mkDerivation rec { lib.optional (!soxSupport) "--disable-sox" ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ + lib.optional (!libsndfileSupport) "--disable-sndfile" ++ (if (!openfecSupport) then ["--disable-openfec"] else [ "--with-libraries=${openfec}/lib" diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index 8084963f39fbb..8c1bc7356db13 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; + description = "Set of C++ classes that provide a cross platform API for realtime audio input/output"; homepage = "https://www.music.mcgill.ca/~gary/rtaudio/"; license = licenses.mit; maintainers = with maintainers; [ magnetophon ]; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 0780d2978805d..c881e45ae559e 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A set of C++ classes that provide a cross platform API for realtime MIDI input/output"; + description = "Set of C++ classes that provide a cross platform API for realtime MIDI input/output"; homepage = "https://www.music.mcgill.ca/~gary/rtmidi/"; license = licenses.mit; maintainers = with maintainers; [ magnetophon ]; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 26a55efd786a5..bd12fc9b4a324 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://drobilla.net/software/sratom"; - description = "A library for serialising LV2 atoms to/from RDF"; + description = "Library for serialising LV2 atoms to/from RDF"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 3dc3bb5dacdcf..6214b65189d37 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://drobilla.net/software/suil"; - description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; + description = "Lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index fc5162b34e8d4..64113993f1eaa 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The successor of clalsadrv, provides easy access to ALSA PCM devices"; + description = "Successor of clalsadrv, provides easy access to ALSA PCM devices"; version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = lib.licenses.gpl3; diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/development/libraries/audio/zix/default.nix index f6b6eceb4c04b..f2824fa793906 100644 --- a/pkgs/development/libraries/audio/zix/default.nix +++ b/pkgs/development/libraries/audio/zix/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A lightweight C99 portability and data structure library"; + description = "Lightweight C99 portability and data structure library"; homepage = "https://gitlab.com/drobilla/zix"; changelog = "https://gitlab.com/drobilla/zix/-/blob/${src.rev}/NEWS"; license = licenses.isc; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index d0d899fe9935f..d8735e0b9143d 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A C++ library which implements parts of the Avro Specification"; + description = "C++ library which implements parts of the Avro Specification"; mainProgram = "avrogencpp"; homepage = "https://avro.apache.org/"; license = lib.licenses.asl20; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 944182e141245..a62d0449b3855 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ jansson snappy xz zlib ]; meta = with lib; { - description = "A C library which implements parts of the Avro Specification"; + description = "C library which implements parts of the Avro Specification"; homepage = "https://avro.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ lblasc ]; diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index c15cbe8bde401..d07a7fc529964 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.7.18"; + version = "0.7.22"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - hash = "sha256-JWYJz8ugYvXDvtJ5dRWVcA8F3PdjxO8aCc8l0jghYXg="; + hash = "sha256-8+SFag3hRQ+1aOK2vuHOV/gXE1qUIlAW5LNJDmUORLs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 5f4c303265d94..6b88fa8aa47e4 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aws-c-cal"; - version = "0.6.12"; + version = "0.6.15"; src = fetchFromGitHub { owner = "awslabs"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-aegK01wYdOc6RGNVf/dZKn1HkqQr+yEblcu6hnlMZE4="; + hash = "sha256-RrUJz3IqwbBJ8NuJTIWqK33FlJHolcaid55PT2EhO24="; }; patches = [ diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 5cf9de861cdf4..6bb9fc493fe87 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.9.17"; + version = "0.9.21"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-Ee3wkgIOTsZn2PgHoaO5HqblXuOacuKm5vUwkl4Dg+4="; + hash = "sha256-lJCQPatwZeHpuzQni6SMMGYBH4iESQH8ofFgmRbxtnM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 4b22e53a317e4..ac35fd5d57b05 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - hash = "sha256-S5ETVkdGTndt2GJBNL4DU5SycHAufsmN06xBDRMFVKo="; + hash = "sha256-86auAZGoaYIpoTVlB9uC+nKMNt1QRNor+/68B5D36r8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 1bc0c731a9d73..a429003628459 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.14.7"; + version = "0.14.9"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-Z4o1vv/8FWp3S7GfLDsV0a8ih+IdJIUC0DL4klOXjnw="; + hash = "sha256-YrEpb4+yzrNci0/ZW+UsPlEmnCBkcRFDgo8SuxsTWXg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 895babbb4f727..65e84c3bcb84a 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.5.7"; + version = "0.5.10"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - hash = "sha256-zzsRYhLgJfd02fPgoZBf7n6dTfbLHarc1aQa0fx/uck="; + hash = "sha256-yQY5yZFRm/2K97ffyumAQhgPlU6Nzy8PDGcy9L53Y84="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 50ec9d64bbb17..ded3948907c25 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.11.318"; + version = "1.11.336"; src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; rev = version; - hash = "sha256-HQNtVCt8vemRVnz0v9TNjUpjYn/IlbgIOeDESt3iI4A="; + hash = "sha256-hetXtXM8HG6V3rAuyf+w+DtlxEcpsyaroZsw0nIJoAw="; }; postPatch = '' @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A C++ interface for Amazon Web Services"; + description = "C++ interface for Amazon Web Services"; homepage = "https://github.com/aws/aws-sdk-cpp"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/bashup-events/generic.nix b/pkgs/development/libraries/bashup-events/generic.nix index c3e2269a8a12b..eb54d79e6fadf 100644 --- a/pkgs/development/libraries/bashup-events/generic.nix +++ b/pkgs/development/libraries/bashup-events/generic.nix @@ -77,7 +77,7 @@ resholve.mkDerivation rec { meta = with lib; { inherit branch; - description = "An event listener/callback API for creating extensible bash programs"; + description = "Event listener/callback API for creating extensible bash programs"; mainProgram = "bashup.events"; homepage = "https://github.com/bashup/events"; license = licenses.cc0; diff --git a/pkgs/development/libraries/basu/default.nix b/pkgs/development/libraries/basu/default.nix index 4665c4c2d158b..a3bd836ee83fc 100644 --- a/pkgs/development/libraries/basu/default.nix +++ b/pkgs/development/libraries/basu/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sr.ht/~emersion/basu"; - description = "The sd-bus library, extracted from systemd"; + description = "Sd-bus library, extracted from systemd"; mainProgram = "basuctl"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ AndersonTorres ]; diff --git a/pkgs/development/libraries/bc-decaf/default.nix b/pkgs/development/libraries/bc-decaf/default.nix index c73f28e4e93ae..162eb8a4dd251 100644 --- a/pkgs/development/libraries/bc-decaf/default.nix +++ b/pkgs/development/libraries/bc-decaf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" "-DENABLE_STRICT=NO" ]; meta = with lib; { - description = "Elliptic curve library supporting Ed448-Goldilocks and Curve25519. Belledonne Communications' fork for Linphone."; + description = "Elliptic curve library supporting Ed448-Goldilocks and Curve25519. Belledonne Communications' fork for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; license = licenses.mit; maintainers = with maintainers; [ thibaultlemaire ]; diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix index b8dc2e1e1806d..7301f8c889ce9 100644 --- a/pkgs/development/libraries/bearssl/default.nix +++ b/pkgs/development/libraries/bearssl/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.bearssl.org/"; - description = "An implementation of the SSL/TLS protocol written in C"; + description = "Implementation of the SSL/TLS protocol written in C"; longDescription = '' BearSSL is an implementation of the SSL/TLS protocol (RFC 5246) written in C. It aims at offering the following features: diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 0b6cd66cae386..cb16a3fe0fd86 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "C++ library to manipulate VCard standard format. Part of the Linphone project."; + description = "C++ library to manipulate VCard standard format. Part of the Linphone project"; homepage = "https://gitlab.linphone.org/BC/public/belcard"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index b4b5629cdafb0..efc62bc9a5a1f 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; - description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project."; + description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers. Part of the Linphone project"; mainProgram = "belle_sip_tester"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 7296a9d952754..95517eabed26c 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_STATIC=NO" ]; meta = with lib; { - description = "Belledonne Communications' language recognition library. Part of the Linphone project."; + description = "Belledonne Communications' language recognition library. Part of the Linphone project"; homepage = "https://gitlab.linphone.org/BC/public/belr"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/bencode/default.nix b/pkgs/development/libraries/bencode/default.nix index 478f7306a59de..1dc68be26052a 100644 --- a/pkgs/development/libraries/bencode/default.nix +++ b/pkgs/development/libraries/bencode/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A header-only C++20 bencode serialization/deserialization library"; + description = "Header-only C++20 bencode serialization/deserialization library"; homepage = "https://github.com/fbdtemme/bencode"; changelog = "https://github.com/fbdtemme/bencode/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 74a938cf2a5c9..1ac53a0b9b8fd 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.crosswire.org/BibleSync"; - description = "A multicast protocol to Bible software shared conavigation"; + description = "Multicast protocol to Bible software shared conavigation"; longDescription = '' BibleSync is a multicast protocol to support Bible software shared co-navigation. It uses LAN multicast in either a personal/small team diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index 48865cf83564d..e5eb5b64aa9f0 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( finalAttrs: { pname = "blst"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "supranational"; repo = "blst"; rev = "v${finalAttrs.version}"; - hash = "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA="; + hash = "sha256-z/xnttMuAOfoKn/yCBwdYbgcd6cDLD6tZxInAWn8XIk="; }; buildPhase = '' diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/development/libraries/boca/default.nix index 50023491d3a08..f0a1f3bc6a775 100644 --- a/pkgs/development/libraries/boca/default.nix +++ b/pkgs/development/libraries/boca/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A component library used by the fre:ac audio converter"; + description = "Component library used by the fre:ac audio converter"; license = licenses.gpl2Plus; homepage = "https://github.com/enzo1982/boca"; maintainers = with maintainers; [ shamilton ]; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix deleted file mode 100644 index 551c1247949ea..0000000000000 --- a/pkgs/development/libraries/boost-process/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - pname = "boost-process"; - version = "0.5"; - - src = fetchurl { - url = "http://www.highscore.de/boost/process${version}/process.zip"; - sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831"; - }; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = '' - mkdir boost-process-$version - cd boost-process-$version - unzip $src - ''; - - installPhase = '' - mkdir -p $out/include - cp -r boost $out/include - ''; - - meta = with lib; { - homepage = "http://www.highscore.de/boost/process0.5/"; - description = "Library to manage system processes"; - license = licenses.boost; - platforms = platforms.unix; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix index ec77070c932c0..c8971119c9924 100644 --- a/pkgs/development/libraries/boost/1.75.nix +++ b/pkgs/development/libraries/boost/1.75.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.75.0"; diff --git a/pkgs/development/libraries/boost/1.77.nix b/pkgs/development/libraries/boost/1.77.nix index 3da1a455ead4b..72663044d9c93 100644 --- a/pkgs/development/libraries/boost/1.77.nix +++ b/pkgs/development/libraries/boost/1.77.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.77.0"; diff --git a/pkgs/development/libraries/boost/1.78.nix b/pkgs/development/libraries/boost/1.78.nix index 2cc818e63ce03..53a3f300a792b 100644 --- a/pkgs/development/libraries/boost/1.78.nix +++ b/pkgs/development/libraries/boost/1.78.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.78.0"; diff --git a/pkgs/development/libraries/boost/1.79.nix b/pkgs/development/libraries/boost/1.79.nix index 87975e2846d30..91e13edf2265a 100644 --- a/pkgs/development/libraries/boost/1.79.nix +++ b/pkgs/development/libraries/boost/1.79.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.79.0"; diff --git a/pkgs/development/libraries/boost/1.80.nix b/pkgs/development/libraries/boost/1.80.nix index 1aab51af78a74..79281cd1c70a0 100644 --- a/pkgs/development/libraries/boost/1.80.nix +++ b/pkgs/development/libraries/boost/1.80.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.80.0"; diff --git a/pkgs/development/libraries/boost/1.81.nix b/pkgs/development/libraries/boost/1.81.nix index 2376255303e29..3d8474f1df6ab 100644 --- a/pkgs/development/libraries/boost/1.81.nix +++ b/pkgs/development/libraries/boost/1.81.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.81.0"; diff --git a/pkgs/development/libraries/boost/1.82.nix b/pkgs/development/libraries/boost/1.82.nix index 193d07ef7562f..cf3a7fe3734c9 100644 --- a/pkgs/development/libraries/boost/1.82.nix +++ b/pkgs/development/libraries/boost/1.82.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.82.0"; diff --git a/pkgs/development/libraries/boost/1.83.nix b/pkgs/development/libraries/boost/1.83.nix index df5c5a5bbd31c..446c759d335f9 100644 --- a/pkgs/development/libraries/boost/1.83.nix +++ b/pkgs/development/libraries/boost/1.83.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.83.0"; diff --git a/pkgs/development/libraries/boost/1.84.nix b/pkgs/development/libraries/boost/1.84.nix index a55f55afaae0e..bfcfdfbfd7cfd 100644 --- a/pkgs/development/libraries/boost/1.84.nix +++ b/pkgs/development/libraries/boost/1.84.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.84.0"; diff --git a/pkgs/development/libraries/boost/1.85.nix b/pkgs/development/libraries/boost/1.85.nix index 2a3252d38c574..a95789800e1bd 100644 --- a/pkgs/development/libraries/boost/1.85.nix +++ b/pkgs/development/libraries/boost/1.85.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.85.0"; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 2dc3266291d36..dc0e1d304eea4 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { "-Wno-error=argument-outside-range -Wno-error=c++11-narrowing"; meta = with lib; { - description = "A professional free 3D Game Multiphysics Library"; + description = "Professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index ac8433fc77ac3..7d601e8570014 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { ]; meta = with lib; { - description = "A professional free 3D Game Multiphysics Library"; + description = "Professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 6cbe6fc1899da..966190a655675 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project."; + description = "Opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project"; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 87b86036cff28..32184e9c6d38e 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, writeTextDir +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook , withCMake ? true, cmake # sensitive downstream packages @@ -16,13 +16,14 @@ stdenv.mkDerivation rec { version = "1.27.0"; src = fetchurl { - url = "https://c-ares.org/download/${pname}-${version}.tar.gz"; + # Note: tag name varies in some versions, e.g. v1.30.0, c-ares-1_17_0. + url = "https://github.com/c-ares/${pname}/releases/download/cares-${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; hash = "sha256-CnK+ZpWZVcQ+KvL70DQY6Cor1UZGBOyaYhR+N6zrQgs="; }; outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = lib.optionals withCMake [ cmake ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++ lib.optionals withCMake [ cmake ]; cmakeFlags = [] ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DCARES_SHARED=OFF" @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A C library for asynchronous DNS requests"; + description = "C library for asynchronous DNS requests"; homepage = "https://c-ares.haxx.se"; changelog = "https://c-ares.org/changelog.html#${lib.replaceStrings [ "." ] [ "_" ] version}"; license = licenses.mit; diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix index 0ed22a2620eef..5c6c97ec015cc 100644 --- a/pkgs/development/libraries/c-blosc/1.nix +++ b/pkgs/development/libraries/c-blosc/1.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "A blocking, shuffling and loss-less compression library"; + description = "Blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}"; pkgConfigModules = [ diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix index b49518bead1bb..6b24b1418c9e8 100644 --- a/pkgs/development/libraries/c-blosc/2.nix +++ b/pkgs/development/libraries/c-blosc/2.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "A fast, compressed, persistent binary data store library for C"; + description = "Fast, compressed, persistent binary data store library for C"; homepage = "https://www.blosc.org"; changelog = "https://github.com/Blosc/c-blosc2/releases/tag/v${finalAttrs.version}"; pkgConfigModules = [ diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index ae7075cd80dfb..3879878e4779d 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = with lib; { - description = "An open source implementation of the actor model in C++"; + description = "Open source implementation of the actor model in C++"; homepage = "http://actor-framework.org/"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7408a43272e97..28809ade8ae4a 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3 +{ lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3 , docbook_xsl, fontconfig, freetype, libpng, pixman, zlib , x11Support? !stdenv.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib @@ -92,7 +92,7 @@ in { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "A 2D graphics library with support for multiple output devices"; + description = "2D graphics library with support for multiple output devices"; mainProgram = "cairo-trace"; longDescription = '' Cairo is a 2D graphics library with support for multiple output diff --git a/pkgs/development/libraries/calcium/default.nix b/pkgs/development/libraries/calcium/default.nix index f73ee91b4f77c..03e27e1fce152 100644 --- a/pkgs/development/libraries/calcium/default.nix +++ b/pkgs/development/libraries/calcium/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A C library for exact computation with real and complex numbers"; + description = "C library for exact computation with real and complex numbers"; homepage = "https://fredrikj.net/calcium/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ smasher164 ]; diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index c4d64a0f47878..e17bbbaf4b766 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = with lib; { - description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; + description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; maintainers = with maintainers; [ edwtjo knedlsepp ]; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 56b2016539be5..0f79f7679834d 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-H.." ]; meta = with lib; { - description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; + description = "Multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; homepage = "http://catch-lib.net"; license = licenses.boost; maintainers = with maintainers; [ edwtjo knedlsepp ]; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 3fdbbd23ecdc5..5fa86a9589d48 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "An implementation of the IETF real-time transport protocol (RTP)"; + description = "Implementation of the IETF real-time transport protocol (RTP)"; homepage = "https://www.gnu.org/software/ccrtp/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ marcweber ]; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 968f32a0af598..a170a0f92449e 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # Requested here: https://github.com/cddlib/cddlib/issues/25 doCheck = true; meta = with lib; { - description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron"; + description = "Implementation of the Double Description Method for generating all vertices of a convex polyhedron"; license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cereal/1.3.0.nix b/pkgs/development/libraries/cereal/1.3.0.nix index ab438eb6a8bf8..d15e06d8598c3 100644 --- a/pkgs/development/libraries/cereal/1.3.0.nix +++ b/pkgs/development/libraries/cereal/1.3.0.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://uscilab.github.io/cereal/"; - description = "A header-only C++11 serialization library"; + description = "Header-only C++11 serialization library"; changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ AndersonTorres ]; diff --git a/pkgs/development/libraries/cereal/1.3.2.nix b/pkgs/development/libraries/cereal/1.3.2.nix index 5a44b26426c79..a8aced27cb261 100644 --- a/pkgs/development/libraries/cereal/1.3.2.nix +++ b/pkgs/development/libraries/cereal/1.3.2.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake }: @@ -22,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://uscilab.github.io/cereal/"; - description = "A header-only C++11 serialization library"; + description = "Header-only C++11 serialization library"; changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ AndersonTorres ]; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 7052c98d8ef8f..da5afde02627a 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , blas , cmake diff --git a/pkgs/development/libraries/cgreen/default.nix b/pkgs/development/libraries/cgreen/default.nix index 921eb6c797247..c6394a456efd9 100644 --- a/pkgs/development/libraries/cgreen/default.nix +++ b/pkgs/development/libraries/cgreen/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/cgreen-devs/cgreen"; - description = "The Modern Unit Test and Mocking Framework for C and C++"; + description = "Modern Unit Test and Mocking Framework for C and C++"; mainProgram = "cgreen-runner"; license = lib.licenses.isc; maintainers = [ lib.maintainers.AndersonTorres ]; diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index 1bc85d1fcd812..6c536ec576714 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "SYSTEM_DIR=$(out)" ]; meta = with lib; { - description = "A multiplatform basic GUI library"; + description = "Multiplatform basic GUI library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.free; diff --git a/pkgs/development/libraries/charls/default.nix b/pkgs/development/libraries/charls/default.nix index 150806c8c77e7..f8591dc92bca5 100644 --- a/pkgs/development/libraries/charls/default.nix +++ b/pkgs/development/libraries/charls/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/team-charls/charls"; - description = "A JPEG-LS library implementation in C++"; + description = "JPEG-LS library implementation in C++"; maintainers = with maintainers; [ bcdarwin ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 599cf9cfcee20..1cb32dc8ee4b6 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A fast and lightweight 2D game physics library"; + description = "Fast and lightweight 2D game physics library"; mainProgram = "chipmunk_demos"; homepage = "http://chipmunk2d.net/"; license = licenses.mit; diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index bc609d7bbf17d..df65e78ff51fa 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.jedrea.com/chmlib"; license = licenses.lgpl2; - description = "A library for dealing with Microsoft ITSS/CHM format files"; + description = "Library for dealing with Microsoft ITSS/CHM format files"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/cista/default.nix b/pkgs/development/libraries/cista/default.nix index e2f302b5812b3..7bc5590feddb2 100644 --- a/pkgs/development/libraries/cista/default.nix +++ b/pkgs/development/libraries/cista/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://cista.rocks"; - description = "A simple, high-performance, zero-copy C++ serialization & reflection library"; + description = "Simple, high-performance, zero-copy C++ serialization & reflection library"; license = licenses.mit; maintainers = [ maintainers.sigmanificient ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix index 7dfc2e0844687..ee9ee04aa62fd 100644 --- a/pkgs/development/libraries/clanlib/default.nix +++ b/pkgs/development/libraries/clanlib/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sphair/ClanLib"; - description = "A cross platform toolkit library with a primary focus on game creation"; + description = "Cross platform toolkit library with a primary focus on game creation"; license = licenses.mit; maintainers = with maintainers; [ nixinator ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/clap/default.nix b/pkgs/development/libraries/clap/default.nix index e6c017cb7808f..1fc6d5a2d4207 100644 --- a/pkgs/development/libraries/clap/default.nix +++ b/pkgs/development/libraries/clap/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clap"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-BNT2yWIlWk8kzhZteh7TaamliwJI+lzWVs/8XCFsuUc="; + hash = "sha256-3VDl6hMSRFrMtYeiUMoZhJf0wkMxVs9ZELKJqLGYJ+g="; }; postPatch = '' diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 6fef10fe5d24e..bbe342d98198b 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cs.wisc.edu/condor/classad/"; - description = "The Classified Advertisements library provides a generic means for matching resources"; + description = "Classified Advertisements library provides a generic means for matching resources"; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix index 929bf90d9c48a..8dc649b6b5fe5 100644 --- a/pkgs/development/libraries/clipper/default.nix +++ b/pkgs/development/libraries/clipper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja unzip ]; meta = with lib; { - description = "A polygon and line clipping and offsetting library (C++, C#, Delphi)"; + description = "Polygon and line clipping and offsetting library (C++, C#, Delphi)"; longDescription = '' The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or, and line & polygon offsetting. The library is based on Vatti's clipping algorithm. diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 6c88d1baebfa8..9a7ea037785bf 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, cmake }: +{ fetchurl, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "cmocka"; diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index b0743e032c6ea..580cd488c9fd2 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent curl spdlog ]; meta = with lib; { - description = "A simple async wrapper around CURL for C++"; + description = "Simple async wrapper around CURL for C++"; homepage = "https://nheko.im/nheko-reborn/coeurl"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 987d90e269955..b233113e951fd 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , libGL , glib @@ -105,7 +104,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A small open source library for using 3D graphics hardware for rendering"; + description = "Small open source library for using 3D graphics hardware for rendering"; maintainers = with maintainers; [ lovek323 ]; longDescription = '' diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix index ab97ac09a57ec..95de887242bf5 100644 --- a/pkgs/development/libraries/comedilib/default.nix +++ b/pkgs/development/libraries/comedilib/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "man" "doc" ]; meta = with lib; { - description = "The Linux Control and Measurement Device Interface Library"; + description = "Linux Control and Measurement Device Interface Library"; homepage = "https://github.com/Linux-Comedi/comedilib"; license = licenses.lgpl21; maintainers = [ maintainers.doronbehar ]; diff --git a/pkgs/development/libraries/console-bridge/default.nix b/pkgs/development/libraries/console-bridge/default.nix index 5c85bbd4a1968..f02ac839a3e02 100644 --- a/pkgs/development/libraries/console-bridge/default.nix +++ b/pkgs/development/libraries/console-bridge/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake validatePkgConfig ]; meta = with lib; { - description = "A ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages"; + description = "ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages"; homepage = "https://github.com/ros/console_bridge"; license = licenses.bsd3; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index fa4fd5fe6d5c3..0b34bd05c7dc5 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; - description = "A C++ port of the Typesafe Config library"; + description = "C++ port of the Typesafe Config library"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 9a240d084f926..bc738ae976c99 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.8"; + version = "5.24.9"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Bo7XYArkJOK/dsX+K+xadz8SCh736ZMaB29jX4X+RGw="; + sha256 = "sha256-L0F9CkA/yWl7YfJtSBvSGSLTh2g7loIlpZMiC/ACU2k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index 4c0badf3df7ce..44c615b38abcf 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/cracklib/cracklib"; - description = "A library for checking the strength of passwords"; + description = "Library for checking the strength of passwords"; license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/development/libraries/croaring/default.nix index 5c1afcbf13658..88643c00195ae 100644 --- a/pkgs/development/libraries/croaring/default.nix +++ b/pkgs/development/libraries/croaring/default.nix @@ -1,28 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "croaring"; - version = "0.2.61"; + version = "2.0.3"; src = fetchFromGitHub { owner = "RoaringBitmap"; repo = "CRoaring"; rev = "v${version}"; - sha256 = "14y8iwv6b6gg7hgs00yqg8rwx4vwbb1zs2s99lxa51zx9vp1alcn"; + hash = "sha256-WaFyJ/6zstJ05e3vfrwhaZKQsjRAEvVTs688Hw0fr94="; }; - patches = fetchpatch { - url = "https://github.com/RoaringBitmap/CRoaring/commit/8d8c60736f506b2b8f1c365148a8a541b26a55f2.patch"; - sha256 = "1y2mbn4i8lj3lkn5s8zziyr9pl1fq9hndzz9c01dkv3s8sn7f55s"; - }; + # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor + # overridden CMAKE_INSTALL_FULL_*DIRs. With Nix, they are guaranteed + # to be absolute so the following patch suffices (see #144170). + patches = [ ./fix-pkg-config.patch ]; nativeBuildInputs = [ cmake ]; + doCheck = true; + + preConfigure = '' + mkdir -p dependencies/.cache + ln -s ${fetchFromGitHub { + owner = "clibs"; + repo = "cmocka"; + rev = "f5e2cd7"; + hash = "sha256-Oq0nFsZhl8IF7kQN/LgUq8VBy+P7gO98ep/siy5A7Js="; + }} dependencies/.cache/cmocka + ''; + meta = with lib; { description = "Compressed bitset library for C and C++"; - homepage = "http://roaringbitmap.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ orivej ]; + homepage = "https://roaringbitmap.org/"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.orivej ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/croaring/fix-pkg-config.patch b/pkgs/development/libraries/croaring/fix-pkg-config.patch new file mode 100644 index 0000000000000..f5cfcf308cf8b --- /dev/null +++ b/pkgs/development/libraries/croaring/fix-pkg-config.patch @@ -0,0 +1,14 @@ +diff --git a/roaring.pc.in b/roaring.pc.in +index e3b2391..c29adc3 100644 +--- a/roaring.pc.in ++++ b/roaring.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: roaring + Description: Roaring bitmap implementation in C diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index efba136122988..394efd6317d80 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , example-robot-data , pinocchio @@ -11,14 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "crocoddyl"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "loco-3d"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-MsAXHfxLNlIK/PbtVTjvBN1Jk3dyGEkfpj3/98nExj4="; + hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w="; }; strictDeps = true; @@ -51,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pythonImportsCheck = [ "crocoddyl" ]; - checkInputs = lib.optionals (pythonSupport) [ + checkInputs = lib.optionals pythonSupport [ python3Packages.scipy ]; diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 5030a185886de..741e9677f7102 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { installFlags = [ "LDCONF=true" ]; meta = with lib; { - description = "A free C++ class library of cryptographic schemes"; + description = "Free C++ class library of cryptographic schemes"; homepage = "https://cryptopp.com/"; changelog = [ "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt" diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 5aac0850a74d2..2d3b07e5e01f2 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with lib; { - description = "A high performance templating engine"; + description = "High performance templating engine"; homepage = "https://ctpp.havoc.ru/"; maintainers = [ maintainers.robbinch ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index 908ed390dba4f..c640d5f700e26 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-p9zpmfs1V92a+3Mxgi5eLKuCUN+26FAL4SjySZzPOW8="; + hash = "sha256-ApmGto9RzT8t49bsZVwk8aQnIau9sQyFvt9qnWKUGAE="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/development/libraries/ctypes_sh/default.nix index c06eff11aad0d..56b463087f3d3 100644 --- a/pkgs/development/libraries/ctypes_sh/default.nix +++ b/pkgs/development/libraries/ctypes_sh/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libffi elfutils libdwarf ]; meta = with lib; { - description = "A foreign function interface for bash"; + description = "Foreign function interface for bash"; mainProgram = "ctypes.sh"; homepage = "https://github.com/taviso/ctypes.sh"; license = licenses.mit; diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index da1eecdabab3f..96d560b187855 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A cross-platform AV1 decoder focused on speed and correctness"; + description = "Cross-platform AV1 decoder focused on speed and correctness"; longDescription = '' The goal of this project is to provide a decoder for most platforms, and achieve the highest speed possible to overcome the temporary lack of AV1 diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index b6dcf908c4f92..f50b53d47e05c 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { "--with-berkeleydb=${db62.out}" "--with-xerces=${xercesc}" "--with-xqilla=${xqilla}" + # code uses register storage specifier + "CXXFLAGS=-std=c++14" ]; preConfigure = '' diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 4bece9069466c..14d8247f0a201 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; + description = "Library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; mainProgram = "dee-tool"; homepage = "https://launchpad.net/dee"; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/directx-headers/default.nix b/pkgs/development/libraries/directx-headers/default.nix index b15a6baa7cab5..061d18d15016a 100644 --- a/pkgs/development/libraries/directx-headers/default.nix +++ b/pkgs/development/libraries/directx-headers/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "directx-headers"; - version = "1.611.0"; + version = "1.614.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "DirectX-Headers"; rev = "v${version}"; - hash = "sha256-HG2Zj8hvsgv8oeSDp1eK+1A5bvFL6oQIh5mMFWOFsvk="; + hash = "sha256-0LaN9D3cKVacMJhZCe9oxDPHpd1jdCAV0ImG2rSgnxc="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index a6983decf33f5..4cdd66ba9cfef 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A D-Bus API for the dLeyna services"; + description = "D-Bus API for the dLeyna services"; homepage = "https://github.com/phako/dleyna-connector-dbus"; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 2f019977c89d4..c9bbae74611e2 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { gupnp ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + ]); + meta = with lib; { description = "Library of utility functions that are used by the higher level dLeyna"; homepage = "https://github.com/phako/dleyna-core"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e433ec46a3024..e7915ad652144 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -11,6 +11,7 @@ , config , guiSupport ? false , libX11 +, enableShared ? !stdenv.hostPlatform.isStatic # dlib has a build system that forces the user to choose between either shared or static libraries. See https://github.com/davisking/dlib/issues/923#issuecomment-2175865174 , sse4Support ? stdenv.hostPlatform.sse4_1Support , avxSupport ? stdenv.hostPlatform.avxSupport , cudaSupport ? config.cudaSupport @@ -18,13 +19,13 @@ }@inputs: (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { pname = "dlib"; - version = "19.24.2"; + version = "19.24.4"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev = "v${version}"; - sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk="; + sha256 = "sha256-1A/9u+ThtUtmmSwnFSn8S65Yavucl2X+o3bNYgew0Oc="; }; postPatch = '' @@ -32,6 +33,7 @@ ''; cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support) (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport) (lib.cmakeBool "DLIB_USE_CUDA" cudaSupport) @@ -81,7 +83,7 @@ }; meta = with lib; { - description = "A general purpose cross-platform C++ machine learning library"; + description = "General purpose cross-platform C++ machine learning library"; homepage = "http://www.dlib.net"; license = licenses.boost; maintainers = with maintainers; [ christopherpoole ]; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 642cfa3052f71..1acddbbd12ec6 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/doctest/doctest"; - description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; + description = "Fastest feature-rich C++11/14/17/20 single-header testing framework"; platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 27aee8e92cd74..389ce72a68467 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = with lib; { - description = "A configuration parser library"; + description = "Configuration parser library"; maintainers = with maintainers; [ pSub ]; homepage = "https://github.com/williamh/dotconf"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 2cdc6cfafb366..1710d6046e338 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib, fetchpatch +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib # optional but of negligible size , openssl, brotli, c-ares # optional databases diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 322c689ba11a7..b3dad8e2018bc 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A plugin SDK for virtual instruments"; + description = "Plugin SDK for virtual instruments"; maintainers = with maintainers; [ raskin diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 343574f251a8b..c222b117fff94 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, substituteAll , cmake , ninja , openssl diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/development/libraries/duckdb/versions.json index de679be88599a..8ae8b4bc57d2c 100644 --- a/pkgs/development/libraries/duckdb/versions.json +++ b/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "0.10.2", - "rev": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", - "hash": "sha256-CTZ90KJvLPQqu1FYciEWsxJbvybCjeBsi/12bkfVd9Q=" + "version": "1.0.0", + "rev": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", + "hash": "sha256-bzFxWv8+Ac8vZLd2OWJyu4T0/0dc7wykdOORMpx92Ic=" } diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index e8b58762f9208..1597375cf7694 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.34.1"; + version = "2.35.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-+bhoASLjzOwm5u0kqB8bxQ7Z8iMrQx4F5XNniqxNlzQ="; + hash = "sha256-FoiPtmebHiQfULafMArFASSjGSNCri6pA9diG2ZOeeo="; }; postPatch = '' diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix index 0690f0f12ebdf..97406f81c47ae 100644 --- a/pkgs/development/libraries/edencommon/default.nix +++ b/pkgs/development/libraries/edencommon/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A shared library for Meta's source control filesystem tools (EdenFS and Watchman)"; + description = "Shared library for Meta's source control filesystem tools (EdenFS and Watchman)"; homepage = "https://github.com/facebookexperimental/edencommon"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 4f891a24f1f0a..3571554559c78 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = [ (lib.enableFeature true "sigstop") ]; + nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" "man" "doc" ]; @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://troglobit.com/projects/editline/"; - description = "A readline() replacement for UNIX without termcap (ncurses)"; + description = "Readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; maintainers = with maintainers; [ dtzWill oxalica ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index f84b44007e299..7291ff8f8e9d3 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , eglexternalplatform , pkg-config , meson @@ -57,7 +56,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "The EGLStream-based Wayland external platform"; + description = "EGLStream-based Wayland external platform"; homepage = "https://github.com/NVIDIA/egl-wayland/"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/libraries/eglexternalplatform/default.nix b/pkgs/development/libraries/eglexternalplatform/default.nix index 2845faa9d0884..50e2763722740 100644 --- a/pkgs/development/libraries/eglexternalplatform/default.nix +++ b/pkgs/development/libraries/eglexternalplatform/default.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "The EGL External Platform interface"; + description = "EGL External Platform interface"; homepage = "https://github.com/NVIDIA/eglexternalplatform"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix index 72166bb38ce99..4953251d4af6d 100644 --- a/pkgs/development/libraries/elf-header/default.nix +++ b/pkgs/development/libraries/elf-header/default.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation { meta = libc.meta // { outputsToInstall = [ "out" ]; - description = "The datastructures of ELF according to the target platform's libc"; + description = "Datastructures of ELF according to the target platform's libc"; longDescription = '' The Executable and Linkable Format (ELF, formerly named Extensible Linking Format), is usually defined in a header like this. diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 53aec96fe705b..cb57f5a2f07e0 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "enet"; - version = "1.3.17"; + version = "1.3.18"; src = fetchurl { url = "http://enet.bespin.org/download/${pname}-${version}.tar.gz"; - sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3"; + sha256 = "sha256-KooMU2DWi7T80R8uTEfGmXbo0shbEJ3X1gsRgaT4XTY="; }; meta = { diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 8649757b6edae..ae2e8f0263d4e 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/skypjack/entt"; - description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++"; + description = "Header-only, tiny and easy to use library for game programming and much more written in modern C++"; maintainers = with maintainers; [ twey ]; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/epoll-shim/default.nix b/pkgs/development/libraries/epoll-shim/default.nix deleted file mode 100644 index d303f814b2718..0000000000000 --- a/pkgs/development/libraries/epoll-shim/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "epoll-shim"; - version = "0.0.20230411"; - - src = fetchFromGitHub { - owner = "jiixyj"; - repo = finalAttrs.pname; - rev = "v${finalAttrs.version}"; - hash = "sha256-TOfybtUEp+EtY2l/UGwVFIESDe9kELJCZHlcz22Cmi8="; - }; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_PKGCONFIGDIR=${placeholder "out"}/lib/pkgconfig" - "-DBUILD_TESTING=${lib.boolToString finalAttrs.finalPackage.doCheck}" - ]; - - # https://github.com/jiixyj/epoll-shim/issues/41 - # https://github.com/jiixyj/epoll-shim/pull/34 - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Small epoll implementation using kqueue"; - homepage = "https://github.com/jiixyj/epoll-shim"; - license = licenses.mit; - platforms = platforms.darwin ++ platforms.freebsd ++ platforms.netbsd ++ platforms.openbsd; - maintainers = with maintainers; [ wegank ]; - }; -}) diff --git a/pkgs/development/libraries/example-robot-data/default.nix b/pkgs/development/libraries/example-robot-data/default.nix index b2e665bbc4a92..67e1de59891d0 100644 --- a/pkgs/development/libraries/example-robot-data/default.nix +++ b/pkgs/development/libraries/example-robot-data/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pythonSupport ? false , python3Packages @@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + patches = [ + # Temporary patch for pinocchio v3.0.0 compatibility. + # Should be removed on next example-robot-data release + (fetchpatch { + name = "pin3.patch"; + url = "https://github.com/Gepetto/example-robot-data/pull/217/commits/a605ceec857005cde153ec5895e227205eb7a5c3.patch"; + hash = "sha256-cvAWFytrU2XVggo/nCg8cuLcaZBTACXg6LxjL/6YMPs="; + }) + ]; + nativeBuildInputs = [ cmake ]; @@ -42,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "Set of robot URDFs for benchmarking and developed examples."; + description = "Set of robot URDFs for benchmarking and developed examples"; homepage = "https://github.com/Gepetto/example-robot-data"; license = licenses.bsd3; maintainers = with maintainers; [ nim65s wegank ]; diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index e79bc61698025..96d8d1db7a9ac 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; + description = "Implementation of XMP (Adobe's Extensible Metadata Platform)"; mainProgram = "exempi"; homepage = "https://libopenraw.freedesktop.org/exempi/"; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 0ef833b8aa234..b32bffb2b575f 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doxygen , gettext @@ -97,7 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://exiv2.org"; - description = "A library and command-line utility to manage image metadata"; + description = "Library and command-line utility to manage image metadata"; mainProgram = "exiv2"; platforms = platforms.all; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 9944277e946b6..bb97ca8728e0b 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, updateAutotoolsGnuConfigScriptsHook # for passthru.tests , python3 , perlPackages @@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { }; strictDeps = true; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; @@ -67,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { changelog = "https://github.com/libexpat/libexpat/blob/${tag}/expat/Changes"; homepage = "https://libexpat.github.io/"; - description = "A stream-oriented XML parser library written in C"; + description = "Stream-oriented XML parser library written in C"; mainProgram = "xmlwf"; platforms = platforms.all; license = licenses.mit; # expat version diff --git a/pkgs/development/libraries/expected-lite/default.nix b/pkgs/development/libraries/expected-lite/default.nix index 5b5fc620795c7..a0d5d1a509b9b 100644 --- a/pkgs/development/libraries/expected-lite/default.nix +++ b/pkgs/development/libraries/expected-lite/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "expected-lite"; - version = "0.6.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "martinmoene"; repo = "expected-lite"; rev = "v${version}"; - hash = "sha256-Qvu/YmkivfXVGM4ZPLVt3XmOEnKWcmHpbb9xJyC2qDQ="; + hash = "sha256-8Lf+R7wC7f2YliXqhR6pwVVSLZ6qheu7YOV5jHc0Cjc="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/development/libraries/exprtk/default.nix index 8dc4f7598abd6..1d917f6de6ed1 100644 --- a/pkgs/development/libraries/exprtk/default.nix +++ b/pkgs/development/libraries/exprtk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The C++ Mathematical Expression Toolkit Library"; + description = "C++ Mathematical Expression Toolkit Library"; homepage = "https://www.partow.net/programming/exprtk/index.html"; license = licenses.mit; maintainers = with maintainers; [ anselmschueler ]; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 12179dd7e2a8e..c4b236786057d 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An open source MPEG-4 and MPEG-2 AAC decoder"; + description = "Open source MPEG-4 and MPEG-2 AAC decoder"; homepage = "https://sourceforge.net/projects/faac/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix index 5a81e3f727463..a30aacee26e5d 100644 --- a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix +++ b/pkgs/development/libraries/fast-cpp-csv-parser/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files"; + description = "Small, easy-to-use and fast header-only library for reading comma separated value (CSV) files"; homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser"; license = licenses.bsd3; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 8cf571e2c9316..1e8791f10419b 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A fast json library for C"; + description = "Fast json library for C"; homepage = "https://github.com/rsyslog/libfastjson"; license = licenses.mit; maintainers = with maintainers; [ nequissimus ]; diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix index 723edd6f29d40..226d4d1a9e11a 100644 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; + description = "Fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; homepage = "https://github.com/ctz/fastpbkdf2"; license = licenses.cc0; maintainers = with maintainers; [ ledif ]; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 743ef904dcdf9..41775b0a9a538 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 = "24.05"; + version = "24.06"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-YL5JT/1JTfeKaLUEMnud6OOMk/NSCnBjohk+6qRaU60="; + sha256 = "sha256-na2aTcxrS8vHTw80zCAefY8zEQ9EMD/iTQp9l4wkIrI="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index 6c50819ef1468..059e666027a01 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "a base Thrift service and a common set of functionality for querying stats, options, and other information from a service"; + description = "Base Thrift service and a common set of functionality for querying stats, options, and other information from a service"; homepage = "https://github.com/facebook/fb303"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/development/libraries/fbjni/default.nix index 20d47cac1fa31..cb0d766a90da5 100644 --- a/pkgs/development/libraries/fbjni/default.nix +++ b/pkgs/development/libraries/fbjni/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A library designed to simplify the usage of the Java Native Interface"; + description = "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/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 5c7f0c44f91c9..d59fac5ff4dc9 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "fcgi"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s . $out/include/fastcgi"; meta = with lib; { - description = "A language independent, scalable, open extension to CG"; + description = "Language independent, scalable, open extension to CG"; homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ license = "FastCGI see LICENSE.TERMS"; mainProgram = "cgi-fcgi"; diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix index 4e13a3f7113f3..0c6790db9f702 100644 --- a/pkgs/development/libraries/fcl/default.nix +++ b/pkgs/development/libraries/fcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, eigen, libccd, octomap }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, libccd, octomap }: stdenv.mkDerivation rec { pname = "fcl"; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 0b07b5704916e..8f8611ccf6a11 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional exampleSupport "--enable-example"; meta = with lib; { - description = "A high-quality implementation of the AAC codec from Android"; + description = "High-quality implementation of the AAC codec from Android"; homepage = "https://sourceforge.net/projects/opencore-amr/"; license = licenses.fraunhofer-fdk; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 6da6713a7f79b..5bd9171275bee 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -32,8 +32,8 @@ let }; v7 = { - version = "7.0"; - hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + version = "7.0.1"; + hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA="; }; in diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 55f6709c1361c..7496cb4de0e76 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -465,7 +465,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q="; } ]) - ++ (lib.optionals (lib.versionAtLeast version "7.0") [ + ++ (lib.optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [ { # Will likely be obsolete in >7.0 name = "fate_avoid_dependency_on_samples"; @@ -850,7 +850,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "A complete, cross-platform solution to record, convert and stream audio and video"; + description = "Complete, cross-platform solution to record, convert and stream audio and video"; homepage = "https://www.ffmpeg.org/"; changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; longDescription = '' diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index c1c9fe960e7d3..10e9b70d42ede 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A lightweight video thumbnailer"; + description = "Lightweight video thumbnailer"; longDescription = "FFmpegthumbnailer is a lightweight video thumbnailer that can be used by file managers to create thumbnails for your video files. The thumbnailer uses ffmpeg to decode frames diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 370b4267bdb45..1afdd23923ddf 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -3,19 +3,19 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, ffmpeg_4 +, ffmpeg , zlib }: stdenv.mkDerivation rec { pname = "ffms"; - version = "2.40"; + version = "5.0"; src = fetchFromGitHub { owner = "FFMS"; repo = "ffms2"; rev = version; - sha256 = "sha256-3bPxt911T0bGpAIS2RxBjo+VV84xW06eKcCj3ZAcmvw="; + sha256 = "sha256-Ildl8hbKSFGh4MUBK+k8uYMDrOZD9NSMdPAWIIaGy4E="; }; env.NIX_CFLAGS_COMPILE = "-fPIC"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - ffmpeg_4 + ffmpeg zlib ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/FFMS/ffms2/"; + homepage = "https://github.com/FFMS/ffms2"; description = "FFmpeg based source library for easy frame accurate access"; mainProgram = "ffmsindex"; license = licenses.mit; diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 59ab572762ee4..8573c862726e6 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with lib; { - description = "A small, fast run-time speech synthesis engine"; + description = "Small, fast run-time speech synthesis engine"; homepage = "http://www.festvox.org/flite/"; license = licenses.bsdOriginal; maintainers = with maintainers; [ getchoo ]; diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix index 426a85e6a220a..d17cc9bd2ae5d 100644 --- a/pkgs/development/libraries/fltk/common.nix +++ b/pkgs/development/libraries/fltk/common.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A C++ cross-platform lightweight GUI library"; + description = "C++ cross-platform lightweight GUI library"; homepage = "https://www.fltk.org"; platforms = platforms.unix; # LGPL2 with static linking exception diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 4dd6d86fdaeb4..9ce329df79573 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub, fetchpatch +, fetchFromGitHub , cmake , enableShared ? !stdenv.hostPlatform.isStatic diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 0f40be439a3ab..8a44cd09dac94 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -90,12 +90,10 @@ stdenv.mkDerivation (finalAttrs: { # occur inconsistently doCheck = false; - # Prevents e-d-s add-contacts-stress-test from timing out - checkPhase = '' - runHook preCheck - meson test --timeout-multiplier 4 - runHook postCheck - ''; + mesonCheckFlags = [ + # Prevents e-d-s add-contacts-stress-test from timing out + "--timeout-multiplier" "4" + ]; postPatch = lib.optionalString telepathySupport '' patchShebangs tests/tools/manager-file.py @@ -109,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library that aggregates people from multiple sources to create metacontacts"; + description = "Library that aggregates people from multiple sources to create metacontacts"; homepage = "https://gitlab.gnome.org/GNOME/folks"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 9dd6bbeaa55e4..171b81af8365d 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An open-source C++ library developed and used at Facebook"; + description = "Open-source C++ library developed and used at Facebook"; homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 669c2dec851ca..569c2716f0e53 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library for font customization and configuration"; + description = "Library for font customization and configuration"; homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix index d9996ada50675..051038c747875 100644 --- a/pkgs/development/libraries/forge/default.nix +++ b/pkgs/development/libraries/forge/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend"; + description = "OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend"; longDescription = '' An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend. The goal of Forge is to provide high performance OpenGL visualizations for C/C++ applications that use CUDA/OpenCL. diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 49526b99c53b9..2715e2c80ca43 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , libpng , libjpeg , libtiff diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index b5b86cbe48a03..0ab874fd76dd2 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { broken = stdenv.isDarwin; branch = "1.6"; - description = "A C++ based class library for building Graphical User Interfaces"; + description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' FOX stands for Free Objects for X. It is a C++ based class library for building Graphical User Interfaces. diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index bc6d6a583ea00..d6c38b555dd6e 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.4.11"; + version = "1.4.17"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-Vn986RPyIhkd2n4cIh1eJyo4cVL+9srL2Xdn/qaLYT4="; + hash = "sha256-P3CoRV6zopAtQDmtkbk0o0jKHu4jpKkqPeCCSQWn0aI="; }; buildInputs = [ diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 1a8009f04ce7b..8ff0005d0ff07 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A font rendering engine"; + description = "Font rendering engine"; mainProgram = "freetype-config"; longDescription = '' FreeType is a portable and efficient library for rendering fonts. It diff --git a/pkgs/development/libraries/freexl/default.nix b/pkgs/development/libraries/freexl/default.nix index ac5609425b56b..74d4a646b074b 100644 --- a/pkgs/development/libraries/freexl/default.nix +++ b/pkgs/development/libraries/freexl/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A library to extract valid data from within an Excel (.xls) spreadsheet"; + description = "Library to extract valid data from within an Excel (.xls) spreadsheet"; homepage = "https://www.gaia-gis.it/fossil/freexl"; # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; diff --git a/pkgs/development/libraries/fuzzylite/default.nix b/pkgs/development/libraries/fuzzylite/default.nix index 1fd6d6506c288..82f11abe88e63 100644 --- a/pkgs/development/libraries/fuzzylite/default.nix +++ b/pkgs/development/libraries/fuzzylite/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , useFloat ? false @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A fuzzy logic control library in C++"; + description = "Fuzzy logic control library in C++"; mainProgram = "fuzzylite"; homepage = "https://fuzzylite.com"; changelog = "https://github.com/fuzzylite/fuzzylite/${src.rev}/release/CHANGELOG"; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index cc4339da982aa..7ff0c207060c0 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A General Framework for Graph Optimization"; + description = "General Framework for Graph Optimization"; homepage = "https://github.com/RainerKuemmerle/g2o"; license = with licenses; [ bsd3 lgpl3 gpl3 ]; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index a2d6078024d58..e2d32fd645278 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix) ++ lib.optional stdenv.cc.isClang ./returnval.patch @@ -37,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://people.gnome.org/~veillard/gamin/"; - description = "A file and directory monitoring system"; + description = "File and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 32318e1fc0fce..1e4b8436e8228 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = with lib; { - description = "An interactive Gtk canvas widget for graph-based interfaces"; + description = "Interactive Gtk canvas widget for graph-based interfaces"; mainProgram = "ganv_bench"; homepage = "http://drobilla.net"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index 7292b34528268..fd7c22a674d0b 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A microbenchmark support library"; + description = "Microbenchmark support library"; homepage = "https://github.com/google/benchmark"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index af96d9d06d27b..bf59bdd1f625a 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libgd.github.io/"; - description = "A dynamic image creation library"; + description = "Dynamic image creation library"; license = licenses.free; # some custom license platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index b059620536c66..f8bf3f7c075aa 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -79,21 +79,21 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "gdal"; - version = "3.8.5"; + pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; + version = "3.9.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z+mYlyOX9vJ772qwZMQfCbD/V7RL6+9JLHTzoZ55ot0="; + hash = "sha256-xEekgF9GzsPYkwk7Nny9b1DMLTxBqTSdudYxaz4jl/c="; }; patches = [ - # bump java source option to fix build with JDK 21 + # HDF5: add support for libhdf5 >= 1.14.4.2 when built with Float16 (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/ca2eb4130750b0e6365f738a5f8ff77081f5c5bb.patch"; - sha256 = "sha256-wShYm9yA7twJR72co+Tvf/IuYXqbI0OrjWl0uqC3bwo="; + url = "https://github.com/OSGeo/gdal/commit/16ade8253f26200246abb5ab24d17e18216e7a11.patch"; + sha256 = "sha256-N6YqfcOUWeaJXVE9RUo1dzulxqIY5Q/UygPnZHau3Lc="; }) ]; @@ -229,8 +229,8 @@ stdenv.mkDerivation (finalAttrs: { export GDAL_DOWNLOAD_TEST_DATA=OFF # allows to skip tests that fail because of file handle leak # the issue was not investigated - # https://github.com/OSGeo/gdal/blob/v3.7.0/autotest/gdrivers/bag.py#L61 - export BUILD_NAME=fedora + # https://github.com/OSGeo/gdal/blob/v3.9.0/autotest/gdrivers/bag.py#L54 + export CI=1 ''; nativeInstallCheckInputs = with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index e1a3def0ba420..d6ed7d32e7016 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "gdbm"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0="; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + doCheck = true; # not cross; # Linking static stubs on cygwin requires correct ordering. diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 9d6db6fca684b..bdfa576f23dfe 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -6,6 +6,7 @@ , vtk , ApplicationServices , Cocoa +, DarwinTools # sw_vers , libiconv , enablePython ? false , python ? null @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.23"; + version = "3.0.24"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "refs/tags/v${version}"; - hash = "sha256-zwIPWcjTrfbdNBzAqwV6lU2l6sx+e4Yi7dprdem6AeE="; + hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE="; }; cmakeFlags = [ @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ]; + ] ++ lib.optional stdenv.isDarwin DarwinTools; buildInputs = [ expat @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { # a number of additional but much slower tests are enabled meta = with lib; { - description = "The grassroots cross-platform DICOM implementation"; + description = "Grassroots cross-platform DICOM implementation"; longDescription = '' Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f9fd75f1a6af9..9260f8fc1e2c3 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -21,12 +21,11 @@ , buildPackages , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection -, fetchpatch }: stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; - version = "2.42.11"; + version = "2.42.12"; outputs = [ "out" "dev" "man" ] ++ lib.optional withIntrospection "devdoc" @@ -36,18 +35,12 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Sdy0AjiHCGR+jDIdVrb7MPIeUeUV0MWpQiaNIwUqLwA="; + hash = "sha256-uVBbNEW5p+SM7TR2DDvLc+lm3zrJTJWhSMtmmrdI48c="; }; patches = [ # Move installed tests to a separate output ./installed-tests-path.patch - # Remove post 2.42.11 - (fetchpatch { - name = "fix-meson.build-typo.patch"; - url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch"; - hash = "sha256-6IhdNH6hhygSXD7EJo/hoBLFeb2lJlBIHNBPTkA3Do0="; - }) ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work @@ -160,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library for image loading and manipulation"; + description = "Library for image loading and manipulation"; homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; license = licenses.lgpl21Plus; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 93035b373eb45..addc4a9dbe448 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -31,6 +31,7 @@ , openexr , OpenCL , suitesparse +, withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit }: stdenv.mkDerivation rec { @@ -71,13 +72,14 @@ stdenv.mkDerivation rec { libraw libwebp gexiv2 - luajit openexr suitesparse ] ++ lib.optionals stdenv.isDarwin [ OpenCL ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp + ] ++ lib.optionals withLuaJIT [ + luajit ]; # for gegl-4.0.pc @@ -97,6 +99,8 @@ stdenv.mkDerivation rec { # Disabled due to multiple vulnerabilities, see # https://github.com/NixOS/nixpkgs/pull/73586 "-Djasper=disabled" + ] ++ lib.optionals (!withLuaJIT) [ + "-Dlua=disabled" ]; postPatch = '' diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 9f1cc784e1407..17266481b27a3 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library for input gesture recognition"; + description = "Library for input gesture recognition"; homepage = "https://launchpad.net/geis"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index ea3fd6e1ac784..8a895c36e8657 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UPAYqgZSJMp6/pRIVJYqh8i5olBSVoMUv2zCd14JBOg="; + sha256 = "sha256-J1fP3CtTLkUMZxzsbu3ZMbg4ag1NFvaI5AibFT7eZso="; }; passthru = { diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index df58e5dc9e193..3c6a40eeb5cb4 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , intltool , meson , mesonEmulatorHook diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index ee619aad89ead..c33b2cd6d3914 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; + description = "Convenience library for the geocoding and reverse geocoding using Nominatim service"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 4b12871e55678..cdb1a0a43e81b 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { passthru = { inherit dataDir; }; meta = with lib; { - description = "An API for GeoIP/Geolocation databases"; + description = "API for GeoIP/Geolocation databases"; maintainers = with maintainers; [ thoughtpolice raskin ]; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix index 90bdfdb0d6058..dd18855508d13 100644 --- a/pkgs/development/libraries/geos/3.11.nix +++ b/pkgs/development/libraries/geos/3.11.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; + # https://github.com/libgeos/geos/issues/930 + cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" + ]; + doCheck = true; passthru.tests = { diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 96ebc4fb865de..7fb6411584608 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -36,7 +36,7 @@ in rec { meta = with lib; metaCommon // { - description = "A modern asynchronous DNS API"; + description = "Modern asynchronous DNS API"; longDescription = '' getdns is an implementation of a modern asynchronous DNS API; the specification was originally edited by Paul Hoffman. It is intended to make all @@ -77,7 +77,7 @@ in rec { meta = with lib; metaCommon // { - description = "A local DNS Privacy stub resolver (using DNS-over-TLS)"; + description = "Local DNS Privacy stub resolver (using DNS-over-TLS)"; mainProgram = "stubby"; longDescription = '' Stubby is an application that acts as a local DNS Privacy stub diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 8f0b277a73c4c..7a0d7a3ee667b 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libiconv, xz, bash +{ stdenv, lib, fetchurl, libiconv, bash, updateAutotoolsGnuConfigScriptsHook }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; configureFlags = [ - "--disable-csharp" "--with-xz" + "--disable-csharp" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its @@ -51,8 +51,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - xz - xz.bin + updateAutotoolsGnuConfigScriptsHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ bash diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index 3f07a67cbdaeb..19926fb1d6ffe 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - description = "A C++ library that implements commandline flags processing"; + description = "C++ library that implements commandline flags processing"; mainProgram = "gflags_completions.sh"; longDescription = '' The gflags package contains a C++ library that implements commandline flags processing. diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 677db06e5083c..67677e8a85110 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , fixDarwinDylibNames , pkgsStatic }: @@ -54,7 +53,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A library for reading and writing gif images"; + description = "Library for reading and writing gif images"; homepage = "https://giflib.sourceforge.net/"; platforms = lib.platforms.unix ++ lib.platforms.windows; license = lib.licenses.mit; diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index 7ca154f18e069..7d7d414dfb274 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf automake ]; buildInputs = [libtool gmpxx]; meta = { - description = "A C++ library for arithmetic and algebraic computations"; + description = "C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index f52f23d15c12b..f03fef8aac163 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf automake ]; buildInputs = [libtool gmpxx]; meta = { - description = "A C++ library for arithmetic and algebraic computations"; + description = "C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index aca83ec4b8d68..44fe143968360 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "A C++ library for arithmetic and algebraic computations"; + description = "C++ library for arithmetic and algebraic computations"; mainProgram = "givaro-config"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 2a02b5d767e06..dfc9e36488f86 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://geuz.org/gl2ps"; - description = "An OpenGL to PostScript printing library"; + description = "OpenGL to PostScript printing library"; platforms = platforms.all; license = licenses.lgpl2; maintainers = with maintainers; [ raskin twhitehead ]; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 6cbc5e99b1c3d..b19a890a25450 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/cginternals/glbinding/"; - description = "A C++ binding for the OpenGL API, generated using the gl.xml specification"; + description = "C++ binding for the OpenGL API, generated using the gl.xml specification"; license = licenses.mit; maintainers = [ maintainers.mt-caret ]; }; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 3f355deb33b92..7d8e0689c95ec 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -40,12 +40,14 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}" + "CC:=$(CC)" + "LD:=$(CC)" ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "An OpenGL extension loading library for C(++)"; + description = "OpenGL extension loading library for C(++)"; homepage = "https://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 5e1c986be28f9..4681e4f6abce0 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "An OpenGL extension loading library for C/C++"; + description = "OpenGL extension loading library for C/C++"; homepage = "https://glew.sourceforge.net/"; license = with licenses; [ /* modified bsd */ free mit gpl2Only ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing pkgConfigModules = [ "glew" ]; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 5e0b6adbb2267..67d5a0095148b 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" ''; + # glfw may dlopen libwayland-client.so: + postFixup = lib.optionalString stdenv.isLinux '' + patchelf ''${!outputLib}/lib/libglfw.so --add-rpath ${lib.getLib wayland}/lib + ''; + meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "https://www.glfw.org/"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index feef4630afd8c..a60ba9fae6bfd 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchurl +, fetchpatch , gettext , meson , ninja @@ -73,6 +74,15 @@ stdenv.mkDerivation (finalAttrs: { ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] ++ [ + # Fix double-free & segfault issues on menu and dbus connection action group export failures + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073 + # Remove when version > 2.80.2 + (fetchpatch { + name = "GLib-Fix-memory-problems-on-gmenuexporter-and-gactiongroupexporter-error-paths.patch"; + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/b9490a499a004618c883f180b1081a166ff1a86b.patch"; + hash = "sha256-c6uZ9NEhg26/2RdgjQ4s5ErCDm5HH6T/tfJXTwh/H6o="; + }) + # This patch lets GLib's GDesktopAppInfo API watch and notice changes # to the Nix user and system profiles. That way, the list of available # applications shown by the desktop environment is immediately updated @@ -269,14 +279,6 @@ stdenv.mkDerivation (finalAttrs: { ln -s $PWD/glib/libglib-${librarySuffix} $out/lib/libglib-${librarySuffix} ''; - checkPhase = '' - runHook preCheck - - meson test --print-errorlogs - - runHook postCheck - ''; - postCheck = '' rm $out/lib/libgobject-${librarySuffix} rm $out/lib/libgio-${librarySuffix} diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 1dde7c44bd47d..25a83b1dc6d21 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -278,7 +278,7 @@ stdenv.mkDerivation ({ meta = with lib; { homepage = "https://www.gnu.org/software/libc/"; - description = "The GNU C Library"; + description = "GNU C Library"; longDescription = '' Any Unix-like operating system needs a C library: the library which diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index e07c354aa4e09..96a08178637df 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -182,6 +182,6 @@ in inherit libgcc; }; - meta = (previousAttrs.meta or {}) // { description = "The GNU C Library"; }; + meta = (previousAttrs.meta or {}) // { description = "GNU C Library"; }; }) diff --git a/pkgs/development/libraries/glibc/mtrace.nix b/pkgs/development/libraries/glibc/mtrace.nix index 926c0d91cdf0b..c9d5369e13c2f 100644 --- a/pkgs/development/libraries/glibc/mtrace.nix +++ b/pkgs/development/libraries/glibc/mtrace.nix @@ -35,7 +35,7 @@ glibc.overrideAttrs (oldAttrs: { separateDebugInfo = false; meta = oldAttrs.meta // { - description = "Perl script used to interpret and provide human readable output of the trace log contained in the file mtracedata, whose contents were produced by mtrace(3)."; + description = "Perl script used to interpret and provide human readable output of the trace log contained in the file mtracedata, whose contents were produced by mtrace(3)"; mainProgram = "mtrace"; }; }) diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index f7bc072f1757d..ee7876e548d40 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , blas, gfortran, openssh, mpi } : diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 7bf1bfb4bd16b..4ecae5fe48e07 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec{ ++ lib.optional idnSupport libidn; meta = with lib; { - description = "A portable high-level Jabber/XMPP library for C++"; + description = "Portable high-level Jabber/XMPP library for C++"; mainProgram = "gloox-config"; homepage = "http://camaya.net/gloox"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index a78170909caa9..9fa8765f054ec 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "The GNU Linear Programming Kit"; + description = "GNU Linear Programming Kit"; longDescription = '' The GNU Linear Programming Kit is intended for solving large diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index 511ec60db2fbd..716c998b9c990 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A user interface library using OpenGL"; + description = "User interface library using OpenGL"; license = licenses.zlib ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index d6369227739b8..6f48f6ed3af44 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jstedfast/gmime/"; - description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; + description = "C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index b7cca3b156b94..25d6c85aa328d 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/jstedfast/gmime/"; - description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; + description = "C/C++ library for creating, editing and parsing MIME messages and structures"; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 5992868c7343a..558d8c0b112a4 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with lib; { - description = "A network library, written in C, object-oriented, and built upon GLib"; + description = "Network library, written in C, object-oriented, and built upon GLib"; homepage = "https://developer.gnome.org/gnet/"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 740f7d94f1d99..43ce34ec2ed4f 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.50.1"; + version = "3.50.2"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-Qu5D/R4pQrn/YQYlLM3INGAoFVCL96OlLAvf/6Vur0A="; + hash = "sha256-3xatl10TnGv8TrsuyLuDJyl6eR7yvwuXfHgHavX6qY4="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index fcf955fbc173c..a4cedd6c91873 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A collection of GStreamer effects to be used in different GNOME Modules"; + description = "Collection of GStreamer effects to be used in different GNOME Modules"; homepage = "https://gitlab.gnome.org/GNOME/gnome-video-effects"; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 171eb5742713a..31b6f7c7d2286 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, buildPackages, fetchurl, pciutils -, gitUpdater }: +{ lib, stdenv, buildPackages, fetchFromGitHub, pciutils +, gitUpdater, fwupd-efi, ipxe, refind, syslinux }: stdenv.mkDerivation rec { pname = "gnu-efi"; - version = "3.0.15"; + version = "3.0.18"; - src = fetchurl { - url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2"; - hash = "sha256-kxole5xcG6Zf9Rnxg3PEOKJoJfLbeGaxY+ltGxaPIOo="; + src = fetchFromGitHub { + owner = "ncroxon"; + repo = "gnu-efi"; + rev = version; + hash = "sha256-xtiKglLXm9m4li/8tqbOsyM6ThwGhyu/g4kw5sC4URY="; }; buildInputs = [ pciutils ]; @@ -25,9 +27,14 @@ stdenv.mkDerivation rec { --replace "-Werror" "" ''; - passthru.updateScript = gitUpdater { - # No nicer place to find latest release. - url = "https://git.code.sf.net/p/gnu-efi/code"; + passthru = { + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.code.sf.net/p/gnu-efi/code"; + }; + tests = { + inherit fwupd-efi ipxe refind syslinux; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index b527c0d3c3331..48e027f5246bb 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "The GNU Transport Layer Security Library"; + description = "GNU Transport Layer Security Library"; longDescription = '' GnuTLS is a project that aims to develop a library which diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 23f1e2262d128..9aba5156bef28 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A middleware layer between C libraries and language bindings"; + description = "Middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 artturin ]); pkgConfigModules = [ "gobject-introspection-1.0" ]; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 97779b477c309..a0be4727293bd 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A Glib/GTK set of document centric objects and utilities"; + description = "Glib/GTK set of document centric objects and utilities"; longDescription = '' There are common operations for document centric applications that are diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 4d48e0c227407..96b1f3ae13ce9 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A GObject to SQLite object mapper"; + description = "GObject to SQLite object mapper"; homepage = "https://gitlab.gnome.org/GNOME/gom"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index e5dfba0aa4f5b..3e81f031a851c 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A thin layer of graphic data types"; + description = "Thin layer of graphic data types"; homepage = "https://github.com/ebassi/graphene"; license = licenses.mit; maintainers = teams.gnome.members ++ (with maintainers; [ ]); diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 4113ee2f5d7c3..5193cedf868bd 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/grilo-plugins"; - description = "A collection of plugins for the Grilo framework"; + description = "Collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index bf9b58ec4a092..2110755a17197 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; + description = "C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; maintainers = with maintainers; [ lnl7 ]; homepage = "https://grpc.io/"; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index ffe168674e68f..7e3d11528a4f0 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform.system != "i686-linux"; meta = { - description = "The GNU Scientific Library, a large numerical library"; + description = "GNU Scientific Library, a large numerical library"; homepage = "https://www.gnu.org/software/gsl/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 13a9e4be04b5c..3e3ca2d591354 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A spell-checking library for GTK applications"; + description = "Spell-checking library for GTK applications"; mainProgram = "gspell-app1"; homepage = "https://gitlab.gnome.org/GNOME/gspell"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index b94769af76f44..91639c441b481 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -112,13 +112,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RI4yeHvIK1hsbLL4HJqO9AT+pPd/JVZv4G5Zej9ZE2s="; + hash = "sha256-6Q8mx9ycdvSqWZt1jP1tjBDWoLnLJluiw8m984iFWPg="; }; patches = [ @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ wayland # for wayland-scanner ]; @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { bluez ] ++ lib.optionals microdnsSupport [ libmicrodns - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [ libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs wayland wayland-protocols @@ -305,6 +305,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only "-Dnvcodec=disabled" # Linux-only + ] ++ lib.optionals (!stdenv.isLinux || !gst-plugins-base.waylandEnabled) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` ] ++ lib.optionals (!stdenv.isLinux || !guiSupport) [ "-Ddirectfb=disabled" @@ -322,8 +323,8 @@ stdenv.mkDerivation rec { "-Duvch264=disabled" # requires gudev "-Dv4l2codecs=disabled" # requires gudev "-Dladspa=disabled" # requires lrdf - ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64) [ - "-Dqsv=disabled" # Linux (and Windows) x86 only + ] ++ lib.optionals (!stdenv.isLinux || !stdenv.isx86_64 || !gst-plugins-base.waylandEnabled) [ + "-Dqsv=disabled" # Linux (and Windows) x86 only, makes va required ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ "-Dgl=disabled" ] ++ lib.optionals (!gst-plugins-base.waylandEnabled || !guiSupport) [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 72dbef5c6dee0..f48fe22f50001 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" "dev" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-KC8cyAZcm2Lragog+56DKPjlKW3yRYtyNtqnKcQa52k="; + hash = "sha256-8QlDl+qnky8G5X67sHWqM6osduS3VjChawLI1K9Ggy4="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index eb9231155b80a..3136b6f886755 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "bin" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-nK/dI70YDxaBxWzTpoeahJfM8k2m9CKmtvNW+gdKhIE="; + hash = "sha256-EiXvSjKfrhytxexyfaskmtVn6AcoeUk1Yc65HtNKpBQ="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 5b1d4c8618cea..44a79bb2c998d 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.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-/dfDDBqhuweADdmKUeVSEQZWGYNeSIn1yS/oI7hs2PQ="; + hash = "sha256-uREUov2Vj0Ks9EEYbofivsk1OO81qfgkgREZc2D/sjc="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 0838dec0fdb06..79ece373b57d0 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.24.2"; + version = "1.24.3"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-cgF3jqXZN0QMU9dDndEqpaxoQGiK8fBJmFInUHS5kHM="; + hash = "sha256-z3QyFWiLATkFzSyff+3aIeLTTIRDQJkMbqJdEKA3KT8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 1cf3fef79f08a..bd301e7b45c22 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -58,13 +58,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-bjR8ctS4sohtiQ/+n2dnqe2wLyAViOjDpXLc0I2YUr0="; + hash = "sha256-FQ+RTmHcBWALaLiMoQPHzCJxMBWOOJ6p6hWfQFCi67A="; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 35d0b461d9bc9..872627009e215 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.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-lig4ZI4Uzop4Miqxb4TH2E2Gpte+u2V0rAXeqEp8fJs="; + hash = "sha256-2cWxUkaKRcH6g1FBBCIJCnGScHrXTS4aQ2f1JU4YjZE="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index d1f1259635fa9..d4afb8ce7618a 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -29,6 +29,7 @@ , nix-update-script # specifies a limited subset of plugins to build (the default `null` means all plugins supported on the stdenv platform) , plugins ? null +, withGtkPlugins ? true # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null , hotdoc @@ -114,7 +115,7 @@ let "reqwest" # tests hang on darwin "threadshare" # tests cannot bind to localhost on darwin "webp" # not supported on darwin (upstream crate issue) - ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ + ] ++ lib.optionals (!gst-plugins-base.glEnabled || !withGtkPlugins) [ # these require gstreamer-gl "gtk4" "livesync" diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index cb848efca39f9..db56d895f7876 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.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-5MhKeGdefv7zsm6cueLkJzGEIbStnuS1E2767rtrugw="; + hash = "sha256-YmKOzKeLj1tRxZpNYCxl6SBf/FDDyDzWH6sfY0i2NWU="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 40b6e169c225a..0b39bad01020b 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RdqYvxBAyUcv1Z9icSgt4lo3IauFt4qq+BBJSVUPvvU="; + hash = "sha256-TJUTQcTGSGMLb+EjTsET2B3S0khSm/K1R44K0HfIDtM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index a5cd9cace4e74..cdad2eaf232d9 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.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-zFq4yIRD4PW/I9YRC0qsM99Z5K5ib1NtlosWBcx7li8="; + hash = "sha256-hF8u/g3KjasjTd6PsJHaLNBqnSpoNCK1bctoiVT5Bw4="; }; outputs = [ diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix index 5cbd4302dbaa7..9c83bc4f47c88 100644 --- a/pkgs/development/libraries/gtk-engine-murrine/default.nix +++ b/pkgs/development/libraries/gtk-engine-murrine/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 ]; meta = { - description = "A very flexible theme engine"; + description = "Very flexible theme engine"; homepage = "https://gitlab.gnome.org/Archive/murrine"; license = lib.licenses.lgpl3; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index c137eb608132a..f2ce10e589181 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; + description = "Library to create panels and other desktop components for Wayland using the Layer Shell protocol"; mainProgram = "gtk-layer-demo"; homepage = "https://github.com/wmww/gtk-layer-shell"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 219028d4ab902..1331fcff0e656 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -54,6 +54,10 @@ stdenv.mkDerivation rec { ./bootstrap-${lib.versions.majorMinor version} ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + ]); + dontStrip = true; inherit monoDLLFixer; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index b2afb21b6214e..9d9b855c9da89 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.gtk.org/"; - description = "A multi-platform toolkit for creating graphical user interfaces"; + description = "Multi-platform toolkit for creating graphical user interfaces"; longDescription = '' GTK is a highly usable, feature rich toolkit for creating graphical user interfaces which boasts cross platform compatibility and an easy to use diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index b2b156051bf89..f194dee9c9ec8 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.41"; + version = "3.24.42"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version; in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-R9phSHrzCHqUvEkpb9AlygvAL5bvBsVW58iYi9ZRtvo="; + sha256 = "sha256-UPifYVCS1N0Bu9dZcZ+L04Dl8Un2/XipRyXi3hEjd+I="; }; patches = [ @@ -242,7 +242,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A multi-platform toolkit for creating graphical user interfaces"; + description = "Multi-platform toolkit for creating graphical user interfaces"; longDescription = '' GTK is a highly usable, feature rich toolkit for creating graphical user interfaces which boasts cross platform diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 34a5582ffa676..b70e270ba6ffa 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.14.3"; + version = "4.14.4"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-K+XIWL3vEQTTeEjJd5wIk3LI0xUD9u/EuU5TtUb8mkM="; + hash = "sha256-RDUYuX6DSPn2QwrENbEBD5psUgf03Gp81dJOOCDO5jM="; }; depsBuildBuild = [ @@ -261,7 +261,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A multi-platform toolkit for creating graphical user interfaces"; + description = "Multi-platform toolkit for creating graphical user interfaces"; longDescription = '' GTK is a highly usable, feature rich toolkit for creating graphical user interfaces which boasts cross platform diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix index e41735fb71291..067bbad8dd247 100644 --- a/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol and GTK4"; + description = "Library to create panels and other desktop components for Wayland using the Layer Shell protocol and GTK4"; mainProgram = "gtk4-layer-demo"; license = licenses.mit; maintainers = with maintainers; [ donovanglover ]; diff --git a/pkgs/development/libraries/gtkextra/default.nix b/pkgs/development/libraries/gtkextra/default.nix index ed860b7dde3fc..66516add6d9cf 100644 --- a/pkgs/development/libraries/gtkextra/default.nix +++ b/pkgs/development/libraries/gtkextra/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gtkextra.sourceforge.net/"; - description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+."; + description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ tesq0 ]; diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 4b5f52c22b771..d4ac1e9bb09f1 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,15 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.12.0"; + version = "5.12.1"; outputs = [ "out" "dev" "devdoc" ]; - src = let - inherit (finalAttrs) pname version; - in fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-2vMv9dMVDWOFkX01A6hbngR7oViysDB5MUycAIE/oB8="; + src = fetchurl { + url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz"; + hash = "sha256-hMgqrZhcWq2ufOp4BJBKdjQeyCsmjUZZTBpHjzm0LB8="; }; patches = [ diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index c43f69fd97b52..97c7ed790ac42 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://gupnp.org/"; - description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; + description = "Collection of helpers for building AV (audio/video) applications using GUPnP"; license = licenses.lgpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index 44ae478e42f59..9d90624aae6d7 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.gupnp.org/"; - description = "An implementation of the UPnP specification"; + description = "Implementation of the UPnP specification"; mainProgram = "gupnp-binding-tool-1.6"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index d9e9f483a63b3..08b2925b0ea3b 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.gupnp.org/"; - description = "An implementation of the UPnP specification"; + description = "Implementation of the UPnP specification"; mainProgram = "gupnp-binding-tool-1.2"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index aba944becf763..d60f95c548391 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch2 , meson , ninja , pkg-config @@ -46,13 +45,13 @@ , gsettings-desktop-schemas }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.54.0"; + version = "1.54.1"; src = fetchurl { - url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor version}/gvfs-${version}.tar.xz"; - hash = "sha256-9T2B34bC6GzdJRgsLYpmmiI3HoNiPe0bnVQW3Pxt42Y="; + url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; + hash = "sha256-rEo7zLf+FQIVjvD95cl5q0RxJVfQKKjk8wop8PvZ0Z8="; }; patches = [ @@ -138,13 +137,13 @@ stdenv.mkDerivation rec { ]; doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" - doInstallCheck = doCheck; + doInstallCheck = finalAttrs.doCheck; separateDebugInfo = true; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gvfs"; versionPolicy = "odd-unstable"; }; }; @@ -155,4 +154,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index e558428c67e0b..657ea82f0b85b 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "An OpenType text shaping engine"; + description = "OpenType text shaping engine"; homepage = "https://harfbuzz.github.io/"; changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 3e84432cd5077..de446eb9527de 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { meta = with lib; { homepage = "http://herqq.org"; - description = "A software library for building UPnP devices and control points"; + description = "Software library for building UPnP devices and control points"; platforms = platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/development/libraries/hiredis-vip/default.nix index a4c7575ac0411..32fd7d0db751f 100644 --- a/pkgs/development/libraries/hiredis-vip/default.nix +++ b/pkgs/development/libraries/hiredis-vip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = { - description = "A C client library for the Redis database"; + description = "C client library for the Redis database"; homepage = "https://github.com/vipshop/hiredis-vip"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/development/libraries/hmat-oss/default.nix index f24dc8777a73d..7aca6227e81bc 100644 --- a/pkgs/development/libraries/hmat-oss/default.nix +++ b/pkgs/development/libraries/hmat-oss/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A hierarchical matrix C/C++ library"; + description = "Hierarchical matrix C/C++ library"; homepage = "https://github.com/jeromerobert/hmat-oss"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index f7af4975de561..953dd472210a7 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.mit; - description = "A date and time library based on the C++11/14/17 <chrono> header"; + description = "Date and time library based on the C++11/14/17 <chrono> header"; homepage = "https://github.com/HowardHinnant/date"; platforms = platforms.unix; maintainers = with maintainers; [ r-burns ]; diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 59bf04f726091..024461046f461 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doxygen , boost @@ -64,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { - description = "An extension of the Flexible Collision Library"; + description = "Extension of the Flexible Collision Library"; homepage = "https://github.com/humanoid-path-planner/hpp-fcl"; license = licenses.bsd3; maintainers = with maintainers; [ nim65s ]; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index bcaf1233d3006..cef877d286a62 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = "v${version}"; - hash = "sha256-1gLDwgCqv+3+rOSG7a3fFsnjqfKpnPpWnBmrW+z+jWw="; + hash = "sha256-yrKG0n5BhrUNXjFWZRpb38/GYQlvMr0PSqUbhmZlgm0="; }; propagatedBuildInputs = [ hwloc ]; diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index f42674e902f04..4b01162bf25bc 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://htmlcxx.sourceforge.net/"; - description = "A simple non-validating css1 and html parser for C++"; + description = "Simple non-validating css1 and html parser for C++"; mainProgram = "htmlcxx"; license = licenses.lgpl2; platforms = platforms.all; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 65ac1fe92c130..6ba2b8fc1ace7 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An HTTP message parser written in C"; + description = "HTTP message parser written in C"; homepage = "https://github.com/nodejs/http-parser"; maintainers = with maintainers; [ matthewbauer ]; license = licenses.mit; diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 4736326b4a302..95c15fdc610af 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,20 +7,20 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-+YAjmsZvBkOk5bsjE07weTNUmevHd1ZXP0bv5QbkZMs="; + hash = "sha256-1w7uu2E4YIcGWNq//BZ2wtDKj9/tgmIhkJgadvCKmVg="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ openssl ]; meta = with lib; { - description = "A C++ header-only HTTP/HTTPS server and client library"; + description = "C++ header-only HTTP/HTTPS server and client library"; homepage = "https://github.com/yhirose/cpp-httplib"; changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/v${version}"; maintainers = with maintainers; [ aidalgol ]; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 78c9ad7fe7b59..6b6640ddfb712 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -967,4 +967,58 @@ rec { platforms = platforms.all; }; }; + + /* ROMANIAN */ + ro_RO = ro-ro; + ro-ro = mkDict rec { + pname = "hunspell-dict-ro-ro"; + version = "3.3.10"; + shortName = "ro-ro"; + dictFileName = "ro_RO"; + fileName = "${dictFileName}.${version}.zip"; + shortDescription = "Romanian (Romania)"; + readmeFile = "README"; + + src = fetchurl { + url = "https://downloads.sourceforge.net/rospell/${fileName}"; + hash = "sha256-fxKNZOoGyeZxHDCxGMCv7vsBTY8zyS2szfRVq6LQRRk="; + }; + + nativeBuildInputs = [ unzip ]; + unpackCmd = '' + unzip $src ${dictFileName}.aff ${dictFileName}.dic ${readmeFile} -d ${dictFileName} + ''; + + meta = { + description = "Hunspell dictionary for ${shortDescription} from rospell"; + homepage = "https://sourceforge.net/projects/rospell/"; + license = with lib.licenses; [ gpl2Only ]; + maintainers = with lib.maintainers; [ Andy3153 ]; + }; + }; + + /* Turkish */ + tr_TR = tr-tr; + tr-tr = mkDict rec { + pname = "hunspell-dict-tr-tr"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "tdd-ai"; + repo = "hunspell-tr"; + rev = "7302eca5f3652fe7ae3d3ec06c44697c97342b4e"; + hash = "sha256-r/I5T/1e7gcp2XZ4UvnpFmWMTsNqLZSCbkqPcgC13PE="; + }; + + dictFileName = "tr_TR"; + readmeFile = "README.md"; + + meta = with lib; { + description = "Hunspell dictionary for Turkish (Turkey) from tdd-ai"; + homepage = "https://github.com/tdd-ai/hunspell-tr/"; + license = licenses.mpl20; + maintainers = with maintainers; [ samemrecebi ]; + platforms = platforms.all; + }; + }; } diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 0a4e89b3b2de3..cb962212ffea6 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/Archive/hyena"; - description = "A C# library which contains a hodge-podge of random stuff"; + description = "C# library which contains a hodge-podge of random stuff"; longDescription = '' Hyena is a C# library used to make awesome applications. It contains a lot of random things, including useful data structures, a Sqlite-based db layer, cool widgets, a JSON library, diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/development/libraries/hyphen/default.nix index 122834570cfa3..2759ad9af7374 100644 --- a/pkgs/development/libraries/hyphen/default.nix +++ b/pkgs/development/libraries/hyphen/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; meta = with lib; { - description = "A text hyphenation library"; + description = "Text hyphenation library"; mainProgram = "substrings.pl"; homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 8ea1a79a1a660..09b88c1a191ce 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -1,8 +1,67 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + applyPatches, + callPackage, + cmake, + fetchFromGitHub, + fetchpatch, + darwin, + glfw, + libGL, + SDL2, + vcpkg, + vulkan-headers, + vulkan-loader, + + # The intent is to mirror vcpkg's flags[^1], + # but we only actually support Linux and glfw3 until someone contributes the rest + # [^1]: https://github.com/microsoft/vcpkg/blob/095ee06e7f60dceef7d713e3f8b1c2eb10d650d7/ports/imgui/CMakeLists.txt#L33-L108 + IMGUI_BUILD_ALLEGRO5_BINDING ? false, + IMGUI_BUILD_ANDROID_BINDING ? stdenv.hostPlatform.isAndroid, + IMGUI_BUILD_DX9_BINDING ? false, + IMGUI_BUILD_DX10_BINDING ? false, + IMGUI_BUILD_DX11_BINDING ? false, + IMGUI_BUILD_DX12_BINDING ? false, + IMGUI_BUILD_GLFW_BINDING ? !stdenv.isDarwin, + IMGUI_BUILD_GLUT_BINDING ? false, + IMGUI_BUILD_METAL_BINDING ? stdenv.isDarwin, + IMGUI_BUILD_OPENGL2_BINDING ? false, + IMGUI_BUILD_OPENGL3_BINDING ? + IMGUI_BUILD_SDL2_BINDING || IMGUI_BUILD_GLFW_BINDING || IMGUI_BUILD_GLUT_BINDING, + IMGUI_BUILD_OSX_BINDING ? stdenv.isDarwin, + IMGUI_BUILD_SDL2_BINDING ? + !IMGUI_BUILD_GLFW_BINDING && !stdenv.isDarwin, + IMGUI_BUILD_SDL2_RENDERER_BINDING ? IMGUI_BUILD_SDL2_BINDING, + IMGUI_BUILD_VULKAN_BINDING ? false, + IMGUI_BUILD_WIN32_BINDING ? false, + IMGUI_FREETYPE ? false, + IMGUI_FREETYPE_LUNASVG ? false, + IMGUI_USE_WCHAR32 ? false, +}@args: + +let + vcpkgSource = applyPatches { + inherit (vcpkg) src; + patches = [ + # Install imgui into split outputs: + (fetchpatch { + url = "https://github.com/microsoft/vcpkg/commit/e91750f08383112e8850f209e55ed2f960181fa6.patch"; + hash = "sha256-T+DN42PRl2gWGM8zJb9wZEsDl7+XNT6CFypNX3lBHNc="; + }) + ]; + }; +in stdenv.mkDerivation rec { pname = "imgui"; version = "1.90.6"; + outputs = [ + # Note: no "dev" because vcpkg installs include/ and imgui-config.cmake + # into different prefixes but expects the merged layout at import time + "out" + "lib" + ]; src = fetchFromGitHub { owner = "ocornut"; @@ -11,22 +70,77 @@ stdenv.mkDerivation rec { sha256 = "sha256-FSob6FPfg0tF0n72twA5/moLvEaB251BPkIDJUXhYbg="; }; - dontBuild = true; + cmakeRules = "${vcpkgSource}/ports/imgui"; + postPatch = '' + cp "$cmakeRules"/{CMakeLists.txt,*.cmake.in} ./ + ''; - installPhase = '' - mkdir -p $out/include/imgui + nativeBuildInputs = [ cmake ]; - cp *.h $out/include/imgui - cp *.cpp $out/include/imgui - cp -a backends $out/include/imgui/ - cp -a misc $out/include/imgui/ - ''; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.ApplicationServices + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.GameController + ]; + + propagatedBuildInputs = + lib.optionals (IMGUI_BUILD_OPENGL2_BINDING || IMGUI_BUILD_OPENGL3_BINDING) [ libGL ] + ++ lib.optionals IMGUI_BUILD_GLFW_BINDING [ glfw ] + ++ lib.optionals IMGUI_BUILD_SDL2_BINDING [ SDL2 ] + ++ lib.optionals IMGUI_BUILD_VULKAN_BINDING [ + vulkan-headers + vulkan-loader + ] + ++ lib.optionals IMGUI_BUILD_METAL_BINDING [ darwin.apple_sdk.frameworks.Metal ]; + + cmakeFlags = [ + (lib.cmakeBool "IMGUI_BUILD_GLFW_BINDING" IMGUI_BUILD_GLFW_BINDING) + (lib.cmakeBool "IMGUI_BUILD_ALLEGRO5_BINDING" IMGUI_BUILD_ALLEGRO5_BINDING) + (lib.cmakeBool "IMGUI_BUILD_ANDROID_BINDING" IMGUI_BUILD_ANDROID_BINDING) + (lib.cmakeBool "IMGUI_BUILD_DX9_BINDING" IMGUI_BUILD_DX9_BINDING) + (lib.cmakeBool "IMGUI_BUILD_DX10_BINDING" IMGUI_BUILD_DX10_BINDING) + (lib.cmakeBool "IMGUI_BUILD_DX11_BINDING" IMGUI_BUILD_DX11_BINDING) + (lib.cmakeBool "IMGUI_BUILD_DX12_BINDING" IMGUI_BUILD_DX12_BINDING) + (lib.cmakeBool "IMGUI_BUILD_GLFW_BINDING" IMGUI_BUILD_GLFW_BINDING) + (lib.cmakeBool "IMGUI_BUILD_GLUT_BINDING" IMGUI_BUILD_GLUT_BINDING) + (lib.cmakeBool "IMGUI_BUILD_METAL_BINDING" IMGUI_BUILD_METAL_BINDING) + (lib.cmakeBool "IMGUI_BUILD_OPENGL2_BINDING" IMGUI_BUILD_OPENGL2_BINDING) + (lib.cmakeBool "IMGUI_BUILD_OPENGL3_BINDING" IMGUI_BUILD_OPENGL3_BINDING) + (lib.cmakeBool "IMGUI_BUILD_OSX_BINDING" IMGUI_BUILD_OSX_BINDING) + (lib.cmakeBool "IMGUI_BUILD_SDL2_BINDING" IMGUI_BUILD_SDL2_BINDING) + (lib.cmakeBool "IMGUI_BUILD_SDL2_RENDERER_BINDING" IMGUI_BUILD_SDL2_RENDERER_BINDING) + (lib.cmakeBool "IMGUI_BUILD_VULKAN_BINDING" IMGUI_BUILD_VULKAN_BINDING) + (lib.cmakeBool "IMGUI_BUILD_WIN32_BINDING" IMGUI_BUILD_WIN32_BINDING) + (lib.cmakeBool "IMGUI_FREETYPE" IMGUI_FREETYPE) + (lib.cmakeBool "IMGUI_FREETYPE_LUNASVG" IMGUI_FREETYPE_LUNASVG) + (lib.cmakeBool "IMGUI_USE_WCHAR32" IMGUI_USE_WCHAR32) + ]; + + passthru = { + tests = { + demo = callPackage ./demo { }; + }; + }; - meta = with lib; { + meta = { + # These flags haven't been tested: + broken = + IMGUI_FREETYPE + || IMGUI_FREETYPE_LUNASVG + || IMGUI_BUILD_DX9_BINDING + || IMGUI_BUILD_DX10_BINDING + || IMGUI_BUILD_DX11_BINDING + || IMGUI_BUILD_DX12_BINDING + || IMGUI_BUILD_WIN32_BINDING + || IMGUI_BUILD_ALLEGRO5_BINDING + || IMGUI_BUILD_ANDROID_BINDING; description = "Bloat-free Graphical User interface for C++ with minimal dependencies"; homepage = "https://github.com/ocornut/imgui"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = platforms.all; + license = lib.licenses.mit; # vcpkg licensed as MIT too + maintainers = with lib.maintainers; [ + SomeoneSerge + wolfangaukang + ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/imgui/demo/CMakeLists.txt b/pkgs/development/libraries/imgui/demo/CMakeLists.txt new file mode 100644 index 0000000000000..9345dd9897a9c --- /dev/null +++ b/pkgs/development/libraries/imgui/demo/CMakeLists.txt @@ -0,0 +1,11 @@ +project(ImguiDemo LANGUAGES CXX) +cmake_minimum_required(VERSION 3.20) + +add_executable(demo ./main.cpp) + +find_package(imgui REQUIRED) +find_package(glfw3 REQUIRED) +find_package(OpenGL REQUIRED) +target_link_libraries(demo PRIVATE imgui glfw OpenGL::GL) + +install(TARGETS demo RUNTIME DESTINATION bin) diff --git a/pkgs/development/libraries/imgui/demo/default.nix b/pkgs/development/libraries/imgui/demo/default.nix new file mode 100644 index 0000000000000..a250155758aa3 --- /dev/null +++ b/pkgs/development/libraries/imgui/demo/default.nix @@ -0,0 +1,29 @@ +{ + lib, + stdenv, + cmake, + imgui, +}: + +stdenv.mkDerivation { + pname = "${imgui.pname}-demo"; + inherit (imgui) version; + + src = "${imgui.src}/examples/example_glfw_opengl3"; + postPatch = '' + rm Makefile* + cp ${./CMakeLists.txt} CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ (imgui.override { IMGUI_BUILD_GLFW_BINDING = true; }) ]; + + meta = with lib; { + description = "Standalone ImPlot Demos"; + homepage = "https://github.com/ocornut/imgui/tree/master/examples/example_glfw_opengl3"; + license = licenses.mit; + maintainers = with maintainers; [ SomeoneSerge ]; + mainProgram = "demo"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix index 8682e95a57586..5be23b0a96f4c 100644 --- a/pkgs/development/libraries/impy/default.nix +++ b/pkgs/development/libraries/impy/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A simple library for loading/saving images and animations, written in C"; + description = "Simple library for loading/saving images and animations, written in C"; homepage = "https://github.com/bcampbell/impy"; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/development/libraries/imtui/default.nix index 86b488c1a888d..a4f477543b89e 100644 --- a/pkgs/development/libraries/imtui/default.nix +++ b/pkgs/development/libraries/imtui/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; postPatch = '' - cp -r ${imgui}/include/imgui third-party/imgui + cp -r ${imgui.src}/* third-party/imgui/imgui + chmod -R u+w third-party/imgui '' + lib.optionalString (lib.versionAtLeast imgui.version "1.90.1") '' substituteInPlace src/imtui-impl-{emscripten,ncurses}.cpp \ --replace "ImGuiKey_KeyPadEnter" "ImGuiKey_KeypadEnter" @@ -45,10 +46,6 @@ stdenv.mkDerivation rec { "-DIMTUI_INSTALL_IMGUI_HEADERS:BOOL=OFF" ]; - postInstall = '' - rm -rf $out/include/imgui - ''; - meta = with lib; { description = "Immediate mode text-based user interface library"; longDescription = '' diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 62deaeb1c2815..18057753efbd0 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,51 +1,79 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, fetchFromGitHub +, substituteAll +, symlinkJoin +, cmake +, doxygen +, ruby +, validatePkgConfig +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iniparser"; - version = "4.1"; + version = "4.2.3"; - src = fetchFromGitHub { - owner = "ndevilla"; + src = fetchFromGitLab { + owner = "iniparser"; repo = "iniparser"; - rev = "v${version}"; - sha256 = "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rCp9whYPYmVd7saVFILmpdn041u6fYGqe1/Oqc7RaeA="; }; - patches = ./no-usr.patch; + patches = [ + (fetchpatch { + name = "fix-paths-pkgconfig-file.patch"; + url = "https://gitlab.com/iniparser/iniparser/-/commit/6a76cd5e97b32014b22d87039bf6f4ee425c79a2.patch"; + hash = "sha256-KlTxeOzwBZiLNmuwbbem5c/xspxsflyYfeUaQnGyarI="; + }) + ] ++ lib.optionals finalAttrs.doCheck [ + (substituteAll { + # Do not let cmake's fetchContent download unity + src = ./remove-fetchcontent-usage.patch; + unitySrc = symlinkJoin { + name = "unity-with-iniparser-config"; + paths = [ + (fetchFromGitHub { + owner = "throwtheswitch"; + repo = "unity"; + rev = "v2.6.0"; + hash = "sha256-SCcUGNN/UJlu3ALJiZ9bQKxYRZey3cm9QG+NOehp6Ow="; + }) + ]; + postBuild = '' + ln -s ${finalAttrs.src}/test/unity_config.h $out/src/unity_config.h + ''; + }; + }) + ]; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace -Wl,-soname= -Wl,-install_name, - ''; - - doCheck = true; - preCheck = "patchShebangs test/make-tests.sh"; - - installPhase = '' - mkdir -p $out/lib + nativeBuildInputs = [ cmake doxygen validatePkgConfig ] ++ lib.optionals finalAttrs.doCheck [ ruby ]; - mkdir -p $out/include - cp src/*.h $out/include + cmakeFlags = [ + "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" + ]; - mkdir -p $out/share/doc/${pname}-${version} - for i in AUTHORS INSTALL LICENSE README.md; do - bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2; - done; - cp -r html $out/share/doc/${pname}-${version} + doCheck = false; - cp libiniparser.a $out/lib - cp libiniparser.so.1 $out/lib - ln -s libiniparser.so.1 $out/lib/libiniparser.so - - mkdir -p $out/lib/pkgconfig - substituteAll ${./iniparser.pc.in} $out/lib/pkgconfig/iniparser.pc + postFixup = '' + ln -sv $out/include/iniparser/*.h $out/include/ ''; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + iniparser-with-tests = finalAttrs.overrideAttrs (_: { doCheck = true; }); + }; + meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://gitlab.com/iniparser/iniparser"; description = "Free standalone ini file parsing library"; + changelog = "https://gitlab.com/iniparser/iniparser/-/releases/v${finalAttrs.version}"; license = licenses.mit; platforms = platforms.unix; + pkgConfigModules = [ "iniparser" ]; maintainers = [ maintainers.primeos ]; }; -} +}) diff --git a/pkgs/development/libraries/iniparser/iniparser.pc.in b/pkgs/development/libraries/iniparser/iniparser.pc.in deleted file mode 100644 index fb94188fff711..0000000000000 --- a/pkgs/development/libraries/iniparser/iniparser.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@out@ -exec_prefix=@out@ -libdir=${exec_prefix}/lib -includedir=${prefix}/include -datarootdir=${prefix}/share -datadir=${datarootdir} - -Name: libiniparser -Description: Iniparser library -Version: @version@ -Libs: -L${libdir} -liniparser -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/iniparser/no-usr.patch b/pkgs/development/libraries/iniparser/no-usr.patch deleted file mode 100644 index a3c568cdde436..0000000000000 --- a/pkgs/development/libraries/iniparser/no-usr.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile 2017-10-20 20:30:41.494608284 +0200 -+++ b/Makefile 2017-10-20 20:33:22.279212026 +0200 -@@ -20,8 +20,8 @@ - ARFLAGS = rcv - - SHLD = ${CC} ${CFLAGS} --LDSHFLAGS = -shared -Wl,-Bsymbolic --LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib -+LDSHFLAGS = -shared -+LDFLAGS = - - # .so.0 is for version 3.x, .so.1 is 4.x - SO_TARGET ?= libiniparser.so.1 diff --git a/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch b/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch new file mode 100644 index 0000000000000..db96c37e6b2ca --- /dev/null +++ b/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch @@ -0,0 +1,17 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index b28d151..33a6bcf 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -28,10 +28,8 @@ set(FETCHCONTENT_QUIET OFF) + + FetchContent_Declare( + unity +- GIT_REPOSITORY "https://github.com/throwtheswitch/unity.git" +- GIT_PROGRESS TRUE +- PATCH_COMMAND ${CMAKE_COMMAND} -E copy +- ${CMAKE_CURRENT_LIST_DIR}/unity_config.h ./src/) ++ SOURCE_DIR @unitySrc@ ++) + + FetchContent_MakeAvailable(unity) + target_compile_definitions(unity PUBLIC UNITY_INCLUDE_CONFIG_H) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 5c647aaadfe62..2cfce8ed20405 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.19"; + version = "22.3.20"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-y35rcAo1CR8HvKD4hCtdMSSPSSnGaUf4l2Tdzbq5fFw="; + sha256 = "sha256-AqHzWm0ZWCJK0gMXxxBSHemKx3U1fOXCUGo/ORny2hI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 506281a7e6e93..37c0e7253ad1f 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { }; patches = [ + # Search oneVPL-intel-gpu in NixOS specific /run/opengl-driver/lib directory + # See https://github.com/NixOS/nixpkgs/pull/315425 + ./nixos-search-onevplrt-in-run-opengl-driver-lib.patch # https://github.com/Intel-Media-SDK/MediaSDK/pull/3005 (fetchpatch { name = "include-cstdint-explicitly.patch"; @@ -39,7 +42,7 @@ stdenv.mkDerivation rec { description = "Intel Media SDK"; mainProgram = "mfx-tracer-config"; license = licenses.mit; - maintainers = with maintainers; [ midchildan ]; + maintainers = with maintainers; [ midchildan pjungkamp ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch b/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch new file mode 100644 index 0000000000000..5057de1e1e489 --- /dev/null +++ b/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch @@ -0,0 +1,45 @@ +From aceb689ae69857def8a26a8d1ceb114ccfbb2569 Mon Sep 17 00:00:00 2001 +From: Philipp Jungkamp <p.jungkamp@gmx.net> +Date: Tue, 28 May 2024 19:22:29 +0200 +Subject: [PATCH] NixOS: Search ONEVPLRT in /run/opengl-driver/lib + +--- + api/mfx_dispatch/linux/mfxloader.cpp | 2 ++ + .../suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/api/mfx_dispatch/linux/mfxloader.cpp b/api/mfx_dispatch/linux/mfxloader.cpp +index 39b6bff1..f76ed65d 100644 +--- a/api/mfx_dispatch/linux/mfxloader.cpp ++++ b/api/mfx_dispatch/linux/mfxloader.cpp +@@ -193,6 +193,7 @@ mfxStatus LoaderCtx::Init(mfxInitParam& par) + if (selected_runtime && strcmp(selected_runtime, "ONEVPL") == 0) { + libs.emplace_back(ONEVPLRT); + libs.emplace_back(MFX_MODULES_DIR "/" ONEVPLRT); ++ libs.emplace_back("/run/opengl-driver/lib/" ONEVPLRT); + } else if ((selected_runtime && strcmp(selected_runtime, "MSDK") == 0) || (platform != MFX_HW_UNKNOWN)) { + if (MFX_IMPL_BASETYPE(par.Implementation) == MFX_IMPL_AUTO || + MFX_IMPL_BASETYPE(par.Implementation) == MFX_IMPL_AUTO_ANY) { +@@ -213,6 +214,7 @@ mfxStatus LoaderCtx::Init(mfxInitParam& par) + } else { + libs.emplace_back(ONEVPLRT); + libs.emplace_back(MFX_MODULES_DIR "/" ONEVPLRT); ++ libs.emplace_back("/run/opengl-driver/lib/" ONEVPLRT); + } + + mfxStatus mfx_res = MFX_ERR_UNSUPPORTED; +diff --git a/tests/unit/suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp b/tests/unit/suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp +index dedee0b3..9657da4b 100644 +--- a/tests/unit/suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp ++++ b/tests/unit/suites/mfx_dispatch/linux/mfx_dispatch_test_cases_libs.cpp +@@ -123,6 +123,7 @@ TEST_P(DispatcherLibsTestParametrized, ShouldEnumerateCorrectLibNames) + { + libs.emplace_back(ONEVPLRT); + libs.emplace_back(modules_dir + "/" + ONEVPLRT); ++ libs.emplace_back("/run/opengl-driver/lib/" + ONEVPLRT); + } + + for (const std::string& lib : libs) +-- +2.44.0 + diff --git a/pkgs/development/libraries/isa-l/default.nix b/pkgs/development/libraries/isa-l/default.nix index 88fcbc04d586c..9a112fb1c4d93 100644 --- a/pkgs/development/libraries/isa-l/default.nix +++ b/pkgs/development/libraries/isa-l/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A collection of optimised low-level functions targeting storage applications"; + description = "Collection of optimised low-level functions targeting storage applications"; mainProgram = "igzip"; license = licenses.bsd3; homepage = "https://github.com/intel/isa-l"; diff --git a/pkgs/development/libraries/isl/generic.nix b/pkgs/development/libraries/isl/generic.nix index 31bd990645b59..8974839dca26a 100644 --- a/pkgs/development/libraries/isl/generic.nix +++ b/pkgs/development/libraries/isl/generic.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { homepage = "https://libisl.sourceforge.io/"; license = lib.licenses.lgpl21; - description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; + description = "Library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/itk/5.x.nix b/pkgs/development/libraries/itk/5.x.nix index 765b464e46a1c..c3086d86ac11f 100644 --- a/pkgs/development/libraries/itk/5.x.nix +++ b/pkgs/development/libraries/itk/5.x.nix @@ -1,5 +1,5 @@ import ./generic.nix rec { - version = "5.3.0"; - rev = "v${version}"; - sourceSha256 = "sha256-+qCd8Jzpl5fEPTUpLyjjFBkfgCn3+Lf4pi8QnjCwofs="; + version = "5.4.0"; + rev = "refs/tags/v${version}"; + sourceSha256 = "sha256-1RSWgH0iQ2NQNsieW2m37udXWQlqYslJNM3TXC9xeP4="; } diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index be59969aaecbe..54f725683a2e3 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { sha256 = sourceSha256; }; - patches = [ + patches = lib.optionals (lib.versionOlder version "5.4") [ (fetchpatch { name = "fix-gcc13-build"; url = "https://github.com/InsightSoftwareConsortium/ITK/commit/9a719a0d2f5f489eeb9351b0ef913c3693147a4f.patch"; diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index dba1fba20df60..1fc0e6fd0886c 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A high-capacity 2D color bar code (${subproject})"; + description = "High-capacity 2D color bar code (${subproject})"; longDescription = "JAB Code (Just Another Bar Code) is a high-capacity 2D color bar code, which can encode more data than traditional black/white (QR) codes. This is the ${subproject} part."; homepage = "https://jabcode.org/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 4a226a22c4dee..f5c5922e800ad 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.26.1"; + version = "1.26.2"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-PVZ4hltIprOeT3UEH3+xJ+TcZLekHV7cuw16rMmx/Rk="; + sha256 = "sha256-EyGbVhcsuEhLfKh0TPFjySFd9/Z8BEBhkslpfdu4er8="; }; installPhase = '' diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index be61630d17f4f..68b1c924214db 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-daemon"; - description = "Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes."; + description = "Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes"; maintainers = with lib.maintainers; [ rsynnest ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 40c66909213e1..6c9235117355a 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "1.4"; + version = "1.5"; pname = "commons-fileupload"; src = fetchurl { url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1avfv4gljp7flra767yzas54vfb6az9s1nhxfjv48jj2x0llxxkx"; + sha256 = "sha256-r7EGiih4qOCbjaL7Wg+plbe0m3CuFWXs/RmbfGLmj1g="; }; installPhase = '' tar xf ${src} diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 2547090523486..160388f97b518 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-io"; - description = "A library of utilities to assist with developing IO functionality"; + description = "Library of utilities to assist with developing IO functionality"; maintainers = with lib.maintainers; [ copumpkin ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index 4f928db4cf3b5..ddb3b17c1dae2 100644 --- a/pkgs/development/libraries/java/commons/math/default.nix +++ b/pkgs/development/libraries/java/commons/math/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-math/"; - description = "A library of lightweight, self-contained mathematics and statistics components"; + description = "Library of lightweight, self-contained mathematics and statistics components"; maintainers = with lib.maintainers; [ copumpkin ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index a2484ce830775..c4f9bf9773020 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://hsqldb.org"; - description = "A relational, embedable database management system written in Java and a set of related tools"; + description = "Relational, embedable database management system written in Java and a set of related tools"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.unix; license = licenses.bsd3; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index f08c860f57f6e..de197b7966ef0 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library that can write a lot of boilerplate for your Java project"; + description = "Library that can write a lot of boilerplate for your Java project"; mainProgram = "lombok"; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index e67425208657a..6fb5f8a14c676 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An implementation of JavaScript written in Java"; + description = "Implementation of JavaScript written in Java"; longDescription = '' Rhino is an open-source implementation of JavaScript written diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index fd263d91d426e..3adfd4c710e2e 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A XMPP (Jabber) client library for instant messaging and presence"; + description = "XMPP (Jabber) client library for instant messaging and presence"; homepage = "http://www.igniterealtime.org/projects/smack/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 40a46041caa2c..8678cde4370ae 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; - description = "A software implementation of the JBIG1 data compression standard"; + description = "Software implementation of the JBIG1 data compression standard"; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 902c0d77739c2..7541e6b0c1a31 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { url = "https://github.com/jemalloc/jemalloc/commit/d00ecee6a8dfa90afcb1bbc0858985c17bef6559.patch"; hash = "sha256-N5i4IxGJ4SSAgFiq5oGRnrNeegdk2flw9Sh2mP0yl4c="; }) + # fix linking with libc++, can be removed in the next update (after 5.3.0). + # https://github.com/jemalloc/jemalloc/pull/2348 + (fetchpatch { + url = "https://github.com/jemalloc/jemalloc/commit/4422f88d17404944a312825a1aec96cd9dc6c165.patch"; + hash = "sha256-dunkE7XHzltn5bOb/rSHqzpRniAFuGubBStJeCxh0xo="; + }) ]; configureFlags = diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index edf46fa4f51b7..fb6dbcea64782 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jitterentropy"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; rev = "v${version}"; - hash = "sha256-GSGlupTN1o8BbTN287beqYSRFDaXOk6SlIRvtjpvmhQ="; + hash = "sha256-USc9e/GyajJe58/Z201AO3Y+t3IPOOdJAaifEwvgm2Q="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 967886ae86c6d..39e10e2dbebd4 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jose"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - hash = "sha256-XkYvBjPmwhwo2p8/jTXazHRAgSGkI7LTLUlqbxMxlys="; + hash = "sha256-rMNPJaCtVpbwIkMQzBNpmRct6S/NelTwjmsuB0RP6R8="; }; nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index ab3d2be6f0102..943712e2b8dba 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "A JSON implementation in C"; + description = "JSON implementation in C"; longDescription = '' JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix index 410a767f99919..52ec487c06369 100644 --- a/pkgs/development/libraries/json-fortran/default.nix +++ b/pkgs/development/libraries/json-fortran/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "json-fortran"; - version = "8.4.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "jacobwilliams"; repo = pname; rev = version; - hash = "sha256-qy3CK8Op3YVNpXjq60UYq9V9qWBEXpX/li/lYxXW9Fk="; + hash = "sha256-nhT2zLyt3ORi35h9KzOiIuD50GGUCZ/Z5SX8UF3rqQs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 1f36ccdc051d4..9a04f8b1f4ef8 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; + description = "Library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; homepage = "https://gitlab.gnome.org/GNOME/json-glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 59572afc627ce..ea530a955f75d 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/open-source-parsers/jsoncpp"; - description = "A C++ library for interacting with JSON"; + description = "C++ library for interacting with JSON"; maintainers = with maintainers; [ ttuegel cpages ]; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 855c3cfcf2cd2..e17498031da6e 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A library to communicate using the JSON-RPC 2.0 specification"; + description = "Library to communicate using the JSON-RPC 2.0 specification"; homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/kcp/default.nix b/pkgs/development/libraries/kcp/default.nix index 29bab0087989a..2468ba22d3051 100644 --- a/pkgs/development/libraries/kcp/default.nix +++ b/pkgs/development/libraries/kcp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "A Fast and Reliable ARQ Protocol"; + description = "Fast and Reliable ARQ Protocol"; homepage = "https://github.com/skywind3000/kcp"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index d3688442f898d..3364d4926873f 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { propagatedBuildInputs = [ qtbase ]; meta = with lib; { - description = "A database connectivity and creation framework for various database vendors"; + description = "Database connectivity and creation framework for various database vendors"; mainProgram = "kdb3_sqlite3_dump"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/development/libraries/kddockwidgets/default.nix index a1020fe986797..a5cf5cb6fef2d 100644 --- a/pkgs/development/libraries/kddockwidgets/default.nix +++ b/pkgs/development/libraries/kddockwidgets/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "KDDockWidgets"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V4BMD1kYyaMlqNBo8otpV5yBt/PICzhBTkEMX9N3lbk="; + sha256 = "sha256-gKtW4UjeMUVzBIbV3GuSMtgzIy+N/VlaCc7PPZEHmmg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 2a264d47c24c9..c7a813058454c 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,6 +1,5 @@ { mkDerivation , lib -, fetchpatch , extra-cmake-modules , kauth , kconfig diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index 6e554b5faaadf..0e1633b2f1c12 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase, diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index a56e56a2fe092..1ed8619a2fa27 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, qtdeclarative, solid, threadweaver, kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index ee4e9584641c1..cdc8d4d32d23f 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, intltool, qtbase , accounts-qt, qtdeclarative, kaccounts-integration, kconfig, kcoreaddons, ki18n, kio, kirigami2 -, fetchpatch, signond +, signond }: mkDerivation { diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix index 5dc6b5f962e1f..2cb371588b870 100644 --- a/pkgs/development/libraries/kdsoap/default.nix +++ b/pkgs/development/libraries/kdsoap/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A Qt-based client-side and server-side SOAP component"; + description = "Qt-based client-side and server-side SOAP component"; longDescription = '' KD Soap is a Qt-based client-side and server-side SOAP component. diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index ff211b6b9c34a..73bb856de4163 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -89,6 +89,8 @@ stdenv.mkDerivation { ]; configureFlags = [ + "--with-hdbdir=/var/lib/heimdal" + "--with-libedit-include=${libedit.dev}/include" "--with-libedit-lib=${libedit}/lib" "--with-berkeley-db-include=${db.dev}/include" @@ -170,7 +172,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.heimdal.software"; changelog = "https://github.com/heimdal/heimdal/releases"; - description = "An implementation of Kerberos 5 (and some more stuff)"; + description = "Implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ h7x4 ]; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 9f3fbdbf7eb04..8dd68af4fd1d5 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -74,6 +74,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace config/shlib.conf \ --replace "'ld " "'${stdenv.cc.targetPrefix}ld " + '' + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + + '' + substituteInPlace ./config/config.guess --replace-fail /usr/bin/uname uname ''; libFolders = [ "util" "include" "lib" "build-tools" ]; diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix index 503cad45fd9e5..df2b9d5561f52 100644 --- a/pkgs/development/libraries/kissfft/default.nix +++ b/pkgs/development/libraries/kissfft/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A mixed-radix Fast Fourier Transform based up on the KISS principle"; + description = "Mixed-radix Fast Fourier Transform based up on the KISS principle"; homepage = "https://github.com/mborgerding/kissfft"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix index 991fd4d27a74b..6187d201f2598 100644 --- a/pkgs/development/libraries/kproperty/default.nix +++ b/pkgs/development/libraries/kproperty/default.nix @@ -21,7 +21,7 @@ mkDerivation rec { propagatedBuildInputs = [ qtbase ]; meta = with lib; { - description = "A property editing framework with editor widget similar to what is known from Qt Designer"; + description = "Property editing framework with editor widget similar to what is known from Qt Designer"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix index 1c8470204f803..19f2b89a56e04 100644 --- a/pkgs/development/libraries/kreport/default.nix +++ b/pkgs/development/libraries/kreport/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { buildInputs = [ qtdeclarative qtwebkit kconfig kcoreaddons kwidgetsaddons kguiaddons kproperty marble python3 ]; meta = with lib; { - description = "A framework for creation and generation of reports in multiple formats"; + description = "Framework for creation and generation of reports in multiple formats"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 37c918785fb9b..5c5ab34bc24cb 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://dbmx.net/kyotocabinet"; - description = "A library of routines for managing a database"; + description = "Library of routines for managing a database"; license = licenses.gpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 576d166f0ca74..6032e7051b990 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A high quality MPEG Audio Layer III (MP3) encoder"; + description = "High quality MPEG Audio Layer III (MP3) encoder"; homepage = "http://lame.sourceforge.net"; license = licenses.lgpl2; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index 50167f28a9db2..fffc7d8da23a4 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; + description = "Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index ec7129396540f..76bdcb7b9ba54 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; meta = with lib; { - description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; + description = "C++ API for FoLiA documents; an XML-based linguistic annotation format"; mainProgram = "folialint"; homepage = "https://proycon.github.io/folia/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 0b5fef292fcff..8fd3749ba1c3e 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = "sh bootstrap.sh"; meta = with lib; { - description = "This module contains useful functions for general use in the TiCC software stack and beyond."; + description = "This module contains useful functions for general use in the TiCC software stack and beyond"; homepage = "https://github.com/LanguageMachines/ticcutils"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index 6a3e31bcd5536..3bf40e6007e69 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "A rule-based tokenizer for natural language"; + description = "Rule-based tokenizer for natural language"; mainProgram = "ucto"; homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index a274b6193eddc..b1f15df58a173 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { preConfigure = "sh bootstrap.sh"; meta = with lib; { - description = "A rule-based tokenizer for natural language"; + description = "Rule-based tokenizer for natural language"; homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/lcrq/default.nix b/pkgs/development/libraries/lcrq/default.nix index 865ec4697326f..3d1818cf779db 100644 --- a/pkgs/development/libraries/lcrq/default.nix +++ b/pkgs/development/libraries/lcrq/default.nix @@ -4,7 +4,7 @@ lib }: stdenv.mkDerivation (finalAttrs: { - name = "lcrq"; + pname = "lcrq"; version = "0.1.2"; src = fetchFromGitea { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://codeberg.org/librecast/lcrq/src/tag/v${finalAttrs.version}/CHANGELOG.md"; - description = "Librecast RaptorQ library."; + description = "Librecast RaptorQ library"; homepage = "https://librecast.net/lcrq.html"; license = [ lib.licenses.gpl2 lib.licenses.gpl3 ]; maintainers = with lib.maintainers; [ albertchae aynish DMills27 jasonodoom jleightcap ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index cdcf21edd799c..6c5fa48affc1a 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_42 , cmocka , wafHook +, buildPackages , libxcrypt , testers }: @@ -62,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: { "--bundled-libraries=NONE" "--builtin-libraries=replace" "--without-ldb-lmdb" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; # python-config from build Python gives incorrect values when cross-compiling. @@ -77,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { broken = stdenv.isDarwin; - description = "A LDAP-like embedded database"; + description = "LDAP-like embedded database"; homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; pkgConfigModules = [ "ldb" ]; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 80038b79442af..d3bd349cc8e01 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/puppetlabs/leatherman/"; - description = "A collection of C++ and CMake utility libraries"; + description = "Collection of C++ and CMake utility libraries"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index efd65c1695d49..7abf7fcacf6ed 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ flokli ]; license = lib.licenses.lgpl3; - description = "An opensource database of photographic lenses and their characteristics"; + description = "Opensource database of photographic lenses and their characteristics"; homepage = "https://lensfun.github.io"; }; } diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index e0bd674e4daad..33c2f220e40df 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An open source clone of the Motif widget set"; + description = "Open source clone of the Motif widget set"; homepage = "https://lesstif.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index a098a0ea5b6b3..db99f73cd796b 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -2,38 +2,32 @@ , addOpenGLRunpath , cmake , fetchFromGitHub -, fmt_9 -, spdlog +, intel-compute-runtime +, openvino , stdenv -, substituteAll }: stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.16.15"; + version = "1.17.6"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-J+XIqaV1ThD0RqqcyIkzvTWCkIztjkHzGzUbj0qojJs="; + hash = "sha256-vtijha0nXHEp5oLnmdtbD80Qa2dgMykZXhQ2yfbk+mY="; }; - patches = [ - (substituteAll { - src = ./system-spdlog.diff; - spdlog = lib.getDev spdlog; - }) - ]; - nativeBuildInputs = [ cmake addOpenGLRunpath ]; - buildInputs = [ fmt_9 ]; - postFixup = '' addOpenGLRunpath $out/lib/libze_loader.so ''; + passthru.tests = { + inherit intel-compute-runtime openvino; + }; + meta = with lib; { description = "oneAPI Level Zero Specification Headers and Loader"; homepage = "https://github.com/oneapi-src/level-zero"; diff --git a/pkgs/development/libraries/level-zero/system-spdlog.diff b/pkgs/development/libraries/level-zero/system-spdlog.diff deleted file mode 100644 index dee5432d0f7f9..0000000000000 --- a/pkgs/development/libraries/level-zero/system-spdlog.diff +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5e4af80..a54eecb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,9 @@ - # Copyright (C) 2020-2024 Intel Corporation - # SPDX-License-Identifier: MIT - -+add_compile_definitions(SPDLOG_FMT_EXTERNAL) -+add_compile_definitions(FMT_HEADER_ONLY) -+ - cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR) - set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -@@ -58,7 +60,7 @@ elseif(Git_FOUND) - endif() - - include(FetchContent) --set(SPDLOG_ROOT "${FETCHCONTENT_BASE_DIR}/spdlog-src") -+set(SPDLOG_ROOT "@spdlog@") - - # Update other relevant variables to include the patch - set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt -index cb6cfb1..599338a 100644 ---- a/source/utils/CMakeLists.txt -+++ b/source/utils/CMakeLists.txt -@@ -1,16 +1,6 @@ - # Copyright (C) 2024 Intel Corporation - # SPDX-License-Identifier: MIT - --include(FetchContent) --set(SPDLOG_REPO https://github.com/gabime/spdlog) --set(SPDLOG_TAG v1.13.0) --FetchContent_Declare( -- spdlog -- GIT_REPOSITORY ${SPDLOG_REPO} -- GIT_TAG ${SPDLOG_TAG} --) --FetchContent_makeAvailable(spdlog) -- - add_library(utils - STATIC - "logging.h" -@@ -19,5 +9,5 @@ add_library(utils - - target_include_directories(utils - PUBLIC -- ${FETCHCONTENT_BASE_DIR}/spdlog-src/include -+ @spdlog@/include - ) -diff --git a/source/utils/logging.h b/source/utils/logging.h -index 4aad451..c8c4cc3 100644 ---- a/source/utils/logging.h -+++ b/source/utils/logging.h -@@ -16,8 +16,8 @@ - #include <string> - #include <vector> - --#include "spdlog/sinks/basic_file_sink.h" --#include "spdlog/spdlog.h" -+#include <spdlog/sinks/basic_file_sink.h> -+#include <spdlog/spdlog.h> - - namespace loader { - diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix deleted file mode 100644 index 828a6891e293c..0000000000000 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, libX11, zlib -, static ? stdenv.hostPlatform.isStatic -, withX ? !stdenv.isDarwin }: - -stdenv.mkDerivation { - pname = "libAfterImage"; - version = "1.20"; - - src = fetchurl { - name = "libAfterImage-1.20.tar.bz2"; - urls = [ - "https://sourceforge.net/projects/afterstep/files/libAfterImage/1.20/libAfterImage-1.20.tar.bz2/download" - "ftp://ftp.afterstep.org/stable/libAfterImage/libAfterImage-1.20.tar.bz2" - ]; - sha256 = "0n74rxidwig3yhr6fzxsk7y19n1nq1f296lzrvgj5pfiyi9k48vf"; - }; - - patches = [ - # add back --with-gif option - (fetchpatch { - name = "libafterimage-gif.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-gif.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; - sha256 = "16pa94wlqpd7h6mzs4f0qm794yk1xczrwsgf93kdd3g0zbjq3rnr"; - }) - - # fix build with newer giflib - (fetchpatch { - name = "libafterimage-giflib5-v2.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-giflib5-v2.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; - sha256 = "0qwydqy9bm73cg5n3vm97aj4jfi70p7fxqmfbi54vi78z593brln"; - stripLen = 1; - }) - - # fix build with newer libpng - (fetchpatch { - name = "libafterimage-libpng15.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-libpng15.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; - sha256 = "1qyvf7786hayasfnnilfbri3p99cfz5wjpbli3gdqj2cvk6mpydv"; - }) - - # fix an ldconfig problem - (fetchpatch { - name = "libafterimage-makefile.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-makefile.in.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; - sha256 = "1n6fniz6dldms615046yhc4mlg9gb53y4yfia8wfz6szgq5zicj4"; - }) - - # Fix build failure against binutils-2.36: - # https://sourceforge.net/p/afterstep/bugs/5/ - (fetchpatch { - name = "binutils-2.36.patch"; - url = "https://sourceforge.net/p/afterstep/bugs/5/attachment/libafterimage-binutils-2.36-support.patch"; - sha256 = "1cfgm2ffwlsmhvvfmrxlglddaigr99k88d5xqva9pkl3mmzy3jym"; - # workaround '-p0' patchflags below. - stripLen = 1; - }) - - # fix https://github.com/root-project/root/issues/10990 - (fetchpatch { - url = "https://github.com/root-project/root/pull/11243/commits/e177a477b0be05ef139094be1e96a99ece06350a.diff"; - hash = "sha256-2DQmJGHmATHawl3dk9dExncVe1sXzJQyy4PPwShoLTY="; - stripLen = 5; - }) - ]; - patchFlags = [ "-p0" ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ giflib libjpeg libpng zlib ] ++ lib.optional withX libX11; - - preConfigure = '' - rm -rf {libjpeg,libpng,libungif,zlib}/ - substituteInPlace Makefile.in \ - --replace "include .depend" "" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile.in \ - --replace "-soname," "-install_name,$out/lib/" - ''; - - configureFlags = [ - "--with-gif" - "--disable-mmx-optimization" - "--${if static then "enable" else "disable"}-staticlibs" - "--${if !static then "enable" else "disable"}-sharedlibs" - "--${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"; - platforms = platforms.unix; - maintainers = [ maintainers.veprbl ]; - license = licenses.lgpl21; - }; -} diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 195f77d19231e..4b00de8115735 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, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, laszip_2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost libgeotiff libtiff laszip_2 ]; cmakeFlags = [ "-DWITH_LASZIP=ON" # libLAS is currently not compatible with LASzip 3, # see https://github.com/libLAS/libLAS/issues/144. - "-DLASZIP_INCLUDE_DIR=${LASzip2}/include" + "-DLASZIP_INCLUDE_DIR=${laszip_2}/include" "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 1301f9fe923d9..7f7f93c37949d 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.5.0"; + version = "1.5.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-uEaBI2jHlMdVprMGRZe/8HszO3nEBUJaJtvJjrMOjE4="; + hash = "sha256-dH0VPIt6SGTDcb1I72cKnNlyqZ3dptvKmMDjOd17BfA="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 8e68ea3f9cb63..e2cd9624bc40f 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "A library to allow applications to export a menu into the Unity Menu bar"; + description = "Library to allow applications to export a menu into the Unity Menu bar"; homepage = "https://launchpad.net/libappindicator"; license = with licenses; [ lgpl21 lgpl3 ]; pkgConfigModules = { diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix index 77f498967ecc9..767d9228f33ad 100644 --- a/pkgs/development/libraries/libarchive-qt/default.nix +++ b/pkgs/development/libraries/libarchive-qt/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { ]; meta = with lib; { - description = "A Qt based archiving solution with libarchive backend"; + description = "Qt based archiving solution with libarchive backend"; mainProgram = "archiver"; homepage = "https://gitlab.com/marcusbritanicus/libarchive-qt"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index ae9ba47cdc3fa..6e2ef83c5eace 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; + description = "Key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; longDescription = '' A password-hashing function created by by Alex Biryukov, Daniel Dinu, and Dmitry Khovratovich. Argon2 was declared the winner of the Password diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index 5247aa5a94f57..0ad0a264f0074 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A simple header-only C++ argument parser library"; + description = "Simple header-only C++ argument parser library"; homepage = "https://github.com/Taywee/args"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index 423b8cca69150..09e056373d27e 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://0pointer.de/lennart/projects/libasyncns/"; - description = "A C library for Linux/Unix for executing name service queries asynchronously"; + description = "C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index e7170953d0ca5..bf83a9e8456ac 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library for semi-portable access to hardware-provided atomic memory update operations"; + description = "Library for semi-portable access to hardware-provided atomic memory update operations"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; platforms = with lib.platforms; unix ++ windows; diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/development/libraries/libaudec/default.nix index 5340f62a32edc..ffe5f785acd5d 100644 --- a/pkgs/development/libraries/libaudec/default.nix +++ b/pkgs/development/libraries/libaudec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; meta = with lib; { - description = "A library for reading and resampling audio files"; + description = "Library for reading and resampling audio files"; homepage = "https://www.zrythm.org"; license = licenses.agpl3Plus; mainProgram = "audec"; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 283c2034be7e4..8cc098d81087a 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -123,7 +123,7 @@ let meta = with lib; { homepage = "https://libav.org/"; - description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; + description = "Complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index 9e507188aad39..39697b4af521a 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "The BLAKE2 family of cryptographic hash functions"; + description = "BLAKE2 family of cryptographic hash functions"; homepage = "https://blake2.net/"; pkgConfigModules = [ "libb2" ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index 32c199a57c4e5..1be572671e029 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { }; meta = with lib; { - description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; + description = "C library that may be linked into a C/C++ program to produce symbolic backtraces"; homepage = "https://github.com/ianlancetaylor/libbacktrace"; maintainers = with maintainers; [ twey ]; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 3ed92edd78e11..13f65a082bd69 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/binaryanalysisplatform/bap-bindings"; - description = "A C library for interacting with BAP"; + description = "C library for interacting with BAP"; maintainers = [ maintainers.maurer ]; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index ce570b76bc082..158493b80e905 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 8ec4b709b162f..7679aefe5b95a 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/storaged-project/libblockdev/raw/${finalAttrs.src.rev}/NEWS.rst"; - description = "A library for manipulating block devices"; + description = "Library for manipulating block devices"; homepage = "http://storaged.org/libblockdev/"; license = with lib.licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the utils maintainers = with lib.maintainers; [ johnazoidberg ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 552259ce3babe..f50172851d618 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration +{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk17, ant, stripJavaArchivesHook , withAACS ? false, libaacs , withBDplus ? false, libbdplus diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 9e80d17b8a033..fa8b6b65950bc 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/libbsd/libbsd.git"; }; + # Fix undefined reference errors with version script under LLVM. + configureFlags = lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") [ "LDFLAGS=-Wl,--undefined-version" ]; + meta = with lib; { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index 08fc569312501..f0af39cc88108 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/storaged-project/libbytesize"; - description = "A tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; + description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; mainProgram = "bscalc"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 26d8c79443a04..6b99439fe017e 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://caca.zoy.org/wiki/libcaca"; - description = "A graphics library that outputs text instead of pixels"; + description = "Graphics library that outputs text instead of pixels"; longDescription = '' libcaca is a graphics library that outputs text instead of pixels, so that it can work on older video cards or text terminals. It is not unlike the diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 10c6706dc70d8..6bfb780d31a35 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An implementation of the XDG Sound Theme and Name Specifications"; + description = "Implementation of the XDG Sound Theme and Name Specifications"; mainProgram = "canberra-gtk-play"; longDescription = '' libcanberra is an implementation of the XDG Sound Theme and Name diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 5b68a6526f1d1..ab562d9c1999c 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "A C library implementing the Cangjie input method"; + description = "C library implementing the Cangjie input method"; longDescription = '' libcangjie is a library implementing the Cangjie input method. ''; diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index fa873672dbcfa..8e7bb7e2964a9 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A portable library for controlling audio CDs"; + description = "Portable library for controlling audio CDs"; mainProgram = "libcdaudio-config"; homepage = "https://libcdaudio.sourceforge.net"; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 2124e696d343e..820ac97a434f3 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with lib; { - description = "A library for OS-independent CD-ROM and CD image access"; + description = "Library for OS-independent CD-ROM and CD image access"; longDescription = '' GNU libcdio is a library for OS-independent CD-ROM and CD image access. It includes a library for working with diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 64695aaa55d72..885413982dad8 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: +{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { pname = "libcdr"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h meta = { - description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; + description = "Library providing ability to interpret and import Corel Draw drawings into various applications"; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libcdr"; platforms = lib.platforms.all; license = lib.licenses.mpl20; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index f7d064e0de384..c33fdcf00f33c 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { preFixup = "rm -rf lib"; meta = with lib; { - description = "A cross-platform IRC framework written with Qt"; + description = "Cross-platform IRC framework written with Qt"; homepage = "https://communi.github.io"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 5c06808f67c3e..c0f02320c7796 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; - description = "A simple library for processing structured configuration files"; + description = "Simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/development/libraries/libcork/default.nix index 87a068c24d1a9..c013775fcaeb0 100644 --- a/pkgs/development/libraries/libcork/default.nix +++ b/pkgs/development/libraries/libcork/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/dcreager/libcork"; - description = "A simple, easily embeddable cross-platform C library"; + description = "Simple, easily embeddable cross-platform C library"; mainProgram = "cork-hash"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index 2aa36bfe99146..816bbe41708a9 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A simple but powerful template language for C++"; + description = "Simple but powerful template language for C++"; longDescription = '' CTemplate is a simple but powerful template language for C++. It emphasizes separating logic from presentation: it is impossible to diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index b9c3f82558a45..1858ca1e97e92 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "4.0.10-unstable-2024-04-15"; + version = "4.0.10-unstable-2024-05-26"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "25541e312f7094e9c90895000d435af520d42418"; - sha256 = "d5uhtlO+28uc2Xnf5trXsy43jgmzBHs2jZhCK57qRM4="; + rev = "c62fe9963148f283b2fbb7eb9888785cfb16d77c"; + sha256 = "XxXH6pE2v6WTh1ATJ7Fgd3SFw49L44YchtMlPKX4kYw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 1e7bb7d05e3ab..c947079038722 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A library to delight your users with fancy features"; + description = "Library to delight your users with fancy features"; mainProgram = "dazzle-list-counters"; longDescription = '' The libdazzle library is a companion library to GObject and GTK. It diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index ae5294d3104f7..4f9efb6bec40c 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.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -31,6 +31,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "bytes", + "crypto-common", + "generic-array", +] + +[[package]] name = "aes" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -55,9 +66,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -114,16 +125,58 @@ dependencies = [ ] [[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] name = "anstyle" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -152,8 +205,24 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl 0.1.0", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.34", +] + +[[package]] +name = "asn1-rs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" +dependencies = [ + "asn1-rs-derive 0.5.0", + "asn1-rs-impl 0.2.0", "displaydoc", "nom", "num-traits", @@ -171,7 +240,19 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure 0.13.1", ] [[package]] @@ -186,6 +267,29 @@ dependencies = [ ] [[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.2.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] name = "async-channel" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -198,12 +302,11 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -228,7 +331,7 @@ version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98892ebee4c05fc66757e600a7466f0d9bfcde338f645d64add323789f26cb36" dependencies = [ - "async-channel 2.2.0", + "async-channel 2.3.1", "base64 0.21.7", "bytes", "chrono", @@ -267,9 +370,9 @@ dependencies = [ [[package]] name = "async-smtp" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8709c0d4432be428a88a06746689a9cb543e8e27ef7f61ca4d0455003a3d8c5b" +checksum = "928ea96f04e1260036cb01f82c1e5dc7c3b478e7b9463c87712297784ce3cdc6" dependencies = [ "anyhow", "base64 0.13.1", @@ -290,7 +393,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -308,6 +411,17 @@ dependencies = [ ] [[package]] +name = "attohttpc" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" +dependencies = [ + "http 0.2.12", + "log", + "url", +] + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -315,9 +429,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", @@ -341,7 +455,7 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 1.0.0", "tokio", "tokio-tungstenite", "tower", @@ -365,17 +479,28 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", "tracing", ] [[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "getrandom 0.2.12", + "instant", + "rand 0.8.5", +] + +[[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -423,6 +548,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -456,6 +587,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] name = "blake3" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -506,10 +649,16 @@ dependencies = [ ] [[package]] +name = "bounded-integer" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78a6932c88f1d2c29533a3b8a5f5a2f84cc19c3339b431677c3160c5c2e6ca85" + +[[package]] name = "brotli" -version = "3.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -518,9 +667,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -568,6 +717,9 @@ name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] [[package]] name = "camellia" @@ -627,12 +779,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfb-mode" @@ -650,6 +799,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] name = "charset" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -661,16 +827,17 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", + "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -708,6 +875,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] @@ -757,10 +925,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -835,6 +1009,21 @@ dependencies = [ ] [[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] name = "crc24" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -949,10 +1138,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] [[package]] +name = "crypto_box" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16182b4f39a82ec8a6851155cc4c0cda3065bb1db33651726a29e1951de0f009" +dependencies = [ + "aead", + "chacha20", + "crypto_secretbox", + "curve25519-dalek 4.1.2", + "salsa20", + "serdect", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto_secretbox" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1" +dependencies = [ + "aead", + "chacha20", + "cipher", + "generic-array", + "poly1305", + "salsa20", + "subtle", + "zeroize", +] + +[[package]] name = "curve25519-dalek" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -990,7 +1212,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -1064,10 +1286,23 @@ dependencies = [ ] [[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "default-net" @@ -1075,33 +1310,35 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4898b43aed56499fad6b294d15b3e76a51df68079bf492e5daae38ca084e003" dependencies = [ - "dlopen2", + "dlopen2 0.4.1", "libc", "memalloc", - "netlink-packet-core", - "netlink-packet-route", + "netlink-packet-core 0.5.0", + "netlink-packet-route 0.15.0", "netlink-sys", "once_cell", - "system-configuration", - "windows", + "system-configuration 0.5.1", + "windows 0.32.0", ] [[package]] name = "deltachat" -version = "1.136.3" +version = "1.140.2" dependencies = [ "ansi_term", "anyhow", - "async-channel 2.2.0", + "async-broadcast", + "async-channel 2.3.1", "async-imap", "async-native-tls", "async-smtp", "async_zip", "backtrace", - "base64 0.21.7", + "base64 0.22.1", "brotli", "chrono", "criterion", + "deltachat-contact-tools", "deltachat-time", "deltachat_derive", "email", @@ -1111,12 +1348,14 @@ dependencies = [ "fd-lock", "format-flowed", "futures", - "futures-lite", + "futures-lite 2.3.0", "hex", "hickory-resolver", "humansize", "image", "iroh", + "iroh-gossip", + "iroh-net", "kamadak-exif", "lettre_email", "libc", @@ -1127,21 +1366,19 @@ dependencies = [ "num-traits", "num_cpus", "once_cell", - "openssl-src", "parking_lot", "percent-encoding", "pgp", - "pin-project", "pretty_assertions", - "pretty_env_logger", "proptest", "qrcodegen", "quick-xml", + "quinn", "quoted_printable", "rand 0.8.5", "ratelimit", "regex", - "reqwest", + "reqwest 0.11.27", "rusqlite", "rust-hsluv", "sanitize-filename", @@ -1168,14 +1405,26 @@ dependencies = [ ] [[package]] +name = "deltachat-contact-tools" +version = "0.0.0" +dependencies = [ + "anyhow", + "chrono", + "once_cell", + "regex", + "rusqlite", +] + +[[package]] name = "deltachat-jsonrpc" -version = "1.136.3" +version = "1.140.2" dependencies = [ "anyhow", - "async-channel 2.2.0", + "async-channel 2.3.1", "axum", - "base64 0.21.7", + "base64 0.22.1", "deltachat", + "deltachat-contact-tools", "env_logger", "futures", "log", @@ -1193,33 +1442,33 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.136.3" +version = "1.140.2" dependencies = [ "ansi_term", "anyhow", "deltachat", "dirs", "log", - "pretty_env_logger", "rusqlite", "rustyline", "tokio", + "tracing-subscriber", ] [[package]] name = "deltachat-rpc-server" -version = "1.136.3" +version = "1.140.2" dependencies = [ "anyhow", "deltachat", "deltachat-jsonrpc", - "env_logger", - "futures-lite", + "futures-lite 2.3.0", "log", "serde", "serde_json", "tokio", "tokio-util", + "tracing-subscriber", "yerpc", ] @@ -1232,12 +1481,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "deltachat_ffi" -version = "1.136.3" +version = "1.140.2" dependencies = [ "anyhow", "deltachat", @@ -1260,7 +1509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", - "der_derive", + "der_derive 0.6.1", "pem-rfc7468 0.6.0", "zeroize", ] @@ -1272,6 +1521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", + "der_derive 0.7.2", "pem-rfc7468 0.7.0", "zeroize", ] @@ -1282,7 +1532,21 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs 0.6.1", "displaydoc", "nom", "num-bigint", @@ -1303,12 +1567,24 @@ dependencies = [ ] [[package]] +name = "der_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "deranged" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", + "serde", ] [[package]] @@ -1356,6 +1632,27 @@ dependencies = [ ] [[package]] +name = "derive_more" +version = "1.0.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0-beta.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "unicode-xid", +] + +[[package]] name = "des" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1441,7 +1738,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -1457,6 +1754,17 @@ dependencies = [ ] [[package]] +name = "dlopen2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" +dependencies = [ + "libc", + "once_cell", + "winapi", +] + +[[package]] name = "dlopen2_derive" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1484,6 +1792,24 @@ dependencies = [ ] [[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "duct" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" +dependencies = [ + "libc", + "once_cell", + "os_pipe", + "shared_child", +] + +[[package]] name = "dyn-clone" version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1532,6 +1858,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8 0.10.2", + "serde", "signature 2.2.0", ] @@ -1558,6 +1885,7 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.2", "ed25519 2.2.3", + "rand_core 0.6.4", "serde", "sha2 0.10.8", "subtle", @@ -1750,7 +2078,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -1763,20 +2091,50 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", +] + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", ] [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1786,6 +2144,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +dependencies = [ + "serde", +] + +[[package]] +name = "erased_set" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a5aa24577083f8190ad401e376b55887c7cd9083ae95d83ceec5d28ea78125" + +[[package]] name = "errno" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1818,6 +2191,17 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" @@ -1829,9 +2213,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.2.0", "pin-project-lite", @@ -1851,9 +2235,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fast-socks5" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbcc731f3c17a5053e07e6a2290918da75cd8b9b1217b419721f715674ac520c" +checksum = "f89f36d4ee12370d30d57b16c7e190950a1a916e7dbbb5fd5a412f5ef913fe84" dependencies = [ "anyhow", "async-trait", @@ -1874,6 +2258,15 @@ dependencies = [ [[package]] name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" @@ -1993,6 +2386,12 @@ name = "format-flowed" version = "1.0.0" [[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] name = "futures" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2008,6 +2407,17 @@ dependencies = [ ] [[package]] +name = "futures-buffered" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02dcae03ee5afa5ea17b1aebc793806b8ddfc6dc500e0b8e8e1eb30b9dad22c0" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", +] + +[[package]] name = "futures-channel" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2018,6 +2428,20 @@ dependencies = [ ] [[package]] +name = "futures-concurrency" +version = "7.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ee14e256b9143bfafbf2fddeede6f396650bacf95d06fc1b3f2b503df129a0" +dependencies = [ + "bitvec", + "futures-core", + "futures-lite 1.13.0", + "pin-project", + "slab", + "smallvec", +] + +[[package]] name = "futures-core" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2042,11 +2466,26 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.2.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.1", "futures-core", "futures-io", "parking", @@ -2061,7 +2500,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -2077,6 +2516,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[package]] name = "futures-util" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2095,6 +2540,22 @@ dependencies = [ ] [[package]] +name = "genawaiter" +version = "0.99.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86bd0361bcbde39b13475e6e36cb24c329964aa2611be285289d1e4b751c1a0" +dependencies = [ + "futures-core", + "genawaiter-macro", +] + +[[package]] +name = "genawaiter-macro" +version = "0.99.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b32dfe1fdfc0bbde1f22a5da25355514b5e450c33a6af6770884c8750aedfbc" + +[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2141,9 +2602,35 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand 0.8.5", + "smallvec", + "spinning_top", +] [[package]] name = "group" @@ -2169,9 +2656,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2187,25 +2674,6 @@ dependencies = [ ] [[package]] -name = "h2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.1.0", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] name = "half" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2278,9 +2746,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" dependencies = [ "cfg-if", "futures-util", @@ -2316,6 +2784,22 @@ dependencies = [ ] [[package]] +name = "hmac-sha1" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b05da5b9e5d4720bfb691eebb2b9d42da3570745da71eac8a1f5bb7e59aab88" +dependencies = [ + "hmac", + "sha1", +] + +[[package]] +name = "hmac-sha256" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735" + +[[package]] name = "home" version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2336,6 +2820,12 @@ dependencies = [ ] [[package]] +name = "hostname-validator" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2" + +[[package]] name = "http" version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2405,9 +2895,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.2.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370" +checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" dependencies = [ "backtrace", "os_info", @@ -2442,7 +2932,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.24", + "h2", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2465,7 +2955,6 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.2", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -2474,6 +2963,38 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.12", + "hyper 0.14.28", + "rustls 0.21.11", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.2.0", + "hyper-util", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", ] [[package]] @@ -2496,6 +3017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", + "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", @@ -2503,6 +3025,9 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2516,7 +3041,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2564,25 +3089,56 @@ dependencies = [ ] [[package]] +name = "igd-next" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" +dependencies = [ + "async-trait", + "attohttpc", + "bytes", + "futures", + "http 0.2.12", + "hyper 0.14.28", + "log", + "rand 0.8.5", + "tokio", + "url", + "xmltree", +] + +[[package]] name = "image" -version = "0.24.9" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", "color_quant", "gif", - "jpeg-decoder", + "image-webp", "num-traits", "png", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +dependencies = [ + "byteorder", + "thiserror", ] [[package]] name = "imap-proto" -version = "0.16.4" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e70cd66882c8cb1c9802096ba75212822153c51478dc61621e1a22f6c92361" +checksum = "de555d9526462b6f9ece826a26fb7c67eca9a0245bd9ff84fa91972a5d5d8856" dependencies = [ "nom", ] @@ -2607,6 +3163,15 @@ 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 = "ipconfig" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2615,7 +3180,7 @@ dependencies = [ "socket2", "widestring", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -2637,7 +3202,7 @@ dependencies = [ "bytes", "default-net", "der 0.6.1", - "derive_more", + "derive_more 0.99.17", "dirs-next", "ed25519-dalek 1.0.1", "futures", @@ -2648,13 +3213,13 @@ dependencies = [ "quic-rpc", "quinn", "rand 0.7.3", - "rcgen", + "rcgen 0.10.0", "ring 0.16.20", - "rustls", - "rustls-webpki", + "rustls 0.21.11", + "rustls-webpki 0.101.7", "serde", "serde-error", - "ssh-key", + "ssh-key 0.5.1", "tempfile", "thiserror", "tokio", @@ -2664,11 +3229,224 @@ dependencies = [ "tracing-futures", "tracing-subscriber", "walkdir", - "x509-parser", + "x509-parser 0.14.0", "zeroize", ] [[package]] +name = "iroh-base" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1be0b442ed44d20905cf77c673169906c883e05c829e3fb303b131e925139fc" +dependencies = [ + "aead", + "anyhow", + "crypto_box", + "data-encoding", + "derive_more 1.0.0-beta.6", + "ed25519-dalek 2.1.1", + "getrandom 0.2.12", + "hex", + "iroh-blake3", + "once_cell", + "postcard", + "rand 0.8.5", + "rand_core 0.6.4", + "serde", + "serde-error", + "ssh-key 0.6.6", + "thiserror", + "ttl_cache", + "url", + "zeroize", +] + +[[package]] +name = "iroh-blake3" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbba31f40a650f58fa28dd585a8ca76d8ae3ba63aacab4c8269004a0c803930" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + +[[package]] +name = "iroh-gossip" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "857aa77a0b29283edf99224bd12cd739684c5873e639b85adb38b8d1d777162d" +dependencies = [ + "anyhow", + "bytes", + "derive_more 1.0.0-beta.6", + "ed25519-dalek 2.1.1", + "futures-lite 2.3.0", + "genawaiter", + "indexmap", + "iroh-base", + "iroh-blake3", + "iroh-metrics", + "iroh-net", + "postcard", + "rand 0.8.5", + "rand_core 0.6.4", + "serde", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "iroh-metrics" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd54b9cf342b2618efc8d3ff6cdcd083fa5a2cf6cc78bb473bd32e228eabb40e" +dependencies = [ + "anyhow", + "erased_set", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "once_cell", + "prometheus-client", + "reqwest 0.12.4", + "serde", + "struct_iterable", + "time 0.3.34", + "tokio", + "tracing", +] + +[[package]] +name = "iroh-net" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a744000e6c5704479eeb4751eb23b9b8e7e56a0fc484beb8831694fc93e378f" +dependencies = [ + "aead", + "anyhow", + "axum", + "backoff", + "base64 0.22.1", + "bytes", + "der 0.7.8", + "derive_more 1.0.0-beta.6", + "duct", + "flume", + "futures-buffered", + "futures-concurrency", + "futures-lite 2.3.0", + "futures-sink", + "futures-util", + "governor", + "hex", + "hickory-proto", + "hickory-resolver", + "hostname", + "http 1.1.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", + "igd-next", + "iroh-base", + "iroh-metrics", + "iroh-quinn", + "iroh-quinn-proto", + "iroh-quinn-udp", + "libc", + "netdev", + "netlink-packet-core 0.7.0", + "netlink-packet-route 0.17.1", + "netlink-sys", + "num_enum", + "once_cell", + "parking_lot", + "pin-project", + "pkarr", + "postcard", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.12.1", + "reqwest 0.12.4", + "ring 0.17.8", + "rtnetlink", + "rustls 0.21.11", + "rustls-webpki 0.101.7", + "serde", + "smallvec", + "socket2", + "strum", + "stun-rs", + "surge-ping", + "thiserror", + "time 0.3.34", + "tokio", + "tokio-rustls 0.24.1", + "tokio-rustls-acme", + "tokio-util", + "tracing", + "url", + "watchable", + "webpki-roots 0.25.4", + "windows 0.51.1", + "wmi", + "x509-parser 0.15.1", + "z32", +] + +[[package]] +name = "iroh-quinn" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "906875956feb75d3d41d708ddaffeb11fdb10cd05f23efbcb17600037e411779" +dependencies = [ + "bytes", + "iroh-quinn-proto", + "iroh-quinn-udp", + "pin-project-lite", + "rustc-hash", + "rustls 0.21.11", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "iroh-quinn-proto" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6bf92478805e67f2320459285496e1137edf5171411001a0d4d85f9bbafb792" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring 0.17.8", + "rustc-hash", + "rustls 0.21.11", + "rustls-native-certs", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "iroh-quinn-udp" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc7915b3a31f08ee0bc02f73f4d61a5d5be146a1081ef7f70622a11627fd314" +dependencies = [ + "bytes", + "libc", + "socket2", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] name = "is-terminal" version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2701,12 +3479,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] name = "js-sys" version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2782,9 +3554,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -2854,9 +3626,9 @@ dependencies = [ [[package]] name = "mailparse" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d096594926cab442e054e047eb8c1402f7d5b2272573b97ba68aa40629f9757" +checksum = "3da03d5980411a724e8aaf7b61a7b5e386ec55a7fb49ee3d0ff79efc7e5e7c7e" dependencies = [ "charset", "data-encoding", @@ -2895,6 +3667,12 @@ dependencies = [ ] [[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] name = "memalloc" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2973,6 +3751,23 @@ dependencies = [ ] [[package]] +name = "netdev" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb353f5a5a852d5cc779c1c80bec0bd14a696ef832f3a761cb10091802c37109" +dependencies = [ + "dlopen2 0.5.0", + "libc", + "memalloc", + "netlink-packet-core 0.7.0", + "netlink-packet-route 0.17.1", + "netlink-sys", + "once_cell", + "system-configuration 0.6.0", + "windows 0.54.0", +] + +[[package]] name = "netlink-packet-core" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2985,6 +3780,17 @@ dependencies = [ ] [[package]] +name = "netlink-packet-core" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" +dependencies = [ + "anyhow", + "byteorder", + "netlink-packet-utils", +] + +[[package]] name = "netlink-packet-route" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2994,7 +3800,21 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "libc", - "netlink-packet-core", + "netlink-packet-core 0.5.0", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-route" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "byteorder", + "libc", + "netlink-packet-core 0.7.0", "netlink-packet-utils", ] @@ -3011,14 +3831,31 @@ dependencies = [ ] [[package]] +name = "netlink-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" +dependencies = [ + "bytes", + "futures", + "log", + "netlink-packet-core 0.7.0", + "netlink-sys", + "thiserror", + "tokio", +] + +[[package]] name = "netlink-sys" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "bytes", + "futures", "libc", "log", + "tokio", ] [[package]] @@ -3032,16 +3869,40 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.4.2", "cfg-if", + "cfg_aliases", "libc", ] [[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + +[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3052,6 +3913,12 @@ dependencies = [ ] [[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] name = "ntapi" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3113,7 +3980,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -3138,9 +4005,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -3174,14 +4041,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -3192,7 +4059,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", +] + +[[package]] +name = "oid-registry" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" +dependencies = [ + "asn1-rs 0.6.1", ] [[package]] @@ -3215,9 +4091,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ "bitflags 2.4.2", "cfg-if", @@ -3236,7 +4112,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -3247,18 +4123,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.6+3.1.4" +version = "300.3.0+3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" +checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -3285,6 +4161,16 @@ dependencies = [ ] [[package]] +name = "os_pipe" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3337,6 +4223,20 @@ dependencies = [ ] [[package]] +name = "p521" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +dependencies = [ + "base16ct 0.2.0", + "ecdsa 0.16.9", + "elliptic-curve 0.13.8", + "primeorder", + "rand_core 0.6.4", + "sha2 0.10.8", +] + +[[package]] name = "parking" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3344,9 +4244,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3381,6 +4281,16 @@ dependencies = [ ] [[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.1", + "serde", +] + +[[package]] name = "pem-rfc7468" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3405,6 +4315,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] +name = "pest" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pest_meta" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +dependencies = [ + "once_cell", + "pest", + "sha2 0.10.8", +] + +[[package]] name = "pgp" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3462,22 +4417,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -3493,6 +4448,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pkarr" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "242ae92dfb9d2ba3aaa9caf4723e72043bc50729ad05a763771771ba03196ffb" +dependencies = [ + "bytes", + "ed25519-dalek 2.1.1", + "rand 0.8.5", + "reqwest 0.11.27", + "self_cell", + "simple-dns", + "thiserror", + "url", + "z32", +] + +[[package]] name = "pkcs1" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3576,6 +4548,48 @@ dependencies = [ ] [[package]] +name = "pnet_base" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c" +dependencies = [ + "no-std-net", +] + +[[package]] +name = "pnet_macros" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 2.0.66", +] + +[[package]] +name = "pnet_macros_support" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56" +dependencies = [ + "pnet_base", +] + +[[package]] +name = "pnet_packet" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba" +dependencies = [ + "glob", + "pnet_base", + "pnet_macros", + "pnet_macros_support", +] + +[[package]] name = "png" version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3589,6 +4603,17 @@ dependencies = [ ] [[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] name = "portable-atomic" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3631,23 +4656,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "pretty_assertions" -version = "1.4.0" +name = "precis-core" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "d73e9dd26361c32e7cd13d1032bb01c4e26a23287274e8a4e2f228cf2c9ff77b" dependencies = [ - "diff", - "yansi", + "precis-tools", + "ucd-parse", + "unicode-normalization", ] [[package]] -name = "pretty_env_logger" -version = "0.5.0" +name = "precis-profiles" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +checksum = "bde4bd6624c60cb0abe2bea1dbdbb9085f629a853861e64df4abb099f8076ad4" dependencies = [ - "env_logger", - "log", + "lazy_static", + "precis-core", + "precis-tools", + "unicode-normalization", +] + +[[package]] +name = "precis-tools" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07ecadec70b0f560f09abf815ae0ee1a940d38d2354c938ba7229ac7c9f5f52" +dependencies = [ + "lazy_static", + "regex", + "ucd-parse", +] + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", ] [[package]] @@ -3694,14 +4743,37 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] +name = "prometheus-client" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" +dependencies = [ + "dtoa", + "itoa", + "parking_lot", + "prometheus-client-derive-encode", +] + +[[package]] +name = "prometheus-client-derive-encode" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "proptest" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3724,6 +4796,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] name = "quic-rpc" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3768,7 +4855,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls", + "rustls 0.21.11", "thiserror", "tokio", "tracing", @@ -3784,7 +4871,7 @@ dependencies = [ "rand 0.8.5", "ring 0.16.20", "rustc-hash", - "rustls", + "rustls 0.21.11", "rustls-native-certs", "slab", "thiserror", @@ -3807,20 +4894,36 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] +name = "quoted-string-parser" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc75379cdb451d001f1cb667a9f74e8b355e9df84cc5193513cbe62b96fc5e9" +dependencies = [ + "pest", + "pest_derive", +] + +[[package]] name = "quoted_printable" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" [[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] name = "radix_trie" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3915,6 +5018,15 @@ name = "ratelimit" version = "1.0.0" [[package]] +name = "raw-cpuid" +version = "11.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] name = "rayon" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3940,13 +5052,25 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ - "pem", + "pem 1.1.1", "ring 0.16.20", "time 0.3.34", "yasna", ] [[package]] +name = "rcgen" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" +dependencies = [ + "pem 3.0.4", + "ring 0.17.8", + "time 0.3.34", + "yasna", +] + +[[package]] name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3977,9 +5101,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -4008,6 +5132,12 @@ dependencies = [ ] [[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + +[[package]] name = "regex-syntax" version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4021,19 +5151,20 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.24", + "h2", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", + "hyper-rustls 0.24.2", "hyper-tls", "ipnet", "js-sys", @@ -4043,20 +5174,64 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", + "rustls 0.21.11", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 0.1.2", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", + "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "webpki-roots 0.25.4", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-rustls 0.26.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.4", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.26.1", + "winreg 0.52.0", ] [[package]] @@ -4164,6 +5339,7 @@ dependencies = [ "pkcs1 0.7.5", "pkcs8 0.10.2", "rand_core 0.6.4", + "sha2 0.10.8", "signature 2.2.0", "spki 0.7.3", "subtle", @@ -4171,6 +5347,24 @@ dependencies = [ ] [[package]] +name = "rtnetlink" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" +dependencies = [ + "futures", + "log", + "netlink-packet-core 0.7.0", + "netlink-packet-route 0.17.1", + "netlink-packet-utils", + "netlink-proto", + "netlink-sys", + "nix 0.26.4", + "thiserror", + "tokio", +] + +[[package]] name = "rusqlite" version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4192,9 +5386,9 @@ checksum = "efe2374f2385cdd8755a446f80b2a646de603c9d8539ca38734879b5c71e378b" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4235,23 +5429,38 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ + "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] [[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.4", + "subtle", + "zeroize", +] + +[[package]] name = "rustls-native-certs" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -4266,6 +5475,22 @@ dependencies = [ ] [[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4276,6 +5501,17 @@ dependencies = [ ] [[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4283,9 +5519,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" +checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" dependencies = [ "bitflags 2.4.2", "cfg-if", @@ -4295,12 +5531,12 @@ dependencies = [ "libc", "log", "memchr", - "nix", + "nix 0.28.0", "radix_trie", "unicode-segmentation", "unicode-width", "utf8parse", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4310,6 +5546,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4339,9 +5584,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "schemars_derive", @@ -4351,14 +5596,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -4445,9 +5690,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -4472,31 +5717,31 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -4515,9 +5760,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -4535,6 +5780,16 @@ dependencies = [ ] [[package]] +name = "serdect" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" +dependencies = [ + "base16ct 0.2.0", + "serde", +] + +[[package]] name = "sha-1" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4600,6 +5855,16 @@ dependencies = [ ] [[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "signal-hook-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4635,6 +5900,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] +name = "simple-dns" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01607fe2e61894468c6dc0b26103abb073fb08b79a3d9e4b6d76a1a341549958" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4645,9 +5919,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -4681,6 +5955,15 @@ dependencies = [ ] [[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + +[[package]] name = "spki" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4701,6 +5984,16 @@ dependencies = [ ] [[package]] +name = "ssh-cipher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caac132742f0d33c3af65bfcde7f6aa8f62f0e991d80db99149eb9d44708784f" +dependencies = [ + "cipher", + "ssh-encoding 0.2.0", +] + +[[package]] name = "ssh-encoding" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4712,6 +6005,17 @@ dependencies = [ ] [[package]] +name = "ssh-encoding" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15" +dependencies = [ + "base64ct", + "pem-rfc7468 0.7.0", + "sha2 0.10.8", +] + +[[package]] name = "ssh-key" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4725,7 +6029,28 @@ dependencies = [ "sec1 0.3.0", "sha2 0.10.8", "signature 1.6.4", - "ssh-encoding", + "ssh-encoding 0.1.0", + "zeroize", +] + +[[package]] +name = "ssh-key" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc" +dependencies = [ + "ed25519-dalek 2.1.1", + "p256 0.13.2", + "p384 0.13.0", + "p521", + "rand_core 0.6.4", + "rsa 0.9.6", + "sec1 0.7.3", + "sha2 0.10.8", + "signature 2.2.0", + "ssh-cipher", + "ssh-encoding 0.2.0", + "subtle", "zeroize", ] @@ -4748,22 +6073,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "struct_iterable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "849a064c6470a650b72e41fa6c057879b68f804d113af92900f27574828e7712" +dependencies = [ + "struct_iterable_derive", + "struct_iterable_internal", +] + +[[package]] +name = "struct_iterable_derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb939ce88a43ea4e9d012f2f6b4cc789deb2db9d47bad697952a85d6978662c" +dependencies = [ + "erased-serde", + "proc-macro2", + "quote", + "struct_iterable_internal", + "syn 2.0.66", +] + +[[package]] +name = "struct_iterable_internal" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9426b2a0c03e6cc2ea8dbc0168dbbf943f88755e409fb91bcb8f6a268305f4a" + +[[package]] name = "strum" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros", +] [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.66", +] + +[[package]] +name = "stun-rs" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0adebf9fb8fba5c39ee34092b0383f247e4d1255b98fcffec94b4b797b85b677" +dependencies = [ + "base64 0.22.1", + "bounded-integer", + "byteorder", + "crc", + "enumflags2", + "fallible-iterator", + "hmac-sha1", + "hmac-sha256", + "hostname-validator", + "lazy_static", + "md5", + "paste", + "precis-core", + "precis-profiles", + "quoted-string-parser", + "rand 0.8.5", ] [[package]] @@ -4773,6 +6154,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] +name = "surge-ping" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbf95ce4c7c5b311d2ce3f088af2b93edef0f09727fa50fbe03c7a979afce77" +dependencies = [ + "hex", + "parking_lot", + "pnet_packet", + "rand 0.8.5", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4785,9 +6182,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -4801,6 +6198,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] +name = "sync_wrapper" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384595c11a4e2969895cad5a8c4029115f5ab956a9e5ef4de79d11a426e5f20c" + +[[package]] name = "synstructure" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4813,6 +6216,17 @@ dependencies = [ ] [[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "sysinfo" version = "0.26.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4834,7 +6248,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" +dependencies = [ + "bitflags 2.4.2", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -4848,33 +6273,40 @@ dependencies = [ ] [[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "tagger" version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5" [[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] name = "tempfile" version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.1", "rustix", "windows-sys 0.52.0", ] [[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] name = "testdir" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4901,22 +6333,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -4998,9 +6430,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -5027,13 +6459,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -5047,6 +6479,55 @@ dependencies = [ ] [[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.11", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-rustls-acme" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ebc06d846f8367f24c3a8882328707d1a5e507ef4f40943723ddbe2c17b9f24" +dependencies = [ + "async-trait", + "base64 0.21.7", + "chrono", + "futures", + "log", + "num-bigint", + "pem 3.0.4", + "proc-macro2", + "rcgen 0.12.1", + "reqwest 0.11.27", + "ring 0.17.8", + "rustls 0.21.11", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "url", + "webpki-roots 0.25.4", + "x509-parser 0.16.0", +] + +[[package]] name = "tokio-serde" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5063,9 +6544,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -5101,35 +6582,34 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -5147,9 +6627,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", @@ -5206,7 +6686,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -5265,6 +6745,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] +name = "ttl_cache" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4189890526f0168710b6ee65ceaedf1460c48a14318ceec933cb26baa492096a" +dependencies = [ + "linked-hash-map", +] + +[[package]] name = "tungstenite" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5323,6 +6812,21 @@ dependencies = [ ] [[package]] +name = "ucd-parse" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06ff81122fcbf4df4c1660b15f7e3336058e7aec14437c9f85c6b31a0f279b9" +dependencies = [ + "regex-lite", +] + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] name = "unarray" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5374,6 +6878,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] name = "untrusted" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5394,6 +6908,7 @@ dependencies = [ "form_urlencoded", "idna 0.5.0", "percent-encoding", + "serde", ] [[package]] @@ -5410,9 +6925,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.12", "serde", @@ -5437,6 +6952,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] name = "walkdir" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5500,7 +7021,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -5534,7 +7055,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5546,6 +7067,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] +name = "watchable" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45b42a2f611916b5965120a9cde2b60f2db4454826dd9ad5e6f47c24a5b3b259" +dependencies = [ + "event-listener 4.0.3", + "futures-util", + "parking_lot", + "thiserror", +] + +[[package]] name = "web-sys" version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5556,6 +7089,21 @@ dependencies = [ ] [[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] name = "weezl" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5623,12 +7171,94 @@ dependencies = [ ] [[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-implement", + "windows-interface", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "windows-interface" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -5646,7 +7276,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5666,17 +7296,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5687,9 +7318,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5705,9 +7336,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5723,9 +7354,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -5741,9 +7378,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -5759,9 +7396,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -5771,9 +7408,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -5789,9 +7426,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -5822,6 +7459,39 @@ dependencies = [ ] [[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wmi" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc2f0a4062ca522aad4705a2948fd4061b3857537990202a8ddd5af21607f79a" +dependencies = [ + "chrono", + "futures", + "log", + "serde", + "thiserror", + "windows 0.52.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] name = "x25519-dalek" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5839,13 +7509,47 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", "base64 0.13.1", "data-encoding", - "der-parser", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time 0.3.34", +] + +[[package]] +name = "x509-parser" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +dependencies = [ + "asn1-rs 0.5.2", + "data-encoding", + "der-parser 8.2.0", "lazy_static", "nom", - "oid-registry", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time 0.3.34", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs 0.6.1", + "data-encoding", + "der-parser 9.0.0", + "lazy_static", + "nom", + "oid-registry 0.7.0", "rusticata-macros", "thiserror", "time 0.3.34", @@ -5863,6 +7567,21 @@ dependencies = [ ] [[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmltree" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" +dependencies = [ + "xml-rs", +] + +[[package]] name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5914,6 +7633,12 @@ dependencies = [ ] [[package]] +name = "z32" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb37266251c28b03d08162174a91c3a092e3bd4f476f8205ee1c507b78b7bdc" + +[[package]] name = "zerocopy" version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5930,7 +7655,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", ] [[package]] @@ -5950,5 +7675,20 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.66", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", ] diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 75ba9ab621b2f..4f303ba3ff4b2 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -5,6 +5,7 @@ , cmake , deltachat-desktop , deltachat-repl +, deltachat-rpc-server , openssl , perl , pkg-config @@ -30,13 +31,13 @@ let }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.136.3"; + version = "1.140.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-/ZWpPpxnOCLGswrfbEPvfUn1LpdBQeR5LecRAB0PEhI="; + hash = "sha256-BSbvgKiI89B+nxp5McBKTJAwgePt27C1QvSQLhTL7pQ="; }; patches = [ @@ -81,7 +82,7 @@ in stdenv.mkDerivation rec { passthru = { inherit cargoLock; tests = { - inherit deltachat-desktop deltachat-repl; + inherit deltachat-desktop deltachat-repl deltachat-rpc-server; python = python3.pkgs.deltachat; }; }; diff --git a/pkgs/development/libraries/libdeltachat/no-static-lib.patch b/pkgs/development/libraries/libdeltachat/no-static-lib.patch index 14ea1106138f9..9dc4ffd0ec074 100644 --- a/pkgs/development/libraries/libdeltachat/no-static-lib.patch +++ b/pkgs/development/libraries/libdeltachat/no-static-lib.patch @@ -1,33 +1,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 44ca43e7..8b6960dd 100644 +index 5587e391..a18092f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -14,7 +14,6 @@ find_program(CARGO cargo) +@@ -20,7 +20,6 @@ endif() add_custom_command( OUTPUT -- "target/release/libdeltachat.a" - "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" +- "${CMAKE_BINARY_DIR}/target/release/libdeltachat.a" + "${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}" + "${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc" COMMAND -@@ -39,12 +38,10 @@ add_custom_target( +@@ -35,12 +34,10 @@ add_custom_target( lib_deltachat ALL DEPENDS -- "target/release/libdeltachat.a" - "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" +- "${CMAKE_BINARY_DIR}/target/release/libdeltachat.a" + "${CMAKE_BINARY_DIR}/target/release/libdeltachat.${DYNAMIC_EXT}" + "${CMAKE_BINARY_DIR}/target/release/pkgconfig/deltachat.pc" ) install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) --install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +-install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "${CMAKE_BINARY_DIR}/target/${ARCH_DIR}/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml -index de0fbafe..120efec9 100644 +index d66cb00f..48347a48 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml -@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] +@@ -11,7 +11,7 @@ categories = ["cryptography", "std", "email"] [lib] name = "deltachat" diff --git a/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch b/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch new file mode 100644 index 0000000000000..a1826354f88ba --- /dev/null +++ b/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch @@ -0,0 +1,35 @@ +From 85ca659a59ae5be6fc0824b0684967ec94727e2a Mon Sep 17 00:00:00 2001 +From: toonn <toonn@toonn.io> +Date: Wed, 12 Jun 2024 11:39:35 +0000 +Subject: [PATCH] il_endian.h: Fix endian handling + +Based on https://sourceforge.net/p/resil/tickets/8/, which has also been +incorporated in the MacPort for libdevil 1.7.8, +https://trac.macports.org/export/154482/trunk/dports/devel/libdevil/files/patch-src-IL-include-il_endian.h.diff, +but updated for the header included in release 1.8.0 of libdevil. +--- + src-IL/include/il_endian.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src-IL/include/il_endian.h b/src-IL/include/il_endian.h +index c4e6d86..a3cd57f 100644 +--- a/src-IL/include/il_endian.h ++++ b/src-IL/include/il_endian.h +@@ -23,9 +23,13 @@ extern "C" { + #ifndef __BIG_ENDIAN__ + #define __BIG_ENDIAN__ 1 + #endif ++#else ++#ifndef __LITTLE_ENDIAN__ ++#define __LITTLE_ENDIAN__ 1 ++#endif + #endif + +-#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ ++#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ + || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) + #undef __LITTLE_ENDIAN__ + #define Short(s) iSwapShort(s) +-- +2.44.0 + diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 26c30227f5498..63ca4877da65f 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, cmake , libjpeg , libpng , libmng @@ -18,16 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdevil"; - version = "1.7.8"; + version = "1.8.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://sourceforge/openil/DevIL-${finalAttrs.version}.tar.gz"; - sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; + hash = "sha256-AHWXPufdifBQeHPiWArHgzZFLSnTSgcTSyCPROL+twk="; }; - nativeBuildInputs = [ pkg-config ]; + sourceRoot = "DevIL/DevIL"; + + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ] ++ lib.optionals withXorg [ libX11 libGL ] @@ -38,29 +41,17 @@ stdenv.mkDerivation (finalAttrs: { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-register"; preConfigure = '' - sed -i 's, -std=gnu99,,g' configure sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c - '' + lib.optionalString stdenv.cc.isClang '' - sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in - ''; - - postConfigure = '' - sed -i '/RESTRICT_KEYWORD/d' include/IL/config.h ''; patches = [ - (fetchurl { - url = "https://sources.debian.org/data/main/d/devil/1.7.8-10/debian/patches/03_CVE-2009-3994.diff"; - sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; - }) - ./ftbfs-libpng15.patch - ./il_endian.h.patch + ./0001-il_endian.h-Fix-endian-handling.patch ]; enableParallelBuilding = true; postPatch = '' - for a in test/Makefile.in test/format_test/format_checks.sh.in ; do + for a in test/Makefile.am test/format_test/format_checks.sh.in ; do substituteInPlace $a \ --replace /bin/bash ${runtimeShell} done @@ -70,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://openil.sourceforge.net/"; - description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; + description = "Image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; mainProgram = "ilur"; license = licenses.lgpl2; pkgConfigModules = [ "IL" ]; diff --git a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch b/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch deleted file mode 100644 index 5fc53c2dc6a70..0000000000000 --- a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ -Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649554 ---- devil-1.7.8.orig/src-IL/src/il_icon.c -+++ devil-1.7.8/src-IL/src/il_icon.c -@@ -525,7 +525,11 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); -+#else - png_set_gray_1_2_4_to_8(ico_png_ptr); -+#endif - } - - // Expand RGB images with transparency to full alpha channels -only in patch2: -unchanged: ---- devil-1.7.8.orig/src-IL/src/il_png.c -+++ devil-1.7.8/src-IL/src/il_png.c -@@ -278,7 +278,11 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_set_expand_gray_1_2_4_to_8(png_ptr); -+#else - png_set_gray_1_2_4_to_8(png_ptr); -+#endif - } - - // Expand RGB images with transparency to full alpha channels diff --git a/pkgs/development/libraries/libdevil/il_endian.h.patch b/pkgs/development/libraries/libdevil/il_endian.h.patch deleted file mode 100644 index c220e6802fd9f..0000000000000 --- a/pkgs/development/libraries/libdevil/il_endian.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -Source: http://sourceforge.net/p/resil/tickets/8/ ---- devil-1.7.8.orig/src-IL/include/il_endian.h.orig 2009-03-08 01:10:08.000000000 -0600 -+++ devil-1.7.8/src-IL/include/il_endian.h 2013-11-03 01:52:37.000000000 -0600 -@@ -19,9 +19,13 @@ - #ifndef __BIG_ENDIAN__ - #define __BIG_ENDIAN__ 1 - #endif -+#else -+ #ifndef __LITTLE_ENDIAN__ -+ #define __LITTLE_ENDIAN__ 1 -+ #endif - #endif - --#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ -+#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ - || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) - #undef __LITTLE_ENDIAN__ - #define Short(s) iSwapShort(s) -@@ -39,8 +43,6 @@ - #define BigDouble(d) - #else - #undef __BIG_ENDIAN__ -- #undef __LITTLE_ENDIAN__ // Not sure if it's defined by any compiler... -- #define __LITTLE_ENDIAN__ - #define Short(s) - #define UShort(s) - #define Int(i) diff --git a/pkgs/development/libraries/libdex/default.nix b/pkgs/development/libraries/libdex/default.nix index a81cc2669529f..373fae4876b1e 100644 --- a/pkgs/development/libraries/libdex/default.nix +++ b/pkgs/development/libraries/libdex/default.nix @@ -12,15 +12,15 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdex"; - version = "0.6.0"; + version = "0.6.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-HojSsAYo5Ya3I7f7pRXM6XUvrxISLN5aPA1biDmYUio="; + url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; + hash = "sha256-0XbeZXhXHjKowLYDtqWhP6X4f7a1RCV1s47FrxaxepI="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Library supporting deferred execution for GNOME and GTK"; homepage = "https://gitlab.gnome.org/GNOME/libdex"; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21Plus; }; -} +}) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 7f706a220afcf..d957d2d05d0d2 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, minizip, pcsclite, opensc, openssl +{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 11cbdc1d89616..926973bb5739d 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit"; meta = with lib; { - description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; + description = "C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index f79e3dc717a58..8824061dee86b 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.libdivecomputer.org"; - description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; + description = "Cross-platform and open source library for communication with dive computers from various manufacturers"; mainProgram = "dctool"; maintainers = [ maintainers.mguentner ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 4c5ef2c33140c..bd7eb2359ef7f 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = { - description = "An open source software for reading and writing Data Matrix barcodes"; + description = "Open source software for reading and writing Data Matrix barcodes"; homepage = "https://github.com/dmtx/libdmtx"; changelog = "https://github.com/dmtx/libdmtx/blob/v${version}/ChangeLog"; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/libdvbcsa/default.nix b/pkgs/development/libraries/libdvbcsa/default.nix index 7da80a75d6a7f..f9daa860cf479 100644 --- a/pkgs/development/libraries/libdvbcsa/default.nix +++ b/pkgs/development/libraries/libdvbcsa/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "A free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities"; + description = "Free implementation of the DVB Common Scrambling Algorithm with encryption and decryption capabilities"; homepage = "http://www.videolan.org/developers/libdvbcsa.html"; platforms = lib.platforms.unix; license = lib.licenses.gpl2Only; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 5d539a7a48829..6ec8aab8943ce 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; + description = "Simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = "http://www.videolan.org/developers/libdvbpsi.html"; platforms = lib.platforms.unix; license = lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index b43c0ccdd0fe9..6c832250fc1c8 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.videolan.org/developers/libdvdcss.html"; - description = "A library for decrypting DVDs"; + description = "Library for decrypting DVDs"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index 5567d7c39c286..852ab2ea73099 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -12,15 +12,34 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; - configureScript = "./configure2"; # wtf? + # The upstream supports two configuration workflow: + # one is to generate ./configure via `autoconf`, + # the other is to run ./configure2. + # ./configure2 is a configureation script included in the upstream source + # that supports common "--<name>" flags and generates config.mak and config.h. + # See INSTALL inside the upstream source for detail. + configureScript = "./configure2"; + + configureFlags = [ + "--cc=${stdenv.cc.targetPrefix}cc" + # Let's strip the binaries ourselves, + # as unprefixed `strip` command is not available during cross compilation. + "--disable-strip" + ]; preConfigure = '' mkdir -p $out ''; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + "LD=${stdenv.cc.targetPrefix}ld" + "RANLIB=${stdenv.cc.targetPrefix}ranlib" + ]; + meta = { homepage = "http://dvdnav.mplayerhq.hu/"; - description = "A library that implements DVD navigation features such as DVD menus"; + description = "Library that implements DVD navigation features such as DVD menus"; mainProgram = "dvdnav-config"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.wmertens ]; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 8414605593def..96f78d73ae3c6 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; - description = "A library that implements DVD navigation features such as DVD menus"; + description = "Library that implements DVD navigation features such as DVD menus"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.wmertens ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix index 87ab724796c7a..47e44c5711a56 100644 --- a/pkgs/development/libraries/libdvdread/4.9.9.nix +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; - description = "A library for reading DVDs"; + description = "Library for reading DVDs"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.wmertens ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index f07af1fa575b1..14b534b2fe289 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; - description = "A library for reading DVDs"; + description = "Library for reading DVDs"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.wmertens ]; platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 1269f6f0eff3b..246fb73090b9e 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libestr]; meta = { - description = "An Event Expression Library inspired by CEE"; + description = "Event Expression Library inspired by CEE"; homepage = "http://www.libee.org/"; license = lib.licenses.lgpl21Plus; mainProgram = "libee-convert"; diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 9fab4c72947ed..95c3959d9dfb5 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library for handling OpenGL function pointer management"; + description = "Library for handling OpenGL function pointer management"; homepage = "https://github.com/anholt/libepoxy"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 3193f383d610a..0fb8890cf129d 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A Library for Posting Electronic Mail"; + description = "Library for Posting Electronic Mail"; longDescription = '' libESMTP is an SMTP client library which manages submission of electronic mail via a preconfigured Mail Transport Agent (MTA) such as Exim or Postfix. diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 750cb3974cf75..32960de8919d7 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook , # Note: -static hasn’t work on darwin static ? with stdenv.hostPlatform; isStatic && !isDarwin }: @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + configureFlags = lib.optional (static) "LDFLAGS=-static"; meta = { - description = "A high-performance event loop/event model with lots of features"; + description = "High-performance event loop/event model with lots of features"; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.all; license = lib.licenses.bsd2; # or GPL2+ diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index c8db600dce810..34af29955abbf 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3 }: +{ lib, stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { pname = "libevdev"; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index dffacc7d276c7..6c149b0186ee2 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: +{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: stdenv.mkDerivation rec { version = "20231119"; diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 0ab1f8fa984ab..8b9e889d3e2b7 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libexif.github.io/"; - description = "A library to read and manipulate EXIF data in digital photographs"; + description = "Library to read and manipulate EXIF data in digital photographs"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ erictapen ]; diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 39369c5c3b6be..6ed3603dd184d 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; + description = "N-Gram-Based Text Categorization library primarily intended for language guessing"; homepage = "https://wiki.documentfoundation.org/Libexttextcat"; license = licenses.bsd3; mainProgram = "createfp"; diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index f44702582f27a..2cb94d11fd670 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch"; sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo="; }) + (fetchpatch { + name = "LFS64.patch"; + url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch"; + hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g="; + }) ] ++ (lib.optionals stdenv.cc.isClang [ # https://github.com/wolfcw/libfaketime/issues/277 ./0001-Remove-unsupported-clang-flags.patch diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/development/libraries/libffi/3.3.nix index 294717d1fb1cd..50bec9edd0503 100644 --- a/pkgs/development/libraries/libffi/3.3.nix +++ b/pkgs/development/libraries/libffi/3.3.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch -, autoreconfHook +{ lib, stdenv, fetchurl , doCheck ? true # test suite depends on dejagnu which cannot be used during bootstrapping , dejagnu @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ dejagnu ]; meta = with lib; { - description = "A foreign function call interface library"; + description = "Foreign function call interface library"; longDescription = '' The libffi library provides a portable, high level programming interface to various calling conventions. This allows a diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index edd16ec21506e..9293077b1aa73 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch -, autoreconfHook +{ lib, stdenv, fetchurl # test suite depends on dejagnu which cannot be used during bootstrapping # dejagnu also requires tcl which can't be built statically at the moment @@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A foreign function call interface library"; + description = "Foreign function call interface library"; longDescription = '' The libffi library provides a portable, high level programming interface to various calling conventions. This allows a diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 9024be0f259ce..4076e5325c930 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://lib.filezilla-project.org/"; - description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; + description = "Modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index bf578b969effa..e8ceb261a4fec 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://xiph.org/fishsound/"; - description = "A simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; + description = "Simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index f8f79d99e4570..64928de4d4fe7 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin; homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.lgpl21Plus; - description = "A glib-based library for file management"; + description = "Glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix index 840f8e2271532..e40fa4c3df76f 100644 --- a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix +++ b/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { passthru.driverPath = "/lib/libfprint-2/tod-1"; meta = with lib; { - description = "A libfprint-2-tod Touch OEM Driver for 2016 ThinkPad's fingerprint readers"; + description = "Libfprint-2-tod Touch OEM Driver for 2016 ThinkPad's fingerprint readers"; homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint-tod-vfs0090"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libfprint-tod/default.nix b/pkgs/development/libraries/libfprint-tod/default.nix index bffafc5e44f40..538df33ff2814 100644 --- a/pkgs/development/libraries/libfprint-tod/default.nix +++ b/pkgs/development/libraries/libfprint-tod/default.nix @@ -34,7 +34,7 @@ in { meta = with lib; { homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint"; - description = "A library designed to make it easy to add support for consumer fingerprint readers, with support for loaded drivers"; + description = "Library designed to make it easy to add support for consumer fingerprint readers, with support for loaded drivers"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ grahamc ]; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 41eef399162a2..fd7797ca0f14c 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fprint.freedesktop.org/"; - description = "A library designed to make it easy to add support for consumer fingerprint readers"; + description = "Library designed to make it easy to add support for consumer fingerprint readers"; license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 5c77e0139e8a8..6f79ec1b9465c 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -24,11 +24,18 @@ stdenv.mkDerivation rec { url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch"; sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9"; }) + # fix clang build: remove register keyword + # remove on next update + (fetchpatch { + name = "remove-register-keyword.patch"; + url = "https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041.patch"; + hash = "sha256-6m9MFb1eWGK5cMvPmTu7uh3Pac65r2HPB8wJ8xc1O5o="; + }) ]; meta = with lib; { homepage = "http://www.imagemagick.org"; - description = "A library for manipulating FlashPIX images"; + description = "Library for manipulating FlashPIX images"; license = "Flashpix"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index f1466dd5a9f53..b05ea5bbe2d5c 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; meta = with lib; { - description = "The libfreefare project aims to provide a convenient API for MIFARE card manipulations"; + description = "Libfreefare project aims to provide a convenient API for MIFARE card manipulations"; license = licenses.lgpl3; homepage = "https://github.com/nfc-tools/libfreefare"; maintainers = with maintainers; [bobvanderlinden]; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 1e35d4124615c..116f1dca1bbbb 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library to talk to FTDI chips using libusb"; + description = "Library to talk to FTDI chips using libusb"; homepage = "https://www.intra2net.com/en/developer/libftdi/"; license = with licenses; [ lgpl2Only gpl2Only ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index ffc33d0247d15..27b23f9d54bce 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library to talk to FTDI chips using libusb"; + description = "Library to talk to FTDI chips using libusb"; homepage = "https://www.intra2net.com/en/developer/libftdi/"; license = lib.licenses.lgpl21; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 72bf067b2db4b..65f8b26c5a378 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = { - description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; + description = "Library to deal with gadu-gadu protocol (most popular polish IM protocol)"; homepage = "https://libgadu.net/index.en.html"; platforms = lib.platforms.linux; license = lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index e71aedd2cbcfa..4d315b042ee99 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng -, libXrender, libexif, autoreconfHook, fetchpatch }: +, libXrender, libexif, autoreconfHook }: stdenv.mkDerivation (finalAttrs: { pname = "libgdiplus"; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 9b160e6b29e89..37e726fa23bb9 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.7.3"; pname = "libgeotiff"; src = fetchFromGitHub { owner = "OSGeo"; repo = "libgeotiff"; rev = version; - hash = "sha256-bE6UAUKiorriTgYrqhxbMAN2NEtmV/8IIfF02RUghSI="; + hash = "sha256-FUvWZR5BrGEMnApxCBQBwmmi9NU7Tx6Ziq3mbIxjqfc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index 26b0a9907d111..cd2f10d157823 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A glib wrapper library around the libgit2 git access library"; + description = "Glib wrapper library around the libgit2 git access library"; homepage = "https://gitlab.gnome.org/GNOME/libgit2-glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 7e70b65423a96..58212e00d89e7 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Linkable library implementation of Git that you can use in your application"; mainProgram = "git2"; homepage = "https://libgit2.org/"; - license = licenses.gpl2Plus; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index d96b3505bcb96..59434902d78d5 100644 --- a/pkgs/development/libraries/libglibutil/default.nix +++ b/pkgs/development/libraries/libglibutil/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Library of glib utilities."; + description = "Library of glib utilities"; homepage = "https://git.sailfishos.org/mer-core/libglibutil"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index a7480d6ffb95a..9a9c3b861d6d4 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { passthru = { inherit (addOpenGLRunpath) driverLink; }; meta = with lib; { - description = "The GL Vendor-Neutral Dispatch library"; + description = "GL Vendor-Neutral Dispatch library"; longDescription = '' libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors. It allows multiple drivers from different diff --git a/pkgs/development/libraries/libgnt/default.nix b/pkgs/development/libraries/libgnt/default.nix index 3a781a261b8b9..104a22beab74d 100644 --- a/pkgs/development/libraries/libgnt/default.nix +++ b/pkgs/development/libraries/libgnt/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An ncurses toolkit for creating text-mode graphical user interfaces"; + description = "Ncurses toolkit for creating text-mode graphical user interfaces"; homepage = "https://keep.imfreedom.org/libgnt/libgnt/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index f2d3d15f9e806..e0de7acd38bad 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A fork of libcurl used by GNUnet"; + description = "Fork of libcurl used by GNUnet"; homepage = "https://gnunet.org/en/gnurl.html"; maintainers = with maintainers; [ vrthra ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libgourou/default.nix b/pkgs/development/libraries/libgourou/default.nix index 78b5654873bdb..bfd483e5d31c8 100644 --- a/pkgs/development/libraries/libgourou/default.nix +++ b/pkgs/development/libraries/libgourou/default.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "libgourou"; + pname = "libgourou"; version = "0.8.2"; src = fetchzip { - url = "https://indefero.soutade.fr/p/${name}/source/download/v${version}/"; + url = "https://indefero.soutade.fr/p/libgourou/source/download/v${version}/"; sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; extension = "zip"; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 1d262a0a44023..a990546108cff 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.48"; + version = "1.49"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ic4a6JPhIpJLhY3oTcT2eq4p/6YQ6/Zo1apTkEVmPW8="; + sha256 = "sha256-i3nVRjnb9KvAi1QG+y835mmi3sCR3QJPuH3TZxMcY6k="; }; postPatch = '' @@ -63,7 +63,7 @@ in stdenv.mkDerivation (rec { meta = with lib; { homepage = "https://www.gnupg.org/software/libgpg-error/index.html"; changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;hb=refs/tags/libgpg-error-${version}"; - description = "A small library that defines common error values for all GnuPG components"; + description = "Small library that defines common error values for all GnuPG components"; mainProgram = "gen-posix-lock-obj"; longDescription = '' diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 4897934860b1f..c196b137555dd 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gphoto.org/proj/libgphoto2/"; - description = "A library for accessing digital cameras"; + description = "Library for accessing digital cameras"; longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, MTP, and other vendor specific protocols for controlling and transferring data diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index faa478b568c76..268ada87ac6ea 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 libmcrypt libmhash ]; meta = with lib; { - description = "A small library to encapsulate data in an encrypted structure"; + description = "Small library to encapsulate data in an encrypted structure"; homepage = "https://libgringotts.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index ae49384835909..a265d366ab768 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -10,15 +10,15 @@ , deterministic-uname }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgtop"; - version = "2.41.2"; + version = "2.41.3"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-2QJs2KSNJ83/0zL41gqSdktWQk5SLEIM0ToB9A2vksM="; + url = "mirror://gnome/sources/libgtop/${lib.versions.majorMinor finalAttrs.version}/libgtop-${finalAttrs.version}.tar.xz"; + hash = "sha256-d1Z235WOLqJFL3Vo8osupYEGPTEnc91cC3Ykwbmy2ow="; }; nativeBuildInputs = [ @@ -37,15 +37,15 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgtop"; versionPolicy = "odd-unstable"; }; }; meta = with lib; { - description = "A library that reads information about processes and the running system"; + description = "Library that reads information about processes and the running system"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 0da42d832f056..d3d3ae043e04e 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library that provides GObject bindings for libudev"; + description = "Library that provides GObject bindings for libudev"; homepage = "https://gitlab.gnome.org/GNOME/libgudev"; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 971b234364704..42b9272115437 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A library to access weather information from online services for numerous locations"; + description = "Library to access weather information from online services for numerous locations"; homepage = "https://gitlab.gnome.org/GNOME/libgweather"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 041431651c3e2..cff74fbb47416 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A GObject based library for handling and rendering XPS documents"; + description = "GObject based library for handling and rendering XPS documents"; homepage = "https://gitlab.gnome.org/GNOME/libgxps"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 1ae6c72afc3e1..e2b4ce381b7fb 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library full of GTK widgets for mobile phones"; + description = "Library full of GTK widgets for mobile phones"; mainProgram = "handy-0.0-demo"; homepage = "https://source.puri.sm/Librem5/libhandy"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix index e48b836b7cd79..c64c8e6e291f8 100644 --- a/pkgs/development/libraries/libhv/default.nix +++ b/pkgs/development/libraries/libhv/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A c/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server"; + description = "C/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server"; homepage = "https://github.com/ithewei/libhv"; license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 45ca2faf30b9f..d3ee9581305c7 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libical/libical"; - description = "An Open Source implementation of the iCalendar protocols"; + description = "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/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index d8339ba086ad1..b59887381f49e 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { passthru = { inherit setupHooks; }; meta = { - description = "An iconv(3) implementation"; + description = "Iconv(3) implementation"; longDescription = '' Some programs, like mailers and web browsers, must be able to convert diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 69a6a033fc095..a1f7f50a25756 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - hash = "sha256-I8zznZlMz1U2DAVYkvtF1thEYz/tIEbA682y7czK5ck="; + hash = "sha256-uT0V1CXPaF2FctsndxVszS7Qske6vObbOA4aOnmbdQY="; fetchSubmodules = true; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A library to support generic input method implementation"; + description = "Library to support generic input method implementation"; homepage = "https://github.com/fcitx/libime"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ poscat ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index d67c4a67475ed..59ee89c95422a 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; - description = "A software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux"; + description = "Software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux"; longDescription = '' libimobiledevice is a software library that talks the protocols to support iPhone®, iPod Touch® and iPad® devices on Linux. Unlike other projects, it diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 99b6542fa3e82..767b7a1d8cf24 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 8 out of 8 tests meta = with lib; { - description = "A set of symbols and convenience functions for Ayatana indicators"; + description = "Set of symbols and convenience functions for Ayatana indicators"; homepage = "https://launchpad.net/libindicator"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c4285220af3d9..e720ee8b07262 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -42,7 +42,7 @@ let meta = { homepage = "https://gobby.github.io/"; - description = "An implementation of the Infinote protocol written in GObject-based C"; + description = "Implementation of the Infinote protocol written in GObject-based C"; mainProgram = "infinoted-0.7"; license = lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix index 0179009be3f9b..945fa0df5962d 100644 --- a/pkgs/development/libraries/libinklevel/default.nix +++ b/pkgs/development/libraries/libinklevel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; meta = with lib; { - description = "A library for checking the ink level of your printer"; + description = "Library for checking the ink level of your printer"; longDescription = '' Libinklevel is a library for checking the ink level of your printer on a system which runs Linux or FreeBSD. It supports printers attached via diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index 96fd190e15bbb..e6ddb9b471c7c 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://libipfix.sourceforge.net/"; - description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; + description = "Libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; mainProgram = "ipfix_collector"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 56a9f1b961cf9..9d64b53c13f4b 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A small but extremely powerful library which implements the client IRC protocol"; + description = "Small but extremely powerful library which implements the client IRC protocol"; homepage = "http://www.ulduzsoft.com/libircclient/"; license = licenses.lgpl3; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/development/libraries/libjaylink/default.nix index 5d461940dcea9..f313241d6d865 100644 --- a/pkgs/development/libraries/libjaylink/default.nix +++ b/pkgs/development/libraries/libjaylink/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.zapb.de/libjaylink/libjaylink"; - description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices."; + description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices"; license = licenses.gpl2Plus; maintainers = with maintainers; [ felixsinger ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 2a32bbfd7c467..9055e75de47f8 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://libjpeg-turbo.org/"; - description = "A faster (using SIMD) libjpeg implementation"; + description = "Faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses pkgConfigModules = [ "libjpeg" "libturbojpeg" ]; maintainers = with maintainers; [ vcunat colemickens kamadorueda ]; diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index d161ff362bcbc..6b1c80c6db2a3 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://www.ijg.org/"; - description = "A library that implements the JPEG image file format"; + description = "Library that implements the JPEG image file format"; maintainers = with maintainers; [ ]; license = licenses.free; pkgConfigModules = [ "libjpeg" ]; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index 30e36e9658583..dd68957616b6f 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://libjson.sourceforge.net/"; - description = "A JSON reader and writer"; + description = "JSON reader and writer"; longDescription = '' A JSON reader and writer which is super-efficient and usually runs circles around other JSON libraries. diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index ab9ff488b3518..1b0888348c594 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libjxl/libjxl"; - description = "JPEG XL image format reference implementation."; + description = "JPEG XL image format reference implementation"; license = licenses.bsd3; maintainers = with maintainers; [ nh2 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index d2ef623bf1577..d1a9711ddd891 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libpng ]; meta = with lib; { - description = "A library for encoding and decoding Kate streams"; + description = "Library for encoding and decoding Kate streams"; longDescription = '' This is libkate, the reference implementation of a codec for the Kate bitstream format. Kate is a karaoke and text codec meant for encapsulation diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 6a66320299279..9549edc2caebf 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.8.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${version}"; - hash = "sha256-rrNiqwx4aEOB3fTyv8xcZEDsNJX4NNPhp13W0qnl1O0="; + hash = "sha256-R8JofaoqEM6IL4mr10kOWH0GfqwuyG2qkFjGR1+0fXw="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-6Zfy0LtxUDZzwlhul2fZpsI1c7GWntAMfsT6j+QefVs="; + hash = "sha256-gPWTFl5YrlWDBXyksc9TidOzQf42bSJ05pdqtErk844="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A dynamic library providing Virtualization-based process isolation capabilities"; + description = "Dynamic library providing Virtualization-based process isolation capabilities"; homepage = "https://github.com/containers/libkrun"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index f4f67db652cac..0485c82ffb41e 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A dynamic library bundling the guest payload consumed by libkrun"; + description = "Dynamic library bundling the guest payload consumed by libkrun"; homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 0988bb9259d74..38f1cc03cac48 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkg-config unzip gobject-introspection ]; meta = with lib; { - description = "An interface library to access tags for identifying languages"; + description = "Interface library to access tags for identifying languages"; license = licenses.mpl20; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/development/libraries/libliftoff/default.nix index 08b7ab13a2758..4bcf6ae166a05 100644 --- a/pkgs/development/libraries/libliftoff/default.nix +++ b/pkgs/development/libraries/libliftoff/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm ]; meta = with lib; { - description = "A lightweight KMS plane library"; + description = "Lightweight KMS plane library"; longDescription = '' libliftoff eases the use of KMS planes from userspace without standing in your way. Users create "virtual planes" called layers, set KMS properties diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index b75aba83de691..449792a07e826 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library for large linear classification"; + description = "Library for large linear classification"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; license = licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index a5c0bf92751fa..8d2a4044458e5 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.29.0"; + version = "3.30.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-TaMPl53FlUSZIsjhoTYcv3Y+j86fDHuBTjiyr/uP1tM="; + hash = "sha256-VeDthGET1PcKXzXkztJCcN6yXgf51bcIyawuyUurwBs="; }; strictDeps = true; diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix index 8531c8ea7c4c5..24c454d4ee7e8 100644 --- a/pkgs/development/libraries/liblxi/default.nix +++ b/pkgs/development/libraries/liblxi/default.nix @@ -3,17 +3,24 @@ , libtirpc, rpcsvc-proto, avahi, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblxi"; version = "1.20"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "liblxi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jS0huNkbyKrsJ3NkenrYtjkzLakOsTJpwlgSo98ribE="; }; + postPatch = '' + # needed by darwin + sed -e 1i'#include <string.h>' \ + -e 1i'#include <stdlib.h>' \ + -i src/bonjour.c + ''; + nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ @@ -36,4 +43,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.vq ]; }; -} +}) diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index eee6b4faa5d3e..a8c212ea84639 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sourceforge.net/projects/mad/"; - description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; + description = "High-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index ee8891d051f0c..cd30b61f1c1fd 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A simple GObject game controller library"; + description = "Simple GObject game controller library"; mainProgram = "manette-test"; homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index c2084b007a619..7ee8b86566472 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guile.effectiveVersion}"; meta = { - description = "A library to parse and evaluate symbolic expressions input as text"; + description = "Library to parse and evaluate symbolic expressions input as text"; longDescription = '' GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic expressions input as text. It supports expressions in any number of variables of arbitrary diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index aee9176790e2e..8bbd6d9d9df03 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A library to parse Matroska files"; + description = "Library to parse Matroska files"; homepage = "https://matroska.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index bf156fb1c55dd..867bd5dc9ba3e 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation (finalAttrs: { pname = "libmd"; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 90b548bef73ab..f3122d8ab2105 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library for playing tracker music module files"; + description = "Library for playing tracker music module files"; mainProgram = "libmikmod-config"; homepage = "https://mikmod.shlomifish.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index a2a3971844bc1..5c999c4c1d484 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A development framework for C providing high performance and highly flexible algorithms"; + description = "Development framework for C providing high performance and highly flexible algorithms"; homepage = "https://github.com/atheme/libmowgli-2"; license = licenses.isc; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index bf5f25ca43f8a..289d5beac8d74 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://libmpeg2.sourceforge.net/"; - description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; + description = "Free library for decoding mpeg-2 and mpeg-1 video streams"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; unix; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index d03cdd635cd13..136a303109162 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A de/compression library for various Microsoft formats"; + description = "De/compression library for various Microsoft formats"; homepage = "https://www.cabextract.org.uk/libmspack"; license = lib.licenses.lgpl2Only; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index cd6820fdab06a..ea61234333b81 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libmtp/libmtp"; - description = "An implementation of Microsoft's Media Transfer Protocol"; + description = "Implementation of Microsoft's Media Transfer Protocol"; longDescription = '' libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP) in the form of a library suitable primarily for POSIX compliant operating diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index c6bbde6940b13..c178e152d2304 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.clutter-project.org/"; - description = "A Clutter-based toolkit"; + description = "Clutter-based toolkit"; mainProgram = "mx-create-image-cache"; longDescription = ''Mx is a widget toolkit using Clutter that provides a set of standard diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index 90ed45178d1fa..8be83148b5140 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, cmake, eigen, boost}: stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.1.2"; pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; repo = "libnabo"; rev = version; - sha256 = "sha256-EVbvNwj1aRhRr5PhF6Kkb/UTn4JzF174WX1C+tvBv2Q="; + sha256 = "sha256-/XXRwiLLaEvp+Q+c6lBiuWBb9by6o0pDf8wFtBNp7o8="; }; nativeBuildInputs = [ cmake ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; - description = "A fast K Nearest Neighbor library for low-dimensional spaces"; + description = "Fast K Nearest Neighbor library for low-dimensional spaces"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ cryptix ]; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 4124422c85bdc..1ec57144b1a07 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://natspec.sourceforge.net/"; - description = "A library intended to smooth national specificities in using of programs"; + description = "Library intended to smooth national specificities in using of programs"; mainProgram = "natspec"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 7a2e358d572be..c7e9e2b087e34 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -4,6 +4,7 @@ , bash-completion , pkg-config , perl +, buildPythonBindings ? false, python3 , libxml2 , fuse , fuse3 @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { bash-completion pkg-config perl - ]; + ] + ++ lib.optionals buildPythonBindings [ python3 ]; buildInputs = [ fuse @@ -32,8 +34,16 @@ stdenv.mkDerivation rec { libxml2 ]; + configureFlags = lib.optionals buildPythonBindings [ "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}" ]; + installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ]; + postInstall = lib.optionalString buildPythonBindings '' + LIBNBD_PYTHON_METADATA='${placeholder "out"}/${python3.sitePackages}/nbd-${version}.dist-info/METADATA' + install -Dm644 -T ${./libnbd-metadata} $LIBNBD_PYTHON_METADATA + substituteAllInPlace $LIBNBD_PYTHON_METADATA + ''; + meta = with lib; { homepage = "https://gitlab.com/nbdkit/libnbd"; description = "Network Block Device client library in userspace"; @@ -59,5 +69,4 @@ stdenv.mkDerivation rec { } # TODO: package the 1.6-stable version too # TODO: git version needs ocaml -# TODO: bindings for go, ocaml and python - +# TODO: bindings for go and ocaml diff --git a/pkgs/development/libraries/libnbd/libnbd-metadata b/pkgs/development/libraries/libnbd/libnbd-metadata new file mode 100644 index 0000000000000..7d91ab88d2015 --- /dev/null +++ b/pkgs/development/libraries/libnbd/libnbd-metadata @@ -0,0 +1,3 @@ +Metadata-Version: 2.1 +Name: nbd +Version: @version@ diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 941ef5dad79f8..52c906ad5f185 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; meta = with lib; { - description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; + description = "Userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; homepage = "https://netfilter.org/projects/libnftnl/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 6da456b26ed66..eb6a057dcae35 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "The Next Generation Spice (Electronic Circuit Simulator)"; + description = "Next Generation Spice (Electronic Circuit Simulator)"; mainProgram = "ngspice"; homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 589703f574c61..cb8506dca6ca5 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A library that sends desktop notifications to a notification daemon"; + description = "Library that sends desktop notifications to a notification daemon"; homepage = "https://gitlab.gnome.org/GNOME/libnotify"; license = licenses.lgpl21; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libnut/default.nix b/pkgs/development/libraries/libnut/default.nix index 401327b0158a0..c89206209963c 100644 --- a/pkgs/development/libraries/libnut/default.nix +++ b/pkgs/development/libraries/libnut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A library to read/write the NUT video container format"; + description = "Library to read/write the NUT video container format"; homepage = "https://git.ffmpeg.org/gitweb/nut.git"; license = licenses.mit; maintainers = with maintainers; [quag]; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index d4a6aab24c871..4f9574e079081 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A base library for generating ODF documents"; + description = "Base library for generating ODF documents"; license = licenses.mpl20; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index ecf013363ad73..d458590179dd2 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://xiph.org/oggz/"; - description = "A C library and tools for manipulating with Ogg files and streams"; + description = "C library and tools for manipulating with Ogg files and streams"; longDescription = '' Oggz comprises liboggz and the tool oggz, which provides commands to inspect, edit and validate Ogg files. The oggz-chop tool can also be used diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 7a28ac119c345..4b112b70e7ad3 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildFlags = lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions"; meta = with lib; { - description = "A library of simple functions that are optimized for various CPUs"; + description = "Library of simple functions that are optimized for various CPUs"; mainProgram = "oil-bugreport"; homepage = "https://liboil.freedesktop.org"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 2b5d37fad2ecc..78f37bbbb67dd 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://omxil.sourceforge.net/"; - description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; + description = "Opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; mainProgram = "omxregister-bellagio"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index bbec90a4055ae..005422295236e 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , alsa-lib , cmake , doxygen diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix deleted file mode 100644 index d247b8b0efa6c..0000000000000 --- a/pkgs/development/libraries/libopus/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, fetchpatch -, fetchurl -, gitUpdater -, meson -, python3 -, ninja -, fixedPoint ? false -, withCustomModes ? true -, withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86 -, withAsm ? false - -# tests -, ffmpeg-headless -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libopus"; - version = "1.5.2"; - - src = fetchurl { - url = "https://downloads.xiph.org/releases/opus/opus-${finalAttrs.version}.tar.gz"; - hash = "sha256-ZcHS94ufL7IAgsOMvkfJUa1YOTRYduRpQWEu6H+afOE="; - }; - - patches = [ - # Some tests time out easily on slower machines - ./test-timeout.patch - ]; - - postPatch = '' - patchShebangs meson/ - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - meson - python3 - ninja - ]; - - mesonFlags = [ - (lib.mesonBool "fixed-point" fixedPoint) - (lib.mesonBool "custom-modes" withCustomModes) - (lib.mesonEnable "intrinsics" withIntrinsics) - (lib.mesonEnable "rtcd" (withIntrinsics || withAsm)) - (lib.mesonEnable "asm" withAsm) - (lib.mesonEnable "docs" false) - ]; - - doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails - - passthru = { - updateScript = gitUpdater { - url = "https://gitlab.xiph.org/xiph/opus.git"; - rev-prefix = "v"; - }; - - tests = { - inherit ffmpeg-headless; - - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - moduleNames = [ "opus" ]; - }; - }; - }; - - meta = with lib; { - description = "Open, royalty-free, highly versatile audio codec"; - homepage = "https://opus-codec.org/"; - changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ ]; - }; -}) diff --git a/pkgs/development/libraries/libopus/test-timeout.patch b/pkgs/development/libraries/libopus/test-timeout.patch deleted file mode 100644 index 76025e648d8f5..0000000000000 --- a/pkgs/development/libraries/libopus/test-timeout.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,6 +1,5 @@ - # Tests that link to libopus - opus_tests = [ -- ['test_opus_api'], - ['test_opus_decode', [], 120], - ['test_opus_encode', 'opus_encode_regressions.c', 240], - ['test_opus_extensions', [], 120], diff --git a/pkgs/development/libraries/liboqs/default.nix b/pkgs/development/libraries/liboqs/default.nix deleted file mode 100644 index e703dc3647faa..0000000000000 --- a/pkgs/development/libraries/liboqs/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - openssl, - enableStatic ? stdenv.hostPlatform.isStatic, -}: - -stdenv.mkDerivation rec { - pname = "liboqs"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "open-quantum-safe"; - repo = pname; - rev = version; - sha256 = "sha256-h3mXoGRYgPg0wKQ1u6uFP7wlEUMQd5uIBt4Hr7vjNtA="; - }; - - patches = [ ./fix-openssl-detection.patch ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" - "-DOQS_DIST_BUILD=ON" - "-DOQS_BUILD_ONLY_LIB=ON" - ]; - - dontFixCmake = true; # fix CMake file will give an error - - meta = with lib; { - description = "C library for prototyping and experimenting with quantum-resistant cryptography"; - homepage = "https://openquantumsafe.org"; - license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.sigmanificient ]; - }; -} diff --git a/pkgs/development/libraries/liboqs/fix-openssl-detection.patch b/pkgs/development/libraries/liboqs/fix-openssl-detection.patch deleted file mode 100644 index 33be7188370f9..0000000000000 --- a/pkgs/development/libraries/liboqs/fix-openssl-detection.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6bdcf53de74ac2afba42deea63522939ca51f871 Mon Sep 17 00:00:00 2001 -From: Raphael Robatsch <raphael-git@tapesoftware.net> -Date: Mon, 25 Dec 2023 16:15:29 +0000 -Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR. - -CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR -forcibly to "/usr" breaks this. ---- - CMakeLists.txt | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 288bcbe8..9750fae6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake) - include(.CMake/alg_support.cmake) - - if(${OQS_USE_OPENSSL}) -- if(NOT DEFINED OPENSSL_ROOT_DIR) -- if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") -- if(EXISTS "/usr/local/opt/openssl@1.1") -- set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1") -- elseif(EXISTS "/opt/homebrew/opt/openssl@1.1") -- set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1") -- endif() -- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") -- set(OPENSSL_ROOT_DIR "/usr") -- endif() -- endif() - find_package(OpenSSL 1.1.1 REQUIRED) - endif() - --- -2.42.0 - diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index a04050458edfd..9cf52b2cc04e2 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A GPL reimplementation of libdjb"; + description = "GPL reimplementation of libdjb"; homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 772f3ff719d58..7def28b924603 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://parchive.sourceforge.net/"; license = lib.licenses.gpl2Plus; - description = "A library for using Parchives (parity archive volume sets)"; + description = "Library for using Parchives (parity archive volume sets)"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index 141114f0f34ce..e2d1bf0f82311 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A GObject-based plugins engine"; + description = "GObject-based plugins engine"; homepage = "https://gitlab.gnome.org/GNOME/libpeas"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 9a94b2aa93263..71996ce7f81be 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A GObject-based plugins engine"; + description = "GObject-based plugins engine"; mainProgram = "peas-demo"; homepage = "https://gitlab.gnome.org/GNOME/libpeas"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index edd3379617279..ceda871932abc 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -1,14 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gtest, boost, pkg-config, protobuf, icu, Foundation, buildPackages }: +{ lib +, stdenv +, fetchFromGitHub +, buildPackages +, cmake +, gtest +, jre +, pkg-config +, boost +, icu +, protobuf +, Foundation +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "8.12.37"; + version = "8.13.37"; src = fetchFromGitHub { - owner = "googlei18n"; + owner = "google"; repo = "libphonenumber"; - rev = "v${version}"; - sha256 = "sha256-xLxadSxVY3DjFDQrqj3BuOvdMaKdFSLjocfzovJCBB0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-TQ9Hz9fnKZhZkg+hkXgFqH4TDCWMe+fcEWE6ShwSBBU="; }; patches = [ @@ -19,29 +31,35 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + gtest + jre pkg-config ]; buildInputs = [ boost - protobuf icu - gtest - ] ++ lib.optional stdenv.isDarwin Foundation; + protobuf + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + ]; cmakeDir = "../cpp"; - cmakeFlags = - lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DBUILD_GEOCODER=OFF" - "-DPROTOC_BIN=${buildPackages.protobuf}/bin/protoc" - ]; - checkPhase = "./libphonenumber_test"; + doCheck = true; + + checkTarget = "tests"; + + cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + (lib.cmakeFeature "CMAKE_CROSSCOMPILING_EMULATOR" (stdenv.hostPlatform.emulator buildPackages)) + (lib.cmakeFeature "PROTOC_BIN" (lib.getExe buildPackages.protobuf)) + ]; meta = with lib; { + changelog = "https://github.com/google/libphonenumber/blob/${finalAttrs.src.rev}/release_notes.txt"; description = "Google's i18n library for parsing and using phone numbers"; homepage = "https://github.com/google/libphonenumber"; license = licenses.asl20; maintainers = with maintainers; [ illegalprime ]; }; -} +}) diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 558acc4bbbeb8..5759d9bed505b 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -15,6 +15,7 @@ , libdovi , xxHash , fast-float +, vulkanSupport ? true }: stdenv.mkDerivation rec { @@ -33,13 +34,11 @@ stdenv.mkDerivation rec { meson ninja pkg-config - vulkan-headers python3Packages.jinja2 python3Packages.glad2 ]; buildInputs = [ - vulkan-loader shaderc lcms2 libGL @@ -47,15 +46,19 @@ stdenv.mkDerivation rec { libunwind libdovi xxHash + vulkan-headers + ] ++ lib.optionals vulkanSupport [ + vulkan-loader ] ++ lib.optionals (!stdenv.cc.isGNU) [ fast-float ]; mesonFlags = with lib; [ - (mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") (mesonBool "demos" false) # Don't build and install the demo programs (mesonEnable "d3d11" false) # Disable the Direct3D 11 based renderer (mesonEnable "glslang" false) # rely on shaderc for GLSL compilation instead + (mesonEnable "vk-proc-addr" vulkanSupport) + (mesonOption "vulkan-registry" "${vulkan-headers}/share/vulkan/registry/vk.xml") ] ++ optionals stdenv.isDarwin [ (mesonEnable "unwind" false) # libplacebo doesn’t build with `darwin.libunwind` ]; diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index de71d021d015d..1e0fa3160e5a1 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-eWtQaYUWZNQYQOUXnbUfjrtpoO6CnNJ8WjlowA49sG0="; + sha256 = "sha256-+lsRYKA1FIXQXv0nfDNCAqIbqPunrzlpSC5FoF3VIsg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 8e38347c722e1..9a69af13d2fd1 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library to handle Apple Property List format in binary or XML"; + description = "Library to handle Apple Property List format in binary or XML"; homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index e94bd026a7a6b..9792447bcc888 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "The official reference implementation for the PNG file format"; + description = "Official reference implementation for the PNG file format"; homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng; maintainers = [ ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 34d7a3e580b79..11e3fb31604f7 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -20,7 +20,11 @@ in stdenv.mkDerivation (finalAttrs: { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; }; - postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; + postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" + + lib.optionalString stdenv.isFreeBSD '' + + sed -i 1i'int feenableexcept(int __mask);' contrib/libtests/pngvalid.c + ''; outputs = [ "out" "dev" "man" ]; outputBin = "dev"; @@ -36,7 +40,7 @@ in stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; + description = "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/pnggroup/libpng/blob/v${finalAttrs.version}/CHANGES"; license = licenses.libpng2; diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 92e1585373479..709ca6876048a 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; - description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; + description = "\"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ cryptix ]; diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/development/libraries/libpostal/default.nix index fbeb60022a1dc..1d0ea162d1d6b 100644 --- a/pkgs/development/libraries/libpostal/default.nix +++ b/pkgs/development/libraries/libpostal/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ]; meta = with lib; { - description = "A C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data"; + description = "C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data"; homepage = "https://github.com/openvenues/libpostal"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; diff --git a/pkgs/development/libraries/libpqxx/6.nix b/pkgs/development/libraries/libpqxx/6.nix index 1c2a98fcb3c99..ff394526ea207 100644 --- a/pkgs/development/libraries/libpqxx/6.nix +++ b/pkgs/development/libraries/libpqxx/6.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" ]; meta = { - description = "A C++ library to access PostgreSQL databases"; + description = "C++ library to access PostgreSQL databases"; homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index acb0013035cbf..13fecb9b56bfc 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { CXXFLAGS = [ "-std=c++17" ]; meta = { - description = "A C++ library to access PostgreSQL databases"; + description = "C++ library to access PostgreSQL databases"; homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 28b4ac66004d6..1183f46799ef5 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library that provides automatic proxy configuration management"; + description = "Library that provides automatic proxy configuration management"; homepage = "https://libproxy.github.io/libproxy/"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index d6d33957b9a62..9b2ff09850262 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://www.five-ten-sg.com/libpst/"; - description = "A library to read PST (MS Outlook Personal Folders) files"; + description = "Library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index a99b27d38d8c0..b8df75b3c1781 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "An advanced calculator library"; + description = "Advanced calculator library"; homepage = "http://qalculate.github.io"; license = licenses.gpl2Plus; maintainers = with maintainers; [ gebner doronbehar alyaeanyx ]; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index fe54cdf3d338f..080078d2b7fac 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/clusterlabs/libqb"; - description = "A library providing high performance logging, tracing, ipc, and poll"; + description = "Library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index afae47c96d3d7..17862e23b75bc 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { stripDebugList = [ "lib" "libexec" "bin" "qml" ]; meta = with lib; { - description = "A multimedia playback framework based on Qt + FFmpeg"; + description = "Multimedia playback framework based on Qt + FFmpeg"; #license = licenses.lgpl21; # For the libraries / headers only. license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. homepage = "http://www.qtav.org/"; diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index e388f2fbacb66..916fa4a3847e7 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A Qt5/Qt6 library to write cross-platform clients for Matrix"; + description = "Qt5/Qt6 library to write cross-platform clients for Matrix"; homepage = "https://quotient-im.github.io/libQuotient/"; license = licenses.lgpl21; maintainers = with maintainers; [ colemickens matthiasbeyer ]; diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix index 34ac547f49209..78934bbdcfb89 100644 --- a/pkgs/development/libraries/libr3/default.nix +++ b/pkgs/development/libraries/libr3/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = { - description = "A high-performance path dispatching library"; + description = "High-performance path dispatching library"; homepage = "https://github.com/c9s/r3"; license = [ lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/libraqm/default.nix b/pkgs/development/libraries/libraqm/default.nix index 4ce422858f5bd..98769f2e374a0 100644 --- a/pkgs/development/libraries/libraqm/default.nix +++ b/pkgs/development/libraries/libraqm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A library for complex text layout"; + description = "Library for complex text layout"; homepage = "https://github.com/HOST-Oman/libraqm"; license = licenses.mit; maintainers = with maintainers; [ sifmelcara ]; diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 14f02d8481e95..bb7508b1cec5f 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config }: diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 1dde9402f9026..2afdb5d32bede 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The RDF Parser Toolkit"; + description = "RDF Parser Toolkit"; homepage = "https://librdf.org/raptor"; license = with lib.licenses; [ lgpl21 asl20 ]; maintainers = [ lib.maintainers.marcweber ]; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index b9d5252215cc6..424022b7ab4bc 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 libxslt ]; meta = { - description = "The RDF Parser Toolkit"; + description = "RDF Parser Toolkit"; mainProgram = "rapper"; homepage = "https://librdf.org/raptor"; license = with lib.licenses; [ lgpl21 asl20 ]; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index ace7d5f5f7866..fa419830f3c7c 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { ; enableParallelBuilding = true; meta = { - description = "A library for real-time communications with async IO support and a complete SIP stack"; + description = "Library for real-time communications with async IO support and a complete SIP stack"; homepage = "https://github.com/baresip/re"; - maintainers = with lib.maintainers; [ elohmeier raskin ]; + maintainers = with lib.maintainers; [ raskin ]; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index cb69770f054a0..527f61b603937 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; + description = "Cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; maintainers = with maintainers; [ brian-dawn pbsds ]; diff --git a/pkgs/development/libraries/librecast/default.nix b/pkgs/development/libraries/librecast/default.nix index 045b0bb309db0..df053e0ad9031 100644 --- a/pkgs/development/libraries/librecast/default.nix +++ b/pkgs/development/libraries/librecast/default.nix @@ -6,7 +6,7 @@ libsodium, }: stdenv.mkDerivation (finalAttrs: { - name = "librecast"; + pname = "librecast"; version = "0.8.0"; src = fetchFromGitea { diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 59836861e7cdf..258067c083002 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnutls zlib openssl ]; meta = with lib; { - description = "A reliable logging library"; + description = "Reliable logging library"; homepage = "https://www.librelp.com/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 8a1d24948aa4a..10dba7e7a59dd 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ; enableParallelBuilding = true; meta = { - description = "A library for real-time audio and video processing"; + description = "Library for real-time audio and video processing"; homepage = "https://github.com/baresip/rem"; - maintainers = with lib.maintainers; [ elohmeier raskin ]; + maintainers = with lib.maintainers; [ raskin ]; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libremidi/default.nix b/pkgs/development/libraries/libremidi/default.nix index 4c19375a07f15..48014bea07416 100644 --- a/pkgs/development/libraries/libremidi/default.nix +++ b/pkgs/development/libraries/libremidi/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A modern C++ MIDI real-time & file I/O library"; + description = "Modern C++ MIDI real-time & file I/O library"; homepage = "https://github.com/jcelerier/libremidi"; maintainers = [ ]; license = lib.licenses.bsd2; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index f466229cfe8e8..6ca1d09ef202f 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = { - description = "A real-time library for sampling rate conversion library"; + description = "Real-time library for sampling rate conversion library"; license = lib.licenses.lgpl2Plus; homepage = "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"; maintainers = [ lib.maintainers.sander ]; diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix index 1dd71d1e311b1..e8733a324cabc 100644 --- a/pkgs/development/libraries/librevenge/default.nix +++ b/pkgs/development/libraries/librevenge/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A base library for writing document import filters"; + description = "Base library for writing document import filters"; license = licenses.mpl20; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/development/libraries/librist/default.nix index 3f56ff3248767..788e75eafddae 100644 --- a/pkgs/development/libraries/librist/default.nix +++ b/pkgs/development/libraries/librist/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A library that can be used to easily add the RIST protocol to your application."; + description = "Library that can be used to easily add the RIST protocol to your application"; homepage = "https://code.videolan.org/rist/librist"; license = with licenses; [ bsd2 mit isc ]; maintainers = with maintainers; [ raphaelr sebtm ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index a682b39bbcd80..e9a9eb977db3f 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.58.0"; + version = "2.58.1"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-18REqSZAa1l5C+DerhluGO0mBZ2lc/oaqeycp2WKVZw="; + hash = "sha256-NyhZYpCoV20wXQbsiv30c1Fv7unf8i4DI16sQz1Wgk4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-ta+3KkDtqTLGoKknUn89c+3XHzvcZyPFPFpgLH5f5uw="; + hash = "sha256-FIW92Cr83YkGTOe/xjyZGZvHYSrG70GBpHc9l0sMjLg="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; @@ -184,14 +184,7 @@ stdenv.mkDerivation (finalAttrs: { jq nix ]} - # update-source-version does not allow updating to the same version so we need to clear it temporarily. - # Get the current version so that we can restore it later. - latestVersion=$(nix-instantiate --eval -A librsvg.version | jq --raw-output) - # Clear the version. Provide hash so that we do not need to do pointless TOFU. - # Needs to be a fake SRI hash that is non-zero, since u-s-v uses zero as a placeholder. - # Also cannot be here verbatim or u-s-v would be confused what to replace. - update-source-version librsvg 0 "sha256-${lib.fixedWidthString 44 "B" "="}" --source-key=cargoDeps > /dev/null - update-source-version librsvg "$latestVersion" --source-key=cargoDeps > /dev/null + update-source-version librsvg --ignore-same-version --source-key=cargoDeps > /dev/null '' ]; # Experimental feature: do not copy! @@ -216,7 +209,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A small library to render SVG images to Cairo surfaces"; + description = "Small library to render SVG images to Cairo surfaces"; homepage = "https://gitlab.gnome.org/GNOME/librsvg"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 4bea630c1b278..10b10529f7ba0 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/bji/libs3"; - description = "A library for interfacing with amazon s3"; + description = "Library for interfacing with amazon s3"; mainProgram = "s3"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 005e74289df7e..027cfa2b5c8be 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A C/C++ implementation of a Sass compiler"; + description = "C/C++ implementation of a Sass compiler"; homepage = "https://github.com/sass/libsass"; license = licenses.mit; maintainers = with maintainers; [ codyopel offline ]; diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix index 443550e8a0a16..376c0abbcdf94 100644 --- a/pkgs/development/libraries/libschrift/default.nix +++ b/pkgs/development/libraries/libschrift/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libschrift"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/tomolt/libschrift"; - description = "A lightweight TrueType font rendering library"; + description = "Lightweight TrueType font rendering library"; license = licenses.isc; platforms = platforms.all; maintainers = [ maintainers.sternenseemann ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 6d4675717f0d2..94034d6167cbf 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/haiwen/libsearpc"; - description = "A simple and easy-to-use C language RPC framework based on GObject System"; + description = "Simple and easy-to-use C language RPC framework based on GObject System"; mainProgram = "searpc-codegen.py"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 10eee1a6bbb00..d0b1515d0bad9 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "A library for storing and retrieving passwords and other secrets"; + description = "Library for storing and retrieving passwords and other secrets"; homepage = "https://gitlab.gnome.org/GNOME/libsecret"; license = lib.licenses.lgpl21Plus; mainProgram = "secret-tool"; diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index cc66f4cc13084..11d10ff64d7c2 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - description = "A schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry"; + description = "Schema-based serializer/deserializer C/C++ library with support for Avro and the Confluent Platform Schema Registry"; homepage = "https://github.com/confluentinc/libserdes"; license = licenses.asl20; maintainers = with maintainers; [ liff ]; diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index cc6723162a085..d0e6e95ad0c7b 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch2 , gi-docgen , meson , ninja @@ -21,26 +20,18 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.2.1"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-EQXuB34hR/KgOc3fphb6XLlDiIPdlAQn4RaZ3NZUnBE="; + url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; + hash = "sha256-b1h1effy1gs40/RyfrGo0v6snL3AGOU/9fdyqGCPpEs="; }; - patches = [ - (fetchpatch2 { - # Fix tests https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/236 - url = "https://gitlab.gnome.org/GNOME/libshumate/-/commit/852615b0df2252ea67f4f82e9ace2fc2794467b3.patch"; - hash = "sha256-Ksye3zNNYmzP4O+QFDVODXUkFJOLDVMEZNfGXwbxWhs="; - }) - ]; - depsBuildBuild = [ # required to find native gi-docgen when cross compiling pkg-config @@ -95,7 +86,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libshumate"; }; }; @@ -107,4 +98,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 9f9f833f0f283..095406cd5fbb9 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-NYdV70YEepjGMmeTALTQvlRvK3R7JjA4VJYYjOwO4AA="; + hash = "sha256-qZharhEZ16q3Vd2PwVsKQaP/b6bT/okwEPKKwvRl5D8="; }; outputs = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library to play Commodore 64 music derived from libsidplay2"; + description = "Library to play Commodore 64 music derived from libsidplay2"; longDescription = '' libsidplayfp is a C64 music player library which integrates the reSID SID chip emulation into a cycle-based emulator diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index 8253d1df74fe1..12838b6269f7f 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An interpreter for RFC 3028 Sieve and various extensions"; + description = "Interpreter for RFC 3028 Sieve and various extensions"; homepage = "http://sodabrew.com/libsieve/"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix index 5515901a1cf2a..672cb984b8ee4 100644 --- a/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/pkgs/development/libraries/libsigcxx/3.0.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; - description = "A typesafe callback system for standard C++"; + description = "Typesafe callback system for standard C++"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.all; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index c73cbaa55dc30..7e2746fb7f4c6 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; - description = "A typesafe callback system for standard C++"; + description = "Typesafe callback system for standard C++"; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index 9f0496262f2a2..bdb6df0e52f89 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A library for managing single signon credentials which can be used from GLib applications"; + description = "Library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index d4fa2a4d6ffe3..5bdaafc9f15c6 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "The SIXEL library for console graphics, and converter programs"; + description = "SIXEL library for console graphics, and converter programs"; homepage = "https://github.com/libsixel/libsixel"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 2f6e98e7dd0a0..8256f0525bbc6 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "A library to deal with Japanese kana-to-kanji conversion method"; + description = "Library to deal with Japanese kana-to-kanji conversion method"; mainProgram = "skk"; longDescription = '' Libskk is a library that implements basic features of SKK including: diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 14139d849dc72..5750e6677b347 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-std=gnu90"; meta = with lib; { - description = "A Library to Access SMI MIB Information"; + description = "Library to Access SMI MIB Information"; homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; license = licenses.free; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 02dbd633281c0..0e1dfb0bc08b0 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A C library for reading and writing files containing sampled sound"; + description = "C library for reading and writing files containing sampled sound"; homepage = "https://libsndfile.github.io/libsndfile/"; changelog = "https://github.com/libsndfile/libsndfile/releases/tag/${version}"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 4570b10db39c7..ac304ce31a048 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,28 +1,18 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , testers }: stdenv.mkDerivation (finalAttrs: { pname = "libsodium"; - version = "1.0.19"; + version = "1.0.20"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-AY15/goEXMoHMx03vQy1ey6DjFG8SP2DehRy5QBou+o="; + hash = "sha256-67Ze9spDkzPCu0GgwZkFhyiNoH9sf9B8s6GMwY0wzhk="; }; outputs = [ "out" "dev" ]; - patches = [ - # Drop -Ofast as it breaks floating point arithmetics in downstream - # users. - (fetchpatch { - name = "drop-Ofast.patch"; - url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch"; - hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; @@ -39,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "A modern and easy-to-use crypto library"; + description = "Modern and easy-to-use crypto library"; homepage = "https://doc.libsodium.org/"; license = licenses.isc; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index e044037eb79d8..d8c49efd43caa 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ++ lib.optional withRpm rpm; meta = with lib; { - description = "A free package dependency solver"; + description = "Free package dependency solver"; homepage = "https://github.com/openSUSE/libsolv"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 780ca0ebdc73e..f583900e35d95 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with lib; { - description = "A library that simplifies the drawing of beautiful curves"; + description = "Library that simplifies the drawing of beautiful curves"; homepage = "https://github.com/fontforge/libspiro"; license = licenses.gpl3Plus; maintainers = [ maintainers.erictapen ]; diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index 5cb0974af9f1d..e6fd748362e90 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "The next generation SRS library from the original designer of SRS"; + description = "Next generation SRS library from the original designer of SRS"; mainProgram = "srs"; license = with lib.licenses; [ gpl2 bsd3 ]; homepage = "https://www.libsrs2.org/"; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index f7a51da9fa672..65770cb657101 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { ./CVE-2023-48795.patch ]; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname + ''; + outputs = [ "out" "dev" "devdoc" ]; propagatedBuildInputs = [ openssl ]; # see Libs: in libssh2.pc @@ -22,7 +28,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; meta = with lib; { - description = "A client-side C library implementing the SSH2 protocol"; + description = "Client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = platforms.all; license = with licenses; [ bsd3 libssh2 ]; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index d2a94d7168a8d..e5a17b68e0831 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; - description = "A library that provides cross platforms access to statistics about the running system"; + description = "Library that provides cross platforms access to statistics about the running system"; maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index 698fa5c579f70..13b117b5e0128 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library for simple gesture recognition"; + description = "Library for simple gesture recognition"; homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; license = lib.licenses.gpl2; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index cd14660fb9f7b..c3e168999e32a 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library for support vector machines"; + description = "Library for support vector machines"; homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/"; license = licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index 47ca65e8490e8..46b2e492cb353 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cmake perl ]; meta = with lib; { - description = "A library to implement a test protocol"; + description = "Library to implement a test protocol"; longDescription = '' libtap is a library to implement the Test Anything Protocol for C originally created by Nik Clayton. This is a maintenance diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index a0b9cebef4d76..3c630bac630de 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnu.org/software/libtasn1/"; - description = "An ASN.1 library"; + description = "ASN.1 library"; longDescription = '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some other packages. The goal of this implementation is to be highly diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 05aff273400e8..8c93e414ed5d9 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libthreadar.sourceforge.net/"; - description = "A C++ library that provides several classes to manipulate threads"; + description = "C++ library that provides several classes to manipulate threads"; longDescription = '' Libthreadar is a C++ library providing a small set of C++ classes to manipulate threads in a very simple and efficient way from your C++ code. diff --git a/pkgs/development/libraries/libtickit/default.nix b/pkgs/development/libraries/libtickit/default.nix index 54386e57a0acf..eaecc2d6d8bdd 100644 --- a/pkgs/development/libraries/libtickit/default.nix +++ b/pkgs/development/libraries/libtickit/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { doCheck = true; meta = with lib; { - description = "A terminal interface construction kit"; + description = "Terminal interface construction kit"; longDescription = '' This library provides an abstracted mechanism for building interactive full-screen terminal programs. It provides a full set of output drawing functions, and handles keyboard and mouse diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index c8871a4ba68e8..f1e5c7da1803d 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -10,8 +10,10 @@ , lerc , libdeflate , libjpeg +, libwebp , xz , zlib +, zstd # for passthru.tests , libgeotiff @@ -62,14 +64,19 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ lerc + zstd ]; # TODO: opengl support (bogus configure detection) propagatedBuildInputs = [ libdeflate libjpeg + # libwebp depends on us; this will cause infinite + # recursion otherwise + (libwebp.override { tiffSupport = false; }) xz zlib + zstd ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 7876c23bcc1dc..cd198dac309d1 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/archive/p/libtiger/"; - description = "A rendering library for Kate streams using Pango and Cairo"; + description = "Rendering library for Kate streams using Pango and Cairo"; platforms = lib.platforms.unix; license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 9bfd42e7a71c2..1457030f874cb 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A fairly comprehensive, modular and portable cryptographic toolkit"; + description = "Fairly comprehensive, modular and portable cryptographic toolkit"; homepage = "https://www.libtom.net/LibTomCrypt/"; changelog = "https://github.com/libtom/libtomcrypt/raw/v${version}/changes"; license = with licenses; [ publicDomain wtfpl ]; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index fc0c9608cf4f7..2501bc827faed 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.libtom.net/LibTomMath/"; - description = "A library for integer-based number-theoretic applications"; + description = "Library for integer-based number-theoretic applications"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix index adea75b02e945..6b4be4b832a44 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://libtorrent.org/"; - description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + description = "C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ ]; broken = stdenv.isDarwin; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 75f365ddcb38c..118d143e2cd5e 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://libtorrent.org/"; - description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + description = "C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 9acbaa4790630..724a3b6b3118b 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A C library and command-line tool that implements the host-side of the U2F protocol"; + description = "C library and command-line tool that implements the host-side of the U2F protocol"; homepage = "https://developers.yubico.com/libu2f-host"; license = with licenses; [ gpl3Plus lgpl21Plus ]; mainProgram = "u2f-host"; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index 96506dfb85c91..86f0245b2ed74 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://developers.yubico.com/libu2f-server/"; - description = "A C library that implements the server-side of the U2F protocol"; + description = "C library that implements the server-side of the U2F protocol"; mainProgram = "u2f-server"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libuiohook/default.nix b/pkgs/development/libraries/libuiohook/default.nix index 3f1f48317fdc8..4fe42dad6c898 100644 --- a/pkgs/development/libraries/libuiohook/default.nix +++ b/pkgs/development/libraries/libuiohook/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A C library to provide global keyboard and mouse hooks from userland"; + description = "C library to provide global keyboard and mouse hooks from userland"; homepage = "https://github.com/kwhat/libuiohook"; license = licenses.gpl3Only; platforms = platforms.all; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index c1e0881bf3ff2..d73bed773dffc 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/selmf/unarr"; - description = "A lightweight decompression library with support for rar, tar and zip archives"; + description = "Lightweight decompression library with support for rar, tar and zip archives"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 3cbb78d83ce9b..f0d153c700800 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20230916"; + version = "20240524"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-8mLXTvi4KbU4NiCPaJINTeFbnTAabGDg8ufpSHSqy0Y="; + sha256 = "sha256-LANwM0fhCsscXAdI/qGOmUWDzAhe3g9w3J68g4szDZQ="; }; nativeBuildInputs = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/fontforge/libuninameslist/"; - description = "A Library of Unicode names and annotation data"; + description = "Library of Unicode names and annotation data"; license = licenses.bsd3; maintainers = with maintainers; [ erictapen ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index 678f685d4882d..ffc46599cab0c 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/Archive/unique"; - description = "A library for writing single instance applications"; + description = "Library for writing single instance applications"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index f75aed442a852..2e9f2a8a12047 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://gitlab.gnome.org/Archive/unique"; - description = "A library for writing single instance applications"; + description = "Library for writing single instance applications"; license = lib.licenses.lgpl21; platforms = with lib.platforms; linux ++ darwin; }; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index c27fce32ec005..066f23cf542aa 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { ]; meta = with lib; { - description = "A library for instrumenting and integrating with all aspects of the Unity shell"; + description = "Library for instrumenting and integrating with all aspects of the Unity shell"; homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 5144abc6dc5b6..7999fa4971877 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.nongnu.org/libunwind"; - description = "A portable and efficient API to determine the call-chain of a program"; + description = "Portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; # https://github.com/libunwind/libunwind#libunwind platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd" "x86_64-linux" "x86_64-solaris" ]; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 9114fe5ec47f5..bd8561e0e8a3f 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , doxygen , pkg-config diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 9230e79c46d04..33c821302cb2e 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A client library to multiplex connections from and to iOS devices"; + description = "Client library to multiplex connections from and to iOS devices"; homepage = "https://github.com/libimobiledevice/libusbmuxd"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 4099d53f87bfd..82a37d0434d0a 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A multi-platform support library with a focus on asynchronous I/O"; + description = "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"; pkgConfigModules = [ "libuv" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 9b53b7cc138e4..eceba4ac8ebf0 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "An implementation for VA-API (Video Acceleration API)"; + description = "Implementation for VA-API (Video Acceleration API)"; longDescription = '' VA-API is an open-source library and API specification, which provides access to graphics hardware acceleration capabilities for video diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 25db3a1149acf..febcc2cc4de20 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ]; meta = with lib; { - description = "A collection of utilities and examples for VA-API"; + description = "Collection of utilities and examples for VA-API"; longDescription = '' libva-utils is a collection of utilities and examples to exercise VA-API in accordance with the libva project. diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 0b07548d073a6..895a382c96a35 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation { pname = "libvgm"; - version = "0-unstable-2024-04-24"; + version = "0-unstable-2024-06-08"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "1271ab3a0ec1440d2e537ead46165e189671dfd0"; - hash = "sha256-vle9h7+izdpu9fe6LWD06j8oVQIL/lOApPrdjILmPX4="; + rev = "34c368cde98f33c42455fbbfbec07073ba79bf5c"; + hash = "sha256-eX2k2cUtapHhx8dLaFk63Si0Di1q0uDWvdOI0+FgqEY="; }; outputs = [ diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/development/libraries/libviperfx/default.nix index 580329754b668..2778726a4bf7c 100644 --- a/pkgs/development/libraries/libviperfx/default.nix +++ b/pkgs/development/libraries/libviperfx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/vipersaudio/viperfx_core_binary"; - description = "The ViPER FX core"; + description = "ViPER FX core"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ rewine ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 81dacdb493c91..ec35e5727c8b5 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -387,7 +387,7 @@ stdenv.mkDerivation rec { passthru.tests.libvirtd = nixosTests.libvirtd; meta = with lib; { - description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes"; + description = "Toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes"; homepage = "https://libvirt.org/"; changelog = "https://gitlab.com/libvirt/libvirt/-/raw/v${version}/NEWS.rst"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index b9856e90edc92..e6a425660cc8d 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A library providing ability to interpret and import visio diagrams into various applications"; + description = "Library providing ability to interpret and import visio diagrams into various applications"; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio"; license = licenses.mpl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 2a84b4da0ea1b..12fae974312be 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "An abstraction library for audio visualisations"; + description = "Abstraction library for audio visualisations"; homepage = "https://sourceforge.net/projects/libvisual/"; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix index b1eb5764dba46..265e19a1ae77b 100644 --- a/pkgs/development/libraries/libvmi/default.nix +++ b/pkgs/development/libraries/libvmi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libvmi.com/"; - description = "A C library for virtual machine introspection"; + description = "C library for virtual machine introspection"; longDescription = '' LibVMI is a C library with Python bindings that makes it easy to monitor the low-level details of a running virtual machine by viewing its memory, trapping on hardware events, diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 4880c835a1eb3..84e0dba1dd252 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , libjpeg , openssl diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index dda6b13c1bf6c..5f5fc710d14dc 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -54,12 +54,26 @@ let else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" else "8"; + cpu = + /**/ if stdenv.hostPlatform.isArmv7 then "armv7" + else if stdenv.hostPlatform.isAarch64 then "arm64" + else if stdenv.hostPlatform.isx86_32 then "x86" + else stdenv.hostPlatform.parsed.cpu.name; + kernel = # Build system doesn't understand BSD, so pretend to be Linux. /**/ if stdenv.isBSD then "linux" else if stdenv.isDarwin then "darwin${darwinVersion}" else stdenv.hostPlatform.parsed.kernel.name; + isGeneric = + /**/ (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian) + || stdenv.hostPlatform.parsed.cpu.name == "armv6l"; + + target = + /**/ if (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then + (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc") + else null; in assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; @@ -163,8 +177,8 @@ stdenv.mkDerivation rec { (enableFeature (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") - ] ++ optionals (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) [ - "--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${kernel}-gcc" + ] ++ optionals (target != null) [ + "--target=${target}" (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") ] # Experimental features ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/development/libraries/libwbxml/default.nix index b5dc8c18208a6..446735c5eec71 100644 --- a/pkgs/development/libraries/libwbxml/default.nix +++ b/pkgs/development/libraries/libwbxml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libwbxml"; - version = "0.11.8"; + version = "0.11.9"; src = fetchFromGitHub { owner = "libwbxml"; repo = "libwbxml"; rev = "${pname}-${version}"; - sha256 = "sha256-WCVKfIk6R2rVaz1SbJL9eLqNC0f4VzL74Sw2IKdDE9I="; + sha256 = "sha256-zmMsp5xS13rqfSWXXb0FGQcGZkrSMRYc/GQppO4/+Z4="; }; nativeBuildInputs = [ cmake ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libwbxml/libwbxml"; - description = "The WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents"; + description = "WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents"; maintainers = with maintainers; [ mh ]; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/development/libraries/libwnck/2.nix index a1f54006beb58..bc5a89dc120dc 100644 --- a/pkgs/development/libraries/libwnck/2.nix +++ b/pkgs/development/libraries/libwnck/2.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK meta = { - description = "A library for creating task lists and pagers"; + description = "Library for creating task lists and pagers"; homepage = "https://gitlab.gnome.org/GNOME/libwnck"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ johnazoidberg ]; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 99d81870cce0e..0aa0b746978c8 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; meta = with lib; { - description = "A library for importing and exporting WordPerfect documents"; + description = "Library for importing and exporting WordPerfect documents"; homepage = "https://libwpd.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index a29dd6b2627bb..c78ee91a20926 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -7,7 +7,6 @@ , libGL , ninja , libX11 -, webkitgtk }: stdenv.mkDerivation rec { @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { description = "General-purpose library for WPE WebKit"; license = licenses.bsd2; homepage = "https://wpewebkit.org"; - maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]); + maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index 3e2fada38c327..d54d9706cbd18 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -11,7 +11,6 @@ , libxkbcommon , libGL , libX11 -, webkitgtk }: stdenv.mkDerivation rec { @@ -48,7 +47,7 @@ stdenv.mkDerivation rec { description = "Freedesktop.org backend for WPE WebKit"; license = licenses.bsd2; homepage = "https://wpewebkit.org"; - maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]); + maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index d71cb7027570a..efd3acb643fbe 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5eH0yu4KAd4q7ibjE4gH1tPKK45nKHlm0f79ZeH9iUM="; }; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./build-aux/m4-autogen/config.guess --replace-fail /usr/bin/uname uname + ''; + outputs = [ "out" "man" diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 67dbb0c4d8cdb..7c635eb98b694 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library to handle keyboard descriptions"; + description = "Library to handle keyboard descriptions"; longDescription = '' libxkbcommon is a keyboard keymap compiler and support library which processes a reduced subset of keymaps as defined by the XKB (X Keyboard diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 601c27c98eedb..0263b25f3ba4d 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library for parsing Excel files"; + description = "Library for parsing Excel files"; homepage = "https://www.libxl.com/"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 2d2a0089c4433..2446df52a2bc9 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx"; }; + CFLAGS = "-std=gnu89"; + # For the x86_64 GNU/Linux arch to be recognized by 'configure' preConfigure = "cp ${libtool}/share/libtool/build-aux/config.sub ."; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index d2e614b331a1a..79fe8c9f52dac 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -4,7 +4,6 @@ , zlib , pkg-config , autoreconfHook -, xz , libintl , python , gettext @@ -37,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: rec { hash = "sha256-JK54/xNjqXPm2L66lBp5RdoqwFbhm1OVautpJ/1s+1Y="; }; + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/725 + postPatch = if stdenv.hostPlatform.isFreeBSD then '' + substituteInPlace ./configure.ac --replace-fail pthread_join pthread_create + '' else null; + strictDeps = true; nativeBuildInputs = [ @@ -52,11 +56,6 @@ stdenv.mkDerivation (finalAttrs: rec { ncurses ] ++ lib.optionals (stdenv.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ libintl - ] ++ lib.optionals stdenv.isFreeBSD [ - # Libxml2 has an optional dependency on liblzma. However, on impure - # platforms, it may end up using that from /usr/lib, and thus lack a - # RUNPATH for that, leading to undefined references for its users. - xz ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index c26807a679528..4cc4e2b15c43b 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A library to help create and query binary XML blobs"; + description = "Library to help create and query binary XML blobs"; mainProgram = "xb-tool"; homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 95ecbbc44deea..1938c523006b2 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/libxslt"; - description = "A C library and tools to do XSL transformations"; + description = "C library and tools to do XSL transformations"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ eelco jtojnar ]; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 9a9c5e0311f16..dc58226edea4b 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://pyyaml.org/"; - description = "A YAML 1.1 parser and emitter written in C"; + description = "YAML 1.1 parser and emitter written in C"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index d0fc1cfd9fbd1..8278b3d8a8418 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A C library to interact with the CCID-part of the Yubikey NEO"; + description = "C library to interact with the CCID-part of the Yubikey NEO"; homepage = "https://developers.yubico.com/libykneomgr"; license = licenses.bsd3; mainProgram = "ykneomgr"; diff --git a/pkgs/development/libraries/libz/default.nix b/pkgs/development/libraries/libz/default.nix index b9ee7f96b4217..ac859e1a0bb8b 100644 --- a/pkgs/development/libraries/libz/default.nix +++ b/pkgs/development/libraries/libz/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sortix.org/libz/"; - description = "A clean fork of zlib"; + description = "Clean fork of zlib"; license = [ lib.licenses.zlib ]; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index cfd4d38ac5745..b90a2691e4cec 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec meta = { homepage = "http://www.tildeslash.com/libzdb/"; - description = "A small, easy to use Open Source Database Connection Pool Library"; + description = "Small, easy to use Open Source Database Connection Pool Library"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index b343184760330..82f7f88b19a69 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://libzip.org/"; - description = "A C library for reading, creating and modifying zip archives"; + description = "C library for reading, creating and modifying zip archives"; license = licenses.bsd3; pkgConfigModules = [ "libzip" ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 378a7202f3715..0e139ad529261 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-werror" ]; meta = { - description = "A library that parses the file format of Zoner Callisto/Draw documents"; + description = "Library that parses the file format of Zoner Callisto/Draw documents"; license = lib.licenses.mpl20; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 0ac3e0f81ecd3..d40ac0a05c540 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; + description = "End-to-end encryption library for instant messaging. Part of the Linphone project"; homepage = "https://www.linphone.org/technical-corner/lime"; license = licenses.gpl3Only; platforms = platforms.all; diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index 276756822746e..0832ef5c6caf2 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -15,7 +15,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"; + description = "Small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters"; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; license = lib.licenses.bsd3; diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index a934ec19d7c13..42017e5e17182 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/antirez/linenoise"; - description = "A minimal, zero-config, BSD licensed, readline replacement"; + description = "Minimal, zero-config, BSD licensed, readline replacement"; maintainers = with lib.maintainers; [ fstamour remexre ]; platforms = lib.platforms.unix; license = lib.licenses.bsd2; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 8c65d02bf565b..7c907e9ef70f4 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.32"; + version = "0.9.33"; src = fetchFromGitLab { domain = "git.openldap.org"; owner = "openldap"; repo = "openldap"; rev = "LMDB_${version}"; - sha256 = "sha256-29ZrGIiGqrvX+WsPRs2V25hPmAJSHTHaGo19nMldsb8="; + sha256 = "sha256-5IBoJ3jaNXao5zVzb0LDM8RGid4s8DGQpjVqrVPLpXQ="; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index df5fab1839cda..0dc8051c35f2c 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://log4cplus.sourceforge.net/"; - description = "A port the log4j library from Java to C++"; + description = "Port the log4j library from Java to C++"; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 1a024a80cca0f..e300a607d7b6c 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://log4cpp.sourceforge.net/"; - description = "A logging framework for C++ patterned after Apache log4j"; + description = "Logging framework for C++ patterned after Apache log4j"; mainProgram = "log4cpp-config"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index d557d5d07e4e7..34e00295000a8 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://logging.apache.org/log4cxx/index.html"; - description = "A logging framework for C++ patterned after Apache log4j"; + description = "Logging framework for C++ patterned after Apache log4j"; license = lib.licenses.asl20; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index 26313ddae5801..41d16e28ff44b 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { CXXFLAGS = "-std=c++11"; meta = with lib; { - description = "A forked version of log4cpp that has been created for the Shibboleth project"; + description = "Forked version of log4cpp that has been created for the Shibboleth project"; mainProgram = "log4shib-config"; maintainers = [ ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index 55be8f9451d1e..ce011b4ba1b60 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms"; + description = "C++ library of designs, containing flexible implementations of common design patterns and idioms"; homepage = "https://loki-lib.sourceforge.net"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index d1a8c48872492..21dd9db2797c4 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A lightweight C library for the Jabber protocol"; + description = "Lightweight C library for the Jabber protocol"; platforms = platforms.all; downloadPage = "http://mcabber.com/files/loudmouth/"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index f7f0878bdffae..a6ce0903469d7 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Oberon00/luabind"; - description = "A library that helps you create bindings between C++ and Lua"; + description = "Library that helps you create bindings between C++ and Lua"; license = lib.licenses.mit; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/luabridge/default.nix b/pkgs/development/libraries/luabridge/default.nix index c16f56065ca70..268c89c390f31 100644 --- a/pkgs/development/libraries/luabridge/default.nix +++ b/pkgs/development/libraries/luabridge/default.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "A lightweight, dependency-free library for binding Lua to C++"; + description = "Lightweight, dependency-free library for binding Lua to C++"; homepage = "https://github.com/vinniefalco/LuaBridge"; changelog = "https://github.com/vinniefalco/LuaBridge/blob/${version}/CHANGES.md"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index bb0c61ba12510..0a907bf4d2858 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bfgroup/Lyra"; - description = "A simple to use, composable, command line parser for C++ 11 and beyond"; + description = "Simple to use, composable, command line parser for C++ 11 and beyond"; platforms = platforms.unix; license = licenses.boost; maintainers = with maintainers; [ davidtwco ]; diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 480e2bb909cd3..43d551819a657 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "lzo"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + configureFlags = lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared" ; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 86b4a320b68f8..dddd224ca6faa 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; + description = "Simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; homepage = "http://libmailcore.com"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index f346906eadc23..2f4044aaed349 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config diff --git a/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch b/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch deleted file mode 100644 index 1df64216d20b3..0000000000000 --- a/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/unit/datasource/ogr.cpp b/test/unit/datasource/ogr.cpp -index 8441ecc55..8dabc67b0 100644 ---- a/test/unit/datasource/ogr.cpp -+++ b/test/unit/datasource/ogr.cpp -@@ -30,7 +30,7 @@ - #include <mapnik/image_util.hpp> - #include <mapnik/datasource_cache.hpp> - --TEST_CASE("ogr") -+TEST_CASE("ogr", "[!shouldfail]") - { - const bool have_ogr_plugin = mapnik::datasource_cache::instance().plugin_registered("ogr"); - if (have_ogr_plugin) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 14ecb984da59b..0428dd585c661 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -22,17 +22,19 @@ , zlib , catch2 , postgresql +, protozero +, sparsehash }: stdenv.mkDerivation rec { pname = "mapnik"; - version = "unstable-2023-11-28"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; - rev = "2e1b32512b1f8b52331994f2a809d8a383c0c984"; - hash = "sha256-qGdUfu6gFWum/Id/W3ICeGZroMQ3Tz9PQf1tt+gaaXM="; + rev = "v${version}"; + hash = "sha256-CNFNGMJU3kzkRrOGsf8/uv5ebHPEQ0tkA+5OubRVEjs="; fetchSubmodules = true; }; @@ -40,6 +42,8 @@ stdenv.mkDerivation rec { substituteInPlace configure \ --replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons rm -r scons + # Remove bundled 'sparsehash' directory in favor of 'sparsehash' package + rm -r deps/mapnik/sparsehash ''; # a distinct dev output makes python-mapnik fail @@ -57,11 +61,10 @@ stdenv.mkDerivation rec { src = ./catch2-src.patch; catch2_src = catch2.src; }) - # Disable broken test - # See discussion: https://github.com/mapnik/mapnik/issues/4329#issuecomment-1248778398 - ./datasource-ogr-test-should-fail.patch # Account for full paths when generating libmapnik.pc ./export-pkg-config-full-paths.patch + # Use 'sparsehash' package. + ./use-sparsehash-package.patch ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -83,21 +86,31 @@ stdenv.mkDerivation rec { zlib libxml2 postgresql + protozero + sparsehash ]; cmakeFlags = [ - # Would require qt otherwise. - "-DBUILD_DEMO_VIEWER:BOOL=OFF" + # Save time by not building some development-related code. + (lib.cmakeBool "BUILD_BENCHMARK" false) + (lib.cmakeBool "BUILD_DEMO_CPP" false) + ## Would require QT otherwise. + (lib.cmakeBool "BUILD_DEMO_VIEWER" false) + # Use 'protozero' package. + (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true) + # macOS builds fail when using memory mapped file cache. + (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.isDarwin)) ]; doCheck = true; # mapnik-config is currently not build with CMake. So we use the SCons for # this one. We can't add SCons to nativeBuildInputs though, as stdenv would - # then try to build everything with scons. + # then try to build everything with scons. C++17 is the minimum supported + # C++ version. preBuild = '' cd .. - ${buildPackages.scons}/bin/scons utils/mapnik-config + env CXX_STD=17 ${buildPackages.scons}/bin/scons utils/mapnik-config cd build ''; @@ -107,7 +120,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An open source toolkit for developing mapping applications"; + description = "Open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; maintainers = with maintainers; [ hrdinka hummeltech ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/mapnik/use-sparsehash-package.patch b/pkgs/development/libraries/mapnik/use-sparsehash-package.patch new file mode 100644 index 0000000000000..3bb5d3e996cfc --- /dev/null +++ b/pkgs/development/libraries/mapnik/use-sparsehash-package.patch @@ -0,0 +1,19 @@ +commit c1cea9e10ffec54d0f675478e541ee4a6e87f653 +Author: Tom Hughes <tom@compton.nu> +Date: Wed Jun 5 18:45:57 2013 +0100 + + Use system sparsehash + +diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp +index 5f96272..44d06aa 100644 +--- a/include/mapnik/palette.hpp ++++ b/include/mapnik/palette.hpp +@@ -33,7 +33,7 @@ + #pragma GCC diagnostic push + #include <mapnik/warning_ignore.hpp> + #ifdef USE_DENSE_HASH_MAP +-#include <mapnik/sparsehash/dense_hash_map> ++#include <google/dense_hash_map> + using rgba_hash_table = google::dense_hash_map<unsigned int, unsigned char>; + #else + #include <unordered_map> diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/development/libraries/marl/default.nix index 4545264aad9e1..7ff28a9d5221f 100644 --- a/pkgs/development/libraries/marl/default.nix +++ b/pkgs/development/libraries/marl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/google/marl"; - description = "A hybrid thread / fiber task scheduler written in C++ 11"; + description = "Hybrid thread / fiber task scheduler written in C++ 11"; platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ breakds ]; diff --git a/pkgs/development/libraries/mathgl/default.nix b/pkgs/development/libraries/mathgl/default.nix index 811395d27588b..e2dc599c4f3bf 100644 --- a/pkgs/development/libraries/mathgl/default.nix +++ b/pkgs/development/libraries/mathgl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A library for scientific data visualization"; + description = "Library for scientific data visualization"; homepage = "https://mathgl.sourceforge.net/"; license = with licenses; [ gpl3 lgpl3 ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index aebd147806367..3a2fde3157797 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "matio"; - version = "1.5.26"; + version = "1.5.27"; src = fetchurl { url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-i0fCn1jkaNunpVVTccanKtTGqosV9FmysLZaMDwGOTM="; + sha256 = "sha256-CmqgCxjEUStjqNJ5BrB5yMbtQdSyhE96SuWY4Y0i07M="; }; meta = with lib; { - description = "A C library for reading and writing Matlab MAT files"; + description = "C library for reading and writing Matlab MAT files"; homepage = "http://matio.sourceforge.net/"; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix index b7cac02bb6c56..63e9861421ab2 100644 --- a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix +++ b/pkgs/development/libraries/matrix-sdk-crypto-nodejs/generic.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A no-network-IO implementation of a state machine that handles E2EE for Matrix clients"; + description = "No-network-IO implementation of a state machine that handles E2EE for Matrix clients"; homepage = "https://github.com/matrix-org/matrix-rust-sdk/tree/${src.rev}/bindings/matrix-sdk-crypto-nodejs"; license = licenses.asl20; maintainers = with maintainers; [ winter ]; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index ea60c32a08cd3..53b60dd3159e4 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.com/mdds/mdds"; - description = "A collection of multi-dimensional data structure and indexing algorithms"; + description = "Collection of multi-dimensional data structure and indexing algorithms"; changelog = "https://gitlab.com/mdds/mdds/-/blob/${finalAttrs.version}/CHANGELOG"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 9593781f2270e..8c07b2aad31a1 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -1,19 +1,39 @@ { lib, stdenv, fetchurl, cmake, hdf5 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "medfile"; - version = "4.1.1"; + version = "5.0.0"; src = fetchurl { - url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz"; - sha256 = "sha256-3CtdVOvwZm4/8ul0BB0qsNqQYGEyNTcCOrFl1XM4ndA="; + url = "https://files.salome-platform.org/Salome/medfile/med-${finalAttrs.version}.tar.bz2"; + hash = "sha256-Jn520MZ+xRwQ4xmUhOwVCLqo1e2EXGKK32YFKdzno9Q="; }; - patches = [ - ./hdf5-1.14.patch - ]; + outputs = [ "out" "doc" "dev" ]; + + postPatch = '' + # Patch cmake and source files to work with hdf5 + substituteInPlace config/cmake_files/medMacros.cmake --replace-fail \ + "IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 12 OR NOT HDF_VERSION_RELEASE_REF GREATER 0)" \ + "IF (HDF5_VERSION VERSION_LESS 1.12.0)" + substituteInPlace src/*/*.c --replace-warn \ + "#if H5_VERS_MINOR > 12" \ + "#if H5_VERS_MINOR > 14" + '' + lib.optionalString stdenv.isDarwin '' + # Some medfile test files #define _a, which + # breaks system header files that use _a as a function parameter + substituteInPlace tests/c/*.c \ + --replace-warn "_a" "_A" \ + --replace-warn "_b" "_B" + # Fix compiler errors in test files + substituteInPlace tests/c/*.c \ + --replace-warn "med_Bool" "med_bool" \ + --replace-warn "med_Axis_type" "med_axis_type" \ + --replace-warn "med_Access_mode" "med_access_mode" + ''; nativeBuildInputs = [ cmake ]; + buildInputs = [ hdf5 ]; checkPhase = "make test"; @@ -22,8 +42,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to read and write MED files"; - homepage = "http://salome-platform.org/"; - platforms = platforms.linux; + homepage = "https://salome-platform.org/"; + platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl3Plus; }; -} +}) diff --git a/pkgs/development/libraries/medfile/hdf5-1.14.patch b/pkgs/development/libraries/medfile/hdf5-1.14.patch deleted file mode 100644 index 294e87c023a7a..0000000000000 --- a/pkgs/development/libraries/medfile/hdf5-1.14.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- a/config/cmake_files/medMacros.cmake -+++ b/config/cmake_files/medMacros.cmake -@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5) - ## - ## Requires 1.10.x version - ## -- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) -+ IF (HDF5_VERSION VERSION_LESS 1.10.2) - MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") - ENDIF() - ## ---- a/src/ci/MEDfileCompatibility.c -+++ b/src/ci/MEDfileCompatibility.c -@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const filename, - _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease; - /* ISCRUTE(_hversionMMR); */ - /* ISCRUTE(HDF_VERSION_NUM_REF); */ -- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE; -+ if ( ((_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF)) || _hversionMMR > HDF_VERSION_NUM_REF ) *hdfok = MED_TRUE; - - /* TODO : Vérifier si la version mineure HDF du fichier est supérieure - à la version mineure de la bibliothèque HDF utilisée : -@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename, - #if MED_NUM_MAJEUR != 4 - #error "Don't forget to update the test version here when you change the major version of the library !" - #endif --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" - #error "Cf. _MEDfileCreate ..." - #endif ---- a/src/hdfi/_MEDfileCreate.c -+++ b/src/hdfi/_MEDfileCreate.c -@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access - * En HDF5-1.10.0p1 cela n'a aucun effet ! - * Un test autoconf permet de fixer un intervalle de version HDF à MED. - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - ---- a/src/hdfi/_MEDfileOpen.c -+++ b/src/hdfi/_MEDfileOpen.c -@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod - - • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - /* L'avantage de bloquer le modèle interne HDF5 ---- a/src/hdfi/_MEDmemFileOpen.c -+++ b/src/hdfi/_MEDmemFileOpen.c -@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile - goto ERROR; - } - --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { ---- a/src/hdfi/_MEDparFileCreate.c -+++ b/src/hdfi/_MEDparFileCreate.c -@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc - * En HDF5-1.10.0p1 cela n'a aucun effet ! - * Un test autoconf permet de fixer un intervalle de version HDF à MED. - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - ---- a/src/hdfi/_MEDparFileOpen.c -+++ b/src/hdfi/_MEDparFileOpen.c -@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access - MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG); - goto ERROR; - } --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 14 - #error "Don't forget to change the compatibility version of the library !" - #endif - if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index f1c109b244b36..f7549376d0bdd 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lXext"; meta = with lib; { - description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; + description = "Powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl3Only; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 83a96175cba55..55ae2c8d9899e 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,7 +1,6 @@ { autoreconfHook , cmake , fetchFromGitLab -, fetchpatch , mediastreamer , openh264 , pkg-config @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project."; + description = "H.264 encoder/decoder plugin for mediastreamer2. Part of the Linphone project"; homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mesa/darwin.patch b/pkgs/development/libraries/mesa/darwin.patch new file mode 100644 index 0000000000000..4649e09afb5ff --- /dev/null +++ b/pkgs/development/libraries/mesa/darwin.patch @@ -0,0 +1,17 @@ +diff --git a/src/glx/glxext.c b/src/glx/glxext.c +index 8770863eb7c..537f0af112c 100644 +--- a/src/glx/glxext.c ++++ b/src/glx/glxext.c +@@ -886,10 +886,11 @@ __glXInitialize(Display * dpy) + Bool zink = False; + Bool try_zink = False; + ++ const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE"); ++ + #if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE)) + Bool glx_direct = !debug_get_bool_option("LIBGL_ALWAYS_INDIRECT", false); + Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false); +- const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE"); + + zink = env && !strcmp(env, "zink"); + try_zink = False; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 80621fd9bbb52..af5baf1bc3a5f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -7,7 +7,6 @@ , elfutils , expat , fetchCrate -, fetchpatch , fetchurl , file , flex @@ -29,6 +28,7 @@ , pkg-config , python3Packages , rust-bindgen +, rust-cbindgen , rustPlatform , rustc , spirv-llvm-translator @@ -39,6 +39,7 @@ , wayland , wayland-protocols , wayland-scanner +, xcbutilkeysyms , xorg , zstd , withValgrind ? @@ -48,12 +49,14 @@ , enableGalliumNine ? stdenv.isLinux , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 +, enableTeflon ? stdenv.isLinux && stdenv.isAarch64 # currently only supports aarch64 SoCs, may change in the future , enablePatentEncumberedCodecs ? true , galliumDrivers ? if stdenv.isLinux then [ "d3d12" # WSL emulated GPU (aka Dozen) + "iris" # new Intel (Broadwell+) "kmsro" # special "render only" driver for GPUs without a display controller "nouveau" # Nvidia "radeonsi" # new AMD (GCN+) @@ -73,7 +76,6 @@ "tegra" # Nvidia Tegra SoCs "v3d" # Broadcom VC5 (Raspberry Pi 4) ] ++ lib.optionals stdenv.hostPlatform.isx86 [ - "iris" # new Intel, could work on non-x86 with PCIe cards, but doesn't build as of 22.3.4 "crocus" # Intel legacy, x86 only "i915" # Intel extra legacy, x86 only ] @@ -82,8 +84,9 @@ if stdenv.isLinux then [ "amd" # AMD (aka RADV) + "intel" # new Intel (aka ANV) "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) - "nouveau-experimental" # Nouveau (aka NVK) + "nouveau" # Nouveau (aka NVK) "swrast" # software renderer (aka Lavapipe) ] ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ # QEMU virtualized GPU (aka VirGL) @@ -95,7 +98,6 @@ "imagination-experimental" # PowerVR Rogue (currently N/A) "panfrost" # ARM Mali Midgard and up (T/G series) ] ++ lib.optionals stdenv.hostPlatform.isx86 [ - "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) ] else [ "auto" ] @@ -111,8 +113,8 @@ # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "24.0.7"; - hash = "sha256-dFRCXx7UpvG1sQfhZyswyIsi6g7+oACuLH2W25P2wmo="; + version = "24.1.1"; + hash = "sha256-ADiCbG9+iNkLTOb3GRkvpYyn3t9O3KoRdM972SDvieo="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -126,6 +128,11 @@ let rustDeps = [ { + pname = "paste"; + version = "1.0.14"; + hash = "sha256-+J1h7New5MEclUBvwDQtTYJCHKKqAEOeQkuKy+g0vEc="; + } + { pname = "proc-macro2"; version = "1.0.70"; hash = "sha256-e4ZgyZUTu5nAtaH5QVkLelqJQX/XPj/rWkzf/g2c+1g="; @@ -154,6 +161,7 @@ let copyRustDeps = lib.concatStringsSep "\n" (builtins.map copyRustDep rustDeps); + needNativeCLC = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; self = stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -171,6 +179,11 @@ self = stdenv.mkDerivation { patches = [ ./opencl.patch + ] ++ lib.optionals stdenv.isDarwin [ + # Reorder things to make it build on Darwin again + # Submitted upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29592 + # FIXME: remove when merged or otherwise addressed + ./darwin.patch ]; postPatch = '' @@ -193,6 +206,8 @@ self = stdenv.mkDerivation { "osmesa" ] ++ lib.optionals stdenv.isLinux [ "driversdev" + ] ++ lib.optionals enableTeflon [ + "teflon" ] ++ lib.optionals enableOpenCL [ "opencl" ] ++ lib.optionals haveDozen [ @@ -233,6 +248,7 @@ self = stdenv.mkDerivation { (lib.mesonBool "gallium-nine" enableGalliumNine) # Direct3D in Wine (lib.mesonBool "osmesa" enableOSMesa) # used by wine + (lib.mesonBool "teflon" enableTeflon) # TensorFlow frontend (lib.mesonEnable "microsoft-clc" false) # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) # To enable non-mesa gbm backends to be found (e.g. Nvidia) @@ -241,11 +257,10 @@ self = stdenv.mkDerivation { # meson auto_features enables these features, but we do not want them (lib.mesonEnable "android-libbacktrace" false) ] ++ lib.optionals stdenv.isLinux [ - (lib.mesonBool "glvnd" true) - - # Enable RT for Intel hardware - # https://gitlab.freedesktop.org/mesa/mesa/-/issues/9080 - (lib.mesonEnable "intel-clc" (stdenv.buildPlatform == stdenv.hostPlatform)) + (lib.mesonEnable "glvnd" true) + (lib.mesonBool "install-intel-clc" true) + (lib.mesonEnable "intel-rt" stdenv.isx86_64) + (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") ] ++ lib.optionals stdenv.isDarwin [ # Disable features that are explicitly unsupported on the platform (lib.mesonEnable "gbm" false) @@ -255,6 +270,11 @@ self = stdenv.mkDerivation { (lib.mesonEnable "gallium-va" false) (lib.mesonEnable "gallium-xa" false) (lib.mesonEnable "lmsensors" false) + # Don’t build with glvnd support to make sure Mesa builds libGL on Darwin + (lib.mesonEnable "glvnd" false) + # This gets enabled by mesonAutoFeatures and fails on aarch64-darwin, + # which makes no sense because Darwin has neither Intel nor RT, but OK + (lib.mesonEnable "intel-rt" false) ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend (lib.mesonOption "gallium-opencl" "icd") @@ -262,7 +282,6 @@ self = stdenv.mkDerivation { # Rusticl, new OpenCL frontend (lib.mesonBool "gallium-rusticl" true) - (lib.mesonOption "clang-libdir" "${llvmPackages.clang-unwrapped.lib}/lib") ] ++ lib.optionals (!withValgrind) [ (lib.mesonEnable "valgrind" false) ] ++ lib.optionals (!withLibunwind) [ @@ -272,6 +291,8 @@ self = stdenv.mkDerivation { (lib.mesonOption "video-codecs" "all") ] ++ lib.optionals (vulkanLayers != []) [ (lib.mesonOption "vulkan-layers" (builtins.concatStringsSep "," vulkanLayers)) + ] ++ lib.optionals needNativeCLC [ + (lib.mesonOption "intel-clc" "system") ]; strictDeps = true; @@ -295,6 +316,7 @@ self = stdenv.mkDerivation { libpthreadstubs libxcb libxshmfence + xcbutilkeysyms xorgproto ]) ++ lib.optionals withLibunwind [ libunwind @@ -306,15 +328,15 @@ self = stdenv.mkDerivation { ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal + llvmPackages.clang-unwrapped + llvmPackages.libclc lm_sensors + spirv-llvm-translator udev ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ] ++ lib.optionals enableOpenCL [ - llvmPackages.libclc llvmPackages.clang - llvmPackages.clang-unwrapped - spirv-llvm-translator ] ++ lib.optionals withValgrind [ valgrind-light ] ++ lib.optionals haveZink [ @@ -343,15 +365,23 @@ self = stdenv.mkDerivation { flex file python3Packages.python + python3Packages.pycparser python3Packages.mako python3Packages.ply jdupes glslang rustc rust-bindgen + rust-cbindgen rustPlatform.bindgenHook ] ++ lib.optionals haveWayland [ wayland-scanner + ] ++ lib.optionals needNativeCLC [ + buildPackages.mesa.driversdev + ]; + + disallowedRequisites = lib.optionals needNativeCLC [ + buildPackages.mesa.driversdev ]; propagatedBuildInputs = (with xorg; [ @@ -441,6 +471,8 @@ self = stdenv.mkDerivation { fi done + moveToOutput bin/intel_clc $driversdev + # Don't depend on build python patchShebangs --host --update $out/bin/* @@ -458,6 +490,10 @@ self = stdenv.mkDerivation { ${lib.optionalString haveZink '' patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/dri/zink_dri.so ''} + + ${lib.optionalString enableTeflon '' + moveToOutput lib/libteflon.so $teflon + ''} ''; env.NIX_CFLAGS_COMPILE = toString ( @@ -486,7 +522,7 @@ self = stdenv.mkDerivation { }; meta = { - description = "An open source 3D graphics library"; + description = "Open source 3D graphics library"; longDescription = '' The Mesa project began as an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. Over the diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 27d6d1dd48aba..29fd2b662e694 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ff3+RP+lAXCOeHJ87oG3c02rPP4WQIbg5L/CVe6gA3M="; + sha256 = "sha256-slAi8Ht/jwpsFy5zC3CpfTdAkxEMpHJlgmNqMgz+psU="; }; doCheck = !stdenv.hostPlatform.isStatic; diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/development/libraries/minilibx/default.nix index 41a422e3a2a26..b088aed10921d 100644 --- a/pkgs/development/libraries/minilibx/default.nix +++ b/pkgs/development/libraries/minilibx/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { }; meta = with lib; { - description = "A simple X-Window (X11R6) programming API in C"; + description = "Simple X-Window (X11R6) programming API in C"; homepage = "https://github.com/42Paris/minilibx-linux"; license = licenses.bsd2; maintainers = with maintainers; [ wegank ]; diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 1c9a4ab110b4a..4d06613f1de8e 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A small XML library"; + description = "Small XML library"; homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 5be1f2e519253..baf6a4f687a43 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , gtest , pkg-config diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 586dd113f1d10..44cba9767b36e 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, zlib, autoreconfHook, fetchpatch }: +{ lib, stdenv, zlib, autoreconfHook }: stdenv.mkDerivation { pname = "minizip"; diff --git a/pkgs/development/libraries/mitama-cpp-result/default.nix b/pkgs/development/libraries/mitama-cpp-result/default.nix index bc30b6de9f4af..7700483529a9b 100644 --- a/pkgs/development/libraries/mitama-cpp-result/default.nix +++ b/pkgs/development/libraries/mitama-cpp-result/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/LoliGothick/mitama-cpp-result"; - description = "A Library that provides `result<T, E>` and `maybe<T>` and monadic functions for them"; + description = "Library that provides `result<T, E>` and `maybe<T>` and monadic functions for them"; longDescription = '' mitama-cpp-result is the C++17 libraries for error handling without exceptions. diff --git a/pkgs/development/libraries/mlib/default.nix b/pkgs/development/libraries/mlib/default.nix index f3415adadf74d..91e1271278333 100644 --- a/pkgs/development/libraries/mlib/default.nix +++ b/pkgs/development/libraries/mlib/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mlib"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "P-p-H-d"; repo = pname; rev = "V${version}"; - hash = "sha256-wt/wLtvAZ19ZiLIjPrKbqVztLyXEa8hy6cEkaCO+tuY="; + hash = "sha256-r8ol923tNkZ13QXWjWpMrN6rBjjjg5XoBCho4OKdyvY="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 8a344a08fb7ad..e99671b4fcfa7 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.27.1"; + version = "1.27.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-3+7JfgT1hZHyTiLDqYioI5GJYnqN9crE5CrXOvit0ew="; + hash = "sha256-l3iZeu6Y+ZB9bYIg4ivG1o0ou3pXaBZ9dg61b6ie2Jw="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The official C client library for MongoDB"; + description = "Official C client library for MongoDB"; homepage = "http://mongoc.org"; license = licenses.asl20; mainProgram = "mongoc-stat"; diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix index ad96e81159a70..a17e7f8d037f6 100644 --- a/pkgs/development/libraries/mongocxx/default.nix +++ b/pkgs/development/libraries/mongocxx/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { - description = "The official C++ client library for MongoDB"; + description = "Official C++ client library for MongoDB"; homepage = "http://mongocxx.org"; license = licenses.asl20; maintainers = with maintainers; [ adriandole ]; diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 9a31fbb69eeb2..23e613be08878 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.mono-project.com/archived/monoaddins/"; - description = "A generic framework for creating extensible applications"; + description = "Generic framework for creating extensible applications"; mainProgram = "mautil"; longDescription = '' Mono.Addins is a generic framework for creating extensible applications, diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/development/libraries/monocypher/default.nix index b37cfffabc0ee..f5853385ba913 100644 --- a/pkgs/development/libraries/monocypher/default.nix +++ b/pkgs/development/libraries/monocypher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "monocypher"; diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 92d0098fc9840..8551510b476ca 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXp libXau ]; - prePatch = lib.optionalString (!demoSupport) '' - sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in} + postPatch = lib.optionalString (!demoSupport) '' + sed 's/\<demos\>//' -i Makefile.{am,in} ''; patches = [ @@ -38,6 +38,27 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/void-linux/void-packages/b9a1110dabb01c052dadc1abae1413bd4afe3652/srcpkgs/motif/patches/02-${name}"; sha256 = "13vzpf8yxvhf4gl7q0yzlr6ak1yzx382fsqsrv5lc8jbbg4nwrrq"; }) + (fetchpatch { + name = "missing-headers.patch"; + url = "https://gitlab.freedesktop.org/xorg/lib/libxpm/-/commit/4cedf181bcfe13e5d206554c51edb82cb17e7ad5.patch"; + extraPrefix = "lib/Xm/"; + stripLen = 2; + hash = "sha256-WlagHOgf2gZDxXN+SSEW6de1FuN4fbpd9zviMwo1+HI="; + }) + (fetchurl { + name = "noreturn.patch"; + url = "https://dev.gentoo.org/~ulm/distfiles/motif-2.3.8-patches-5.tar.xz"; + downloadToTemp = true; + postFetch = '' + tar -xOf $downloadedFile patch/12_all_noreturn.patch > $out + ''; + hash = "sha256-FyaBfqD/TuJVFFHZlp1/b1MyL8BJAfV43ktuusgxbfE="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/acc8c7cb2247d9892bf5a52eb92431a4c0c8e1cd/x11/openmotif/files/wcs-functions.patch"; + extraPrefix = ""; + hash = "sha256-w3zCUs/RbnRoUJ0sNCI00noEOkov/IGV/zIygakSQqc="; + }) ]; enableParallelBuilding = true; @@ -48,5 +69,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = with licenses; [ lgpl21Plus ]; maintainers = with maintainers; [ qyliss ]; + broken = demoSupport && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"; }; } diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix index 514c61ffcb0c0..687abab7d45b9 100644 --- a/pkgs/development/libraries/mpdecimal/default.nix +++ b/pkgs/development/libraries/mpdecimal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "mpdecimal"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { hash = "sha256-lCRFwyRbInMP1Bpnp8XCMdEcsbmTa5wPdjNPt9C0Row="; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; postInstall = '' diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 54abf134d3660..802a89c4c5e4e 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ mpfr ]; meta = { - description = "A multiple precision interval arithmetic library based on MPFR"; + description = "Multiple precision interval arithmetic library based on MPFR"; homepage = "http://perso.ens-lyon.fr/nathalie.revol/software.html"; license = lib.licenses.lgpl21Plus; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 02e587661890b..bb7f9f5807d69 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, perl, gfortran , openssh, hwloc, python3 +, darwin # either libfabric or ucx work for ch4backend on linux. On darwin, neither of # these libraries currently build so this argument is ignored on Darwin. , ch4backend @@ -44,10 +45,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran python3 ]; buildInputs = [ perl openssh hwloc ] ++ lib.optional (!stdenv.isDarwin) ch4backend - ++ lib.optional pmixSupport pmix; + ++ lib.optional pmixSupport pmix + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; - - doCheck = true; + # test_double_serializer.test fails on darwin + doCheck = !stdenv.isDarwin; preFixup = '' # Ensure the default compilers are the ones mpich was built with diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 6dd105bdb3027..26f22fd9968f2 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ "--enable-fat" ]; meta = { - description = "A highly optimised library for bignum arithmetic forked from GMP"; + description = "Highly optimised library for bignum arithmetic forked from GMP"; license = lib.licenses.lgpl3Plus; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index fd6e5d60bf7b8..049868c9381b6 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite ]; meta = { - description = "A flexible memory management and garbage collection library"; + description = "Flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; license = lib.licenses.sleepycat; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index cc7b056bb988b..a21dd799e0fc8 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = "A simple and efficient MsgPack binary serialization library in a self-contained header file"; + description = "Simple and efficient MsgPack binary serialization library in a self-contained header file"; homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 13816faefce9a..dff005d9eb1bc 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , coeurl @@ -16,13 +15,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - hash = "sha256-r+bD2L5+3AwkdYa3FwsM+yf7V5w+6ZJC92CMdVeYLJQ="; + hash = "sha256-luWcbYCv5OM3aidxiO7glqD+VYnCZMElZYaPKbtvMYI="; }; postPatch = '' @@ -54,7 +53,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "Client API library for the Matrix protocol."; + description = "Client API library for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; maintainers = with maintainers; [ fpletz pstn ]; diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix index 8a7d2c8f36463..957e49c4d6d77 100644 --- a/pkgs/development/libraries/muparserx/default.nix +++ b/pkgs/development/libraries/muparserx/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more"; + description = "C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more"; homepage = "https://beltoforion.de/en/muparserx/"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index f8e02b65774c5..63a1628cc40d7 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/ebassi/mutest"; - description = "A BDD testing framework for C, inspired by Mocha"; + description = "BDD testing framework for C, inspired by Mocha"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/mvfst/default.nix b/pkgs/development/libraries/mvfst/default.nix index 45b432a2dc9e6..0a784fff339ac 100644 --- a/pkgs/development/libraries/mvfst/default.nix +++ b/pkgs/development/libraries/mvfst/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An implementation of the QUIC transport protocol"; + description = "Implementation of the QUIC transport protocol"; homepage = "https://github.com/facebook/mvfst"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix index 9eca4dbb93688..c2ffe6135fbb5 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix @@ -1,9 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-message-with-annotations"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./withannotations.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix index 0030158df91b3..f6bf28f3b6457 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix @@ -1,9 +1,15 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-message-with-options"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./withoptions.proto + ./withoptions.options + ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix index d1d3e1a855a70..f8cd35cbf3979 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix @@ -1,9 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-simple-proto2"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./simple.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix index 71507054458fe..d92698d21ece5 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix @@ -1,10 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-simple-proto3"; meta.timeout = 60; - src = ./.; - + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./simple.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 2d383c876cba4..85bf4bee634e0 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , buildPackages +, updateAutotoolsGnuConfigScriptsHook , ncurses , pkg-config , abiVersion ? "6" @@ -13,11 +14,11 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "6.4"; + version = "6.4.20221231"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "https://invisible-island.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz"; + url = "https://invisible-island.net/archives/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz"; hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; }; @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isWindows [ "--enable-sp-funcs" "--enable-term-driver" - ] ++ lib.optionals (stdenv.hostPlatform.isUnix && stdenv.hostPlatform.isStatic) [ + ] ++ lib.optionals (stdenv.hostPlatform.isUnix && enableStatic) [ # For static binaries, the point is to have a standalone binary with # minimum dependencies. So here we make sure that binaries using this # package won't depend on a terminfo database located in the Nix store. @@ -51,7 +52,16 @@ stdenv.mkDerivation (finalAttrs: { ]}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" - ]; + ] ++ (lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") [ + # lld17+ passes `--no-undefined-version` by default and makes this a hard + # error; ncurses' `resulting.map` version script references symbols that + # aren't present. + # + # See: https://lists.gnu.org/archive/html/bug-ncurses/2024-05/msg00086.html + # + # For now we allow this with `--undefined-version`: + "LDFLAGS=-Wl,--undefined-version" + ]); # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; @@ -59,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; nativeBuildInputs = [ + updateAutotoolsGnuConfigScriptsHook pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`. diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index d7b31426c4f68..01be5106eca90 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://named-data.net/"; - description = "A Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction"; + description = "Named Data Networking (NDN) or Content Centric Networking (CCN) abstraction"; longDescription = '' ndn-cxx is a C++ library, implementing Named Data Networking (NDN) primitives that can be used to implement various NDN applications. diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 94e249425717b..23eb0945555e8 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A library for deep-packet inspection"; + description = "Library for deep-packet inspection"; longDescription = '' nDPI is a library for deep-packet inspection based on OpenDPI. ''; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 2680dbd1ae92a..d8b439847ad47 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A VNC server library"; + description = "VNC server library"; longDescription = '' This is a liberally licensed VNC server library that's intended to be fast and neat. Goals: diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index cbc8d3207e016..3185ff4158ee9 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { passthru = {inherit compressionSupport sslSupport;}; meta = with lib; { - description = "An HTTP and WebDAV client library"; + description = "HTTP and WebDAV client library"; mainProgram = "neon-config"; homepage = "https://notroj.github.io/neon/"; changelog = "https://github.com/notroj/${pname}/blob/${version}/NEWS"; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 5566b0c8f67df..0fe8f1d88d513 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -67,6 +67,12 @@ stdenv.mkDerivation rec { export TZDIR=${tzdata}/share/zoneinfo ''; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname + ''; + postInstall = lib.optionalString (enableApp) '' installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} '' + lib.optionalString (!enableApp) '' diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 849a464b1c0dc..cff650f5971df 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 = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-kJt4aQGNiJ0XhlEKunR8jYKytv3rh23jRrNelCDe/Kk="; + hash = "sha256-ZbgByLTkQWd3gfWW2V1kkboblfF9v+0HcNhxrjYpX28="; fetchSubmodules = true; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ngtcp2/nghttp3"; - description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C."; + description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index ada0ab55dfd6f..25b35bd72fe47 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 = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-Ez97uFzXvI7cE2TIk4/RCAwbAf+vXG1PlPaSvdSrcnE="; + hash = "sha256-alS6M4sSyyytnzu9RTjDAioqkafEmgt/HpFUQ4MniCI="; fetchSubmodules = true; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ngtcp2/ngtcp2"; - description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization."; + description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index d0e060c64058e..5fd52b1f592a1 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 = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-3tB1AvwGJJiujZEc5Uc2NSAETop4LFEgiml/v68oheM="; + hash = "sha256-Oaz5LX4R0vriURueQNklZ1dx1r8SWDaeK8oaUadlGtI="; }; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ngtcp2/ngtcp2"; - description = "an effort to implement RFC9000 QUIC protocol."; + description = "Effort to implement RFC9000 QUIC protocol"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ vcunat/* for knot-dns */ ]; diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index 6611f99bdfc28..a61bd0088052a 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A bundle of NPAPI headers by Mozilla"; + description = "Bundle of NPAPI headers by Mozilla"; homepage = "https://bitbucket.org/mgorny/npapi-sdk"; # see also https://github.com/mozilla/npapi-sdk license = licenses.bsd3; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 1ca747048e332..815c3dff031ec 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "The New GNU Portable Threads Library"; + description = "New GNU Portable Threads Library"; mainProgram = "npth-config"; longDescription = '' This is a library to provide the GNU Pth API and thus a non-preemptive diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 59a3b49757932..586c4ddb94fc1 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; + homepage = "https://firefox-source-docs.mozilla.org/nspr/index.html"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; maintainers = with maintainers; [ ajs124 hexa ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index cab8a0ff2bc10..b0a633869abc7 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; - description = "A set of libraries for development of security-enabled client and server applications"; + description = "Set of libraries for development of security-enabled client and server applications"; changelog = "https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_${underscoreVersion}.rst"; maintainers = with maintainers; [ hexa ajs124 ]; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 3b3a672e87f76..3f45d2e39c79a 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.100"; - hash = "sha256-PlMCvSN4DMKY7u/7cr7kArrRve8YIfdycjgpik72bhA="; + version = "3.101"; + hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts="; } diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index 8faa50f83b725..3c1a2b33b18f0 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = "A wrapper for the user, group and hosts NSS API"; + description = "Wrapper for the user, group and hosts NSS API"; mainProgram = "nss_wrapper.pl"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index bdc2a919613c2..e04d2ae435374 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A tiny TLS 1.2 only implementation"; + description = "Tiny TLS 1.2 only implementation"; mainProgram = "ntbtls-config"; homepage = "https://www.gnupg.org/software/ntbtls/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 39acba13d73e1..5ae6380849c8f 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "5.0"; + version = "5.8"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "sha256-xqnfo07EHwendzibIz187vdaenHwxg078D6zJvoyewc="; + sha256 = "sha256-t9InlnlwVts9mlrH8sHaaTYSrjJKlkFlGs1YCmZzjdE="; }; postPatch = '' diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 8fa37141628cc..776608c4ad961 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { doCheck = true; # takes some time meta = with lib; { - description = "A Library for doing Number Theory"; + description = "Library for doing Number Theory"; longDescription = '' NTL is a high-performance, portable C++ library providing data structures and algorithms for manipulating signed, arbitrary diff --git a/pkgs/development/libraries/numcpp/default.nix b/pkgs/development/libraries/numcpp/default.nix index 6b0b0304d4238..b8dea0f3662b8 100644 --- a/pkgs/development/libraries/numcpp/default.nix +++ b/pkgs/development/libraries/numcpp/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE="-Wno-error"; meta = with lib; { - description = "A Templatized Header Only C++ Implementation of the Python NumPy Library"; + description = "Templatized Header Only C++ Implementation of the Python NumPy Library"; homepage = "https://github.com/dpilger26/NumCpp"; license = licenses.mit; maintainers = with maintainers; [spalf]; diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 876ff8c13c645..92f447a32422e 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib;{ homepage = "https://github.com/elFarto/nvidia-vaapi-driver"; - description = "A VA-API implemention using NVIDIA's NVDEC"; + description = "VA-API implemention using NVIDIA's NVDEC"; changelog = "https://github.com/elFarto/nvidia-vaapi-driver/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers;[ nickcao ]; diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/development/libraries/octomap/default.nix index 8321028508a61..af668d279e27a 100644 --- a/pkgs/development/libraries/octomap/default.nix +++ b/pkgs/development/libraries/octomap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A probabilistic, flexible, and compact 3D mapping library for robotic systems"; + description = "Probabilistic, flexible, and compact 3D mapping library for robotic systems"; homepage = "https://octomap.github.io/"; license = licenses.bsd3; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index fa0535ef8e9a0..93db5470b0f73 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -112,8 +112,8 @@ let in { ogre_14 = common { - version = "14.2.5"; - hash = "sha256-FldHoMU8akRF6/vjwley9nJOTioE5nQXnTdQqyNlI2M="; + version = "14.2.6"; + hash = "sha256-kxvrRigSe6sPa3lAH+6zKTY4YEU9javlKHK8Zf6jxZE="; # https://github.com/OGRECave/ogre/blob/v14.2.5/Components/Overlay/CMakeLists.txt imguiVersion = "1.90.4"; imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 1fcf4a1f00e2a..639ff62887a0b 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.4.1"; + version = "3.4.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-6iPcytsRWvDn2hg5tkSG6A3cv/aOhmEVd5rS2uOKCPk="; + hash = "sha256-Ak49oFZkWNVjt98KXKqBGwKh7nz13/FO5riY7MIDR8g="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/open62541/default.nix b/pkgs/development/libraries/open62541/default.nix deleted file mode 100644 index 0ddc010deb65a..0000000000000 --- a/pkgs/development/libraries/open62541/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, check -, libxcrypt -, subunit -, python3Packages -, nix-update-script - -, withDoc ? false -, graphviz-nox - -, withExamples ? false - -, withEncryption ? false # or "openssl" or "mbedtls" -, openssl -, mbedtls - -, withPubSub ? false - -# for passthru.tests only -, open62541 -}: - -let - encryptionBackend = { - inherit openssl mbedtls; - }."${withEncryption}" or (throw "Unsupported encryption backend: ${withEncryption}"); -in - -stdenv.mkDerivation (finalAttrs: { - pname = "open62541"; - version = "1.3.10"; - - src = fetchFromGitHub { - owner = "open62541"; - repo = "open62541"; - rev = "v${finalAttrs.version}"; - hash = "sha256-FekO0cKgpYulMXz4r0/TUPz2tawC4k3Sq07Og4xqh4I="; - fetchSubmodules = true; - }; - - patches = [ - (fetchpatch { - name = "Ensure-absolute-paths-in-pkg-config-file.patch"; - url = "https://github.com/open62541/open62541/commit/023d4b6b8bdec987f8f3ffee6c09801bbee4fa2d.patch"; - sha256 = "sha256-mq4h32js2RjI0Ljown/01SXA3gc+7+zX8meIcvDPvoA="; - }) - ]; - - cmakeFlags = [ - "-DOPEN62541_VERSION=v${finalAttrs.version}" - - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DUA_NAMESPACE_ZERO=FULL" - - "-DUA_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - ] - ++ lib.optional withExamples "-DUA_BUILD_EXAMPLES=ON" - ++ lib.optional (withEncryption != false) - "-DUA_ENABLE_ENCRYPTION=${lib.toUpper withEncryption}" - ++ lib.optional withPubSub "-DUA_ENABLE_PUBSUB=ON" - ; - - nativeBuildInputs = [ - cmake - pkg-config - python3Packages.python - ] - ++ lib.optionals withDoc (with python3Packages; [ - sphinx - sphinx_rtd_theme - graphviz-nox - ]); - - buildInputs = lib.optional (withEncryption != false) encryptionBackend; - - buildFlags = [ "all" ] ++ lib.optional withDoc "doc"; - - doCheck = true; - - checkInputs = [ - check - libxcrypt - subunit - ]; - - # Tests must run sequentially to avoid port collisions on localhost - enableParallelChecking = false; - - preCheck = let - disabledTests = lib.optionals withPubSub [ - # "Cannot set socket option IP_ADD_MEMBERSHIP" - "pubsub_publish" - "check_pubsub_get_state" - "check_pubsub_publish_rt_levels" - "check_pubsub_subscribe_config_freeze" - "check_pubsub_subscribe_rt_levels" - "check_pubsub_multiple_subscribe_rt_levels" - ]; - regex = "^(${builtins.concatStringsSep "|" disabledTests})\$"; - in lib.optionalString (disabledTests != []) '' - checkFlagsArray+=(ARGS="-E ${lib.escapeRegex regex}") - ''; - - postInstall = lib.optionalString withDoc '' - # excluded files, see doc/CMakeLists.txt - rm -r doc/{_sources/,CMakeFiles/,cmake_install.cmake} - - # doc is not installed automatically - mkdir -p $out/share/doc/open62541 - cp -r doc/ $out/share/doc/open62541/html - '' + lib.optionalString withExamples '' - # install sources of examples - mkdir -p $out/share/open62541 - cp -r ../examples $out/share/open62541 - - ${lib.optionalString (!stdenv.hostPlatform.isWindows) '' - # remove .exe suffix - mv -v $out/bin/ua_server_ctt.exe $out/bin/ua_server_ctt - ''} - - # remove duplicate libraries in build/bin/, which cause forbidden - # references to /build/ in ua_server_ctt - rm -r bin/libopen62541* - ''; - - passthru.updateScript = nix-update-script { }; - - passthru.tests = let - open62541Full = encBackend: open62541.override { - withDoc = true; - # if (withExamples && withPubSub), one of the example currently fails to build - #withExamples = true; - withEncryption = encBackend; - withPubSub = true; - }; - in { - open62541Full = open62541Full false; - open62541Full-openssl = open62541Full "openssl"; - open62541Full-mbedtls = open62541Full "mbedtls"; - }; - - meta = with lib; { - description = "Open source implementation of OPC UA"; - longDescription = '' - open62541 (http://open62541.org) is an open source and free implementation - of OPC UA (OPC Unified Architecture) written in the common subset of the - C99 and C++98 languages. - The library is usable with all major compilers and provides the necessary - tools to implement dedicated OPC UA clients and servers, or to integrate - OPC UA-based communication into existing applications. - ''; - homepage = "https://www.open62541.org"; - changelog = "https://github.com/open62541/open62541/releases/tag/v${finalAttrs.version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ panicgh ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix index b69efd8664673..b27960779cad0 100644 --- a/pkgs/development/libraries/openbabel/2.nix +++ b/pkgs/development/libraries/openbabel/2.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = "A toolbox designed to speak the many languages of chemical data"; + description = "Toolbox designed to speak the many languages of chemical data"; homepage = "http://openbabel.org"; platforms = platforms.all; maintainers = with maintainers; [ danielbarter ]; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index f472f7b06364a..0030b1cfa1713 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A toolbox designed to speak the many languages of chemical data"; + description = "Toolbox designed to speak the many languages of chemical data"; homepage = "http://openbabel.org"; platforms = platforms.all; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index 627e9b830714c..f30fcac869f17 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "ac_cv_file__usr_include_mach_audit_triggers_defs=no" ]; meta = { - description = "An implementation of Sun's Basic Security Module (BSM) security audit API and file format"; + description = "Implementation of Sun's Basic Security Module (BSM) security audit API and file format"; homepage = "http://www.openbsm.org/"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index 664968de64324..a09cacaf39286 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , cmake , ninja , tcl diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 70b80e3a84ddc..1c90cc386733f 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation { 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"; + description = "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; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index d822050c08a21..bee15715fcfcc 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A library for handling the COLLADA file format"; + description = "Library for handling the COLLADA file format"; homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 0355b99774489..61ce9cff661ae 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://opencolorio.org"; - description = "A color management framework for visual effects and animation"; + description = "Color management framework for visual effects and animation"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index a5661d6e44e65..d5270b655ca1e 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://opencolorio.org"; - description = "A color management framework for visual effects and animation"; + description = "Color management framework for visual effects and animation"; license = licenses.bsd3; maintainers = [ maintainers.rytone ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 5e9409368cc70..adb6532bd6825 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , callPackage , cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf_21 @@ -16,7 +15,7 @@ , enableContrib ? true , enableCuda ? config.cudaSupport -, cudaPackages ? { } +, cudaPackages , enableUnfree ? false , enableIpp ? false , enablePython ? false, pythonPackages ? null @@ -296,6 +295,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; + # OpenCV 3 won't build with CUDA 12+ + broken = enableCuda && cudaPackages.cudaAtLeast "12"; license = with licenses; if enableUnfree then unfree else bsd3; maintainers = with maintainers; [mdaiter basvandijk]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 2f24d984c062b..a4961163c9ad3 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -80,6 +80,12 @@ , doxygen , graphviz-nox +, runAccuracyTests ? true +, runPerformanceTests ? false +# Modules to enable via BUILD_LIST to build a customized opencv. +# An empty lists means this setting is ommited which matches upstreams default. +, enabledModules ? [ ] + , AVFoundation , Cocoa , VideoDecodeAcceleration @@ -234,8 +240,6 @@ let opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; - runAccuracyTests = true; - runPerformanceTests = false; printEnabled = enabled: if enabled then "ON" else "OFF"; withOpenblas = (enableBlas && blas.provider.pname == "openblas"); #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests @@ -254,6 +258,7 @@ effectiveStdenv.mkDerivation { outputs = [ "out" "cxxdev" + ] ++ lib.optionals (runAccuracyTests || runPerformanceTests) [ "package_tests" ]; cudaPropagateToOutput = "cxxdev"; @@ -479,6 +484,8 @@ effectiveStdenv.mkDerivation { "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" + ] ++ lib.optionals (enabledModules != [ ]) [ + "-DBUILD_LIST=${lib.concatStringsSep "," enabledModules}" ]; postBuild = lib.optionalString enableDocs '' diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index ea568cdfa52aa..3bd5c76e56920 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; meta = with lib; { - description = "A C++11 Kademlia distributed hash table implementation"; + description = "C++11 Kademlia distributed hash table implementation"; homepage = "https://github.com/savoirfairelinux/opendht"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch thoughtpolice ]; diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/development/libraries/opendmarc/default.nix index 5a61af6c4dba8..d8af86b6cdb57 100644 --- a/pkgs/development/libraries/opendmarc/default.nix +++ b/pkgs/development/libraries/opendmarc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A free open source software implementation of the DMARC specification"; + description = "Free open source software implementation of the DMARC specification"; homepage = "http://www.trusteddomain.org/opendmarc/"; license = with licenses; [ bsd3 sendmail ]; maintainers = teams.helsinki-systems.members; diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index 074fdf4222d3e..9e6d6eaa65da9 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A high dynamic-range (HDR) image file format"; + description = "High dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com"; license = licenses.bsd3; maintainers = with maintainers; [ paperdigits ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 6d45ca33e982c..b45557b95c1b2 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch32 && !stdenv.isi686; meta = with lib; { - description = "A high dynamic-range (HDR) image file format"; + description = "High dynamic-range (HDR) image file format"; homepage = "https://www.openexr.com/"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix index dd6b0ce10c0b0..35ce5806aea77 100644 --- a/pkgs/development/libraries/openfec/default.nix +++ b/pkgs/development/libraries/openfec/default.nix @@ -20,10 +20,13 @@ stdenv.mkDerivation rec { cmake ]; - cmakeFlags = [ "-DDEBUG:STRING=OFF" ]; + cmakeFlags = [ + "-DDEBUG:STRING=OFF" + (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) + ]; installPhase = - let so = stdenv.hostPlatform.extensions.sharedLibrary; + let so = stdenv.hostPlatform.extensions.library; in '' # This is pretty horrible but sadly there is not installation procedure # provided. diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 7d2e78794d8a0..3d2dc9b8f0e73 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://openimageio.org"; - description = "A library and tools for reading and writing images"; + description = "Library and tools for reading and writing images"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index aa04ff683bfd4..266b6900934ea 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.openldap.org/"; - description = "An open source implementation of the Lightweight Directory Access Protocol"; + description = "Open source implementation of the Lightweight Directory Access Protocol"; license = licenses.openldap; maintainers = with maintainers; [ hexa ] ++ teams.helsinki-systems.members; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index 3d1cff05a0859..9f7f1b7bf4153 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.openpam.org"; - description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; + description = "Open source PAM library that focuses on simplicity, correctness, and cleanliness"; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 09c2be979a829..5e7de98efc461 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://shibboleth.net/products/opensaml-cpp.html"; - description = "A low-level library written in C++ that provides support for producing and consuming SAML messages"; + description = "Low-level library written in C++ that provides support for producing and consuming SAML messages"; mainProgram = "samlsign"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 05a5591035760..3566e458598c5 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; meta = with lib; { - description = "A 3D graphics toolkit"; + description = "3D graphics toolkit"; homepage = "http://www.openscenegraph.org/"; maintainers = with maintainers; [ aanderse raskin ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/development/libraries/openslide/default.nix index 71c2017f9e5a5..cc0b5ed98c615 100644 --- a/pkgs/development/libraries/openslide/default.nix +++ b/pkgs/development/libraries/openslide/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://openslide.org"; - description = "A C library that provides a simple interface to read whole-slide images."; + description = "C library that provides a simple interface to read whole-slide images"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ lromor ]; diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 6e03138adfae3..e390cfd932fdd 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.openslp.org/"; - description = "An open-source implementation of the IETF Service Location Protocol"; + description = "Open-source implementation of the IETF Service Location Protocol"; maintainers = with maintainers; [ ttuegel ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0e144726cf85f..361756f94ea90 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -221,7 +221,7 @@ 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"; + description = "Cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; mainProgram = "openssl"; maintainers = with maintainers; [ thillux ]; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 3ed10ef270f97..0cf848ac44b77 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "An Open-Source subdivision surface library"; + description = "Open-Source subdivision surface library"; homepage = "http://graphics.pixar.com/opensubdiv"; broken = openclSupport && cudaSupport; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index bbb8aa47a35d6..2b1fca97f06e2 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec ''; meta = with lib; { - description = "An open framework for voxel"; + description = "Open framework for voxel"; mainProgram = "vdb_print"; homepage = "https://www.openvdb.org"; maintainers = [ maintainers.guibou ]; diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 280c1b7ef934c..14ad6c166e551 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -5,6 +5,7 @@ , cudaSupport ? opencv.cudaSupport or false # build +, scons , addOpenGLRunpath , autoPatchelfHook , cmake @@ -25,7 +26,7 @@ , protobuf , pugixml , snappy -, tbb +, tbb_2021_5 , cudaPackages }: @@ -36,6 +37,9 @@ let stdenv = gcc12Stdenv; + # prevent scons from leaking in the default python version + scons' = scons.override { python3 = python3Packages.python; }; + tbbbind_version = "2_5"; tbbbind = fetchurl { url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz"; @@ -54,14 +58,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2024.1.0"; + version = "2024.2.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-OOSxXpLjmhOgKvrSO6SmY7xLhJSzGXT8w/Y4FnfwTqU="; + hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4="; }; outputs = [ @@ -78,6 +82,7 @@ stdenv.mkDerivation rec { patchelf pkg-config python + scons' shellcheck ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc @@ -91,7 +96,9 @@ stdenv.mkDerivation rec { popd ''; - dontUseCmakeBuildDir = true; + dontUseSconsCheck = true; + dontUseSconsBuild = true; + dontUseSconsInstall = true; cmakeFlags = [ "-Wno-dev" @@ -109,7 +116,7 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_SAMPLES" false) # features - (cmakeBool "ENABLE_INTEL_CPU" true) + (cmakeBool "ENABLE_INTEL_CPU" stdenv.isx86_64) (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) @@ -125,8 +132,6 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_SYSTEM_TBB" true) ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; - autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ]; @@ -140,7 +145,7 @@ stdenv.mkDerivation rec { opencv.cxxdev pugixml snappy - tbb + tbb_2021_5 ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; @@ -172,8 +177,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = (stdenv.isLinux && stdenv.isAarch64) # requires scons, then fails with *** Source directory cannot be under variant directory. - || stdenv.isDarwin; # Cannot find macos sdk + broken = stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index ec4c327d784b4..f153d7f2f18b6 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.1.36"; + version = "1.1.37"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-Ki2tp8a67AjIMIGDpWWqCnpMmeZpJ8uPezKE2KWrOjA="; + sha256 = "sha256-J9IfhTFFSY+rK0DqFdXtINo7nlGUcy2Lljq81T417qc="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 07fe1db829253..f45eacfd157f8 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -4,28 +4,15 @@ stdenv.mkDerivation rec { pname = "openzwave"; - version = "1.6"; + version = "1.6-unstable-2022-11-17"; src = fetchFromGitHub { owner = "OpenZWave"; repo = "open-zwave"; - rev = "v${version}"; - sha256 = "0xgs4mmr0480c269wx9xkk67ikjzxkh8xcssrdx0f5xcl1lyd333"; + rev = "3fff11d246a0d558d26110e1db6bd634a1b347c0"; + hash = "sha256-CLK2MeoTmZ8GMKb1OAZFNLyc4C+k+REK2w+WQxZv0/E="; }; - patches = [ - (fetchpatch { - name = "fix-strncat-build-failure.patch"; - url = "https://github.com/OpenZWave/open-zwave/commit/601e5fb16232a7984885e67fdddaf5b9c9dd8105.patch"; - sha256 = "1n1k5arwk1dyc12xz6xl4n8yw28vghzhv27j65z1nca4zqsxgza1"; - }) - (fetchpatch { - name = "fix-text-uninitialized.patch"; - url = "https://github.com/OpenZWave/open-zwave/commit/3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f.patch"; - sha256 = "183mrzjh1zx2b2wzkj4jisiw8br7g7bbs167afls4li0fm01d638"; - }) - ]; - outputs = [ "out" "doc" ]; nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ]; @@ -46,6 +33,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace cpp/src/Options.cpp \ --replace /etc/openzwave $out/etc/openzwave + substituteInPlace cpp/build/Makefile \ + --replace "-Werror" "-Werror -Wno-format" ''; meta = with lib; { diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 3c61e7b5c9d99..9940ec12ab70d 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "A Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project."; + description = "Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project"; mainProgram = "ortp_tester"; homepage = "https://linphone.org/technical-corner/ortp"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index f7cedc96b7c72..d552bedaa4f91 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { license = lib.licenses.lgpl21Plus; homepage = "https://www.gnu.org/software/osip/"; - description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; + description = "GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 1a5bacad59f87..43822d76aa197 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -23,7 +23,7 @@ let p2 = buildGoModule rec { doCheck = false; meta = with lib; { - description = "The simple and easy way to embed static files into Go binaries"; + description = "Simple and easy way to embed static files into Go binaries"; homepage = "https://github.com/gobuffalo/packr"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; @@ -55,7 +55,7 @@ p1 = buildGoModule rec { doCheck = false; meta = with lib; { - description = "The simple and easy way to embed static files into Go binaries"; + description = "Simple and easy way to embed static files into Go binaries"; homepage = "https://github.com/gobuffalo/packr"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 70408877fe0e9..d91552e3799a5 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A library for laying out and rendering of text, with an emphasis on internationalization"; + description = "Library for laying out and rendering of text, with an emphasis on internationalization"; longDescription = '' Pango is a library for laying out and rendering of text, with an diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 5e8ec502a65fc..c96bf713af8c9 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; meta = { - description = "A lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input"; + description = "Lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input"; longDescription = '' Pangolin is a lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input. At its heart is diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 04aa6c7afbc92..ced4e04c0b876 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A family of better random number generators"; + description = "Family of better random number generators"; homepage = "https://www.pcg-random.org/"; license = lib.licenses.asl20; longDescription = '' diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix index d17c806700f46..c2924426f8bb4 100644 --- a/pkgs/development/libraries/pcmsolver/default.nix +++ b/pkgs/development/libraries/pcmsolver/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - description = "An API for the Polarizable Continuum Model"; + description = "API for the Polarizable Continuum Model"; mainProgram = "run_pcm"; homepage = "https://pcmsolver.readthedocs.io/en/stable/"; license = licenses.lgpl3Only; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e488ebe1f464a..52a4ba32315ee 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pcre.org/"; - description = "A library for Perl Compatible Regular Expressions"; + description = "Library for Perl Compatible Regular Expressions"; license = lib.licenses.bsd3; longDescription = '' diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index c30a3c379d1de..3450f910effef 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, updateAutotoolsGnuConfigScriptsHook , withJitSealloc ? true }: @@ -13,6 +14,8 @@ stdenv.mkDerivation rec { hash = "sha256-4qU5hP8LB9/bWuRIa7ubIcyo598kNAlsyb8bcow1C8s="; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + postPatch = '' # Fix jit autodetection: # https://github.com/PCRE2Project/pcre2/pull/396 diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 86d976531cb37..c035460fafae7 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -10,7 +10,7 @@ , curl , gdal , hdf5-cpp -, LASzip +, laszip , libe57format , libgeotiff , libtiff @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { curl gdal hdf5-cpp - LASzip + laszip libgeotiff libtiff libxml2 @@ -87,6 +87,12 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; disabledTests = [ + # Failing due to GDAL 3.9 change in coordinates precision. + # See: https://github.com/PDAL/PDAL/issues/4403 + # This test should be re-enabled once https://github.com/PDAL/PDAL/pull/4411 + # is merged ! + "pdal_io_ogr_writer_test" + # Tests failing due to TileDB library implementation, disabled also # by upstream CI. # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index bfba4ad096202..13869dba89dab 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.6.3"; + version = "4.6.4"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-6Hp5hacMpVdsiUvMSXBQ5432tPrkHSOiVoWa91sv38k="; + hash = "sha256-7VltECiXQY+6M5EE17SKj0KwLk0+gOJfbLqprafIgLQ="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A Fast and Free C++ Library for Creating, Parsing an Manipulating PDF Files and Streams"; + description = "Fast and Free C++ Library for Creating, Parsing an Manipulating PDF Files and Streams"; homepage = "https://www.pdfhummus.com"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/development/libraries/pe-parse/default.nix index 7560f2297cfad..1a3a602d55278 100644 --- a/pkgs/development/libraries/pe-parse/default.nix +++ b/pkgs/development/libraries/pe-parse/default.nix @@ -13,13 +13,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=deprecated-declarations" + ]); + doInstallCheck = true; installCheckPhase = '' $out/bin/dump-pe ../tests/assets/example.exe ''; meta = with lib; { - description = "A principled, lightweight parser for Windows portable executable files"; + description = "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; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index e1192cdcd05eb..da403af44b9bf 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-DAPFEL_VERSION=${version}"; meta = with lib; { - description = "A PDF Evolution Library"; + description = "PDF Evolution Library"; homepage = "https://apfel.mi.infn.it/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 105a6b4953f77..c2dbb1235b487 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; + description = "APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics"; license = licenses.gpl3; homepage = "http://applgrid.hepforge.org"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index a4c01dd6ecf30..f00b527ad408e 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "A software package for jet finding in pp and e+e− collisions"; + description = "Software package for jet finding in pp and e+e− collisions"; mainProgram = "fastjet-config"; license = lib.licenses.gpl2Plus; homepage = "http://fastjet.fr/"; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 9dcaea8be041a..3b67b6a3756ed 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -9,7 +9,7 @@ , enableRaytracerX11 ? false # Standard build environment with cmake. -, lib, stdenv, fetchurl, fetchpatch, cmake +, lib, stdenv, fetchurl, cmake , clhep , expat @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); - description = "A toolkit for the simulation of the passage of particles through matter"; + description = "Toolkit for the simulation of the passage of particles through matter"; longDescription = '' Geant4 is a toolkit for the simulation of the passage of particles through matter. Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index e2ab42c418a09..870114ffcba48 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; + description = "HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; license = licenses.lgpl21; homepage = "http://hepmc.web.cern.ch/hepmc/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 9d2eab6e7f15b..7ec49da065140 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-DHEPMC3_CXX_STANDARD=17" "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" ] ++ lib.optionals withPython [ "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}" @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { pythonImportsCheck = [ "pyHepMC3" ]; meta = with lib; { - description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; + description = "HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; mainProgram = "HepMC3-config"; license = licenses.gpl3; homepage = "http://hepmc.web.cern.ch/hepmc/"; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index c5849f93c5e31..ef7ce7ce586de 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A multi-purpose particle physics event generator"; + description = "Multi-purpose particle physics event generator"; homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 0482846f077af..8111f61684305 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files"; + description = "General purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files"; license = licenses.gpl2; homepage = "http://lhapdf.hepforge.org"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index 701fd149e45ec..a478a972c9566 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "a Mellin Evolution LibrAry"; + description = "Mellin Evolution LibrAry"; mainProgram = "mela-config"; license = licenses.gpl3; homepage = "https://github.com/vbertone/MELA"; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 52138a8d50eaa..0eb45943e0aa9 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A program for the generation of high-energy physics events"; + description = "Program for the generation of high-energy physics events"; mainProgram = "pythia8-config"; license = licenses.gpl2Only; homepage = "https://pythia.org"; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index fdb79250ed3f9..565a0c317cd85 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "A very fast QCD evolution program written in FORTRAN77"; + description = "Very fast QCD evolution program written in FORTRAN77"; mainProgram = "qcdnum-config"; license = lib.licenses.gpl3; homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index a59b34147a9f4..c8db0fb22d0ee 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, texliveBasic, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; + description = "Framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; license = licenses.gpl3; homepage = "https://rivet.hepforge.org"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 86f0c891b2a90..9432722647cac 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -6,6 +6,7 @@ , eigen , example-robot-data , collisionSupport ? !stdenv.isDarwin +, console-bridge , jrl-cmakemodules , hpp-fcl , urdfdom @@ -15,15 +16,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "2.7.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-Ks5dvKi5iutjM+iovDOYGx3vsr45JWRqGOXV8+Ko4gg="; + hash = "sha256-h4NzfS27+jWyHbegxF+pgN6JzJdVAoM16J6G/9uNJc4="; }; + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 + prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ + --replace-fail "add_pinocchio_unit_test(force)" "" + ''; + # example-robot-data models are used in checks. # Upstream provide them as git submodule, but we can use our own version instead. postPatch = '' @@ -38,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ + console-bridge jrl-cmakemodules urdfdom ] ++ lib.optionals (!pythonSupport) [ @@ -68,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; + description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; homepage = "https://github.com/stack-of-tasks/pinocchio"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s wegank ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 2c2442547ebbd..c3532d93683d9 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ assert ldacbtSupport -> bluezSupport; stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.0.6"; + version = "1.0.7"; outputs = [ "out" @@ -91,7 +91,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-JrKSsYCMNRHHh92Sn/03Bq2gPaXNYTqmwaLXkE0axdA="; + sha256 = "sha256-YzI+hkX1ZdeTfxuKaw5P9OYPtkWtUg9cNo32wLCgjNU="; }; patches = [ diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 2e2ef053a1198..0822c788261da 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.2"; + version = "0.5.3"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-SXLHQbjh4IygV+925fsPXgj7DFIPQj48oLNKWkUhuK8="; + hash = "sha256-bZZIrD+SxAolDM0BRjcN4YCM26lnjkw8pIX54wSYrsk="; }; nativeBuildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - description = "A modular session / policy manager for PipeWire"; + description = "Modular session / policy manager for PipeWire"; homepage = "https://pipewire.org"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 3a83c89cd05d1..b0791a2400a85 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://pixman.org"; - description = "A low-level library for pixel manipulation"; + description = "Low-level library for pixel manipulation"; license = licenses.mit; platforms = platforms.all; pkgConfigModules = [ "pixman-1" ]; diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 9f2798ce51b61..99e8b3fd9d11d 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FIO/0nnLkTyDV5tdccWPmVh2T5ukMDs2R+EAfLcNT54="; + hash = "sha256-3Ud+NS9f9uasaGKGxLIrGb9aSSG4XuWn2gK7eqEV1X4="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix index 5479502abb233..242bbe7770e48 100644 --- a/pkgs/development/libraries/platform-folders/default.nix +++ b/pkgs/development/libraries/platform-folders/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - description = "A C++ library to look for standard platform directories so that you do not need to write platform-specific code"; + description = "C++ library to look for standard platform directories so that you do not need to write platform-specific code"; homepage = "https://github.com/sago007/PlatformFolders"; license = licenses.mit; maintainers = with maintainers; [ lilyinstarlight ]; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index b420c17c88889..c7349c3693051 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "A suite of portable game libraries"; + description = "Suite of portable game libraries"; longDescription = '' PLIB includes sound effects, music, a complete 3D engine, font diff --git a/pkgs/development/libraries/podofo/0.10.x.nix b/pkgs/development/libraries/podofo/0.10.x.nix index 93c989a9c1ec6..f4bf9e7741788 100644 --- a/pkgs/development/libraries/podofo/0.10.x.nix +++ b/pkgs/development/libraries/podofo/0.10.x.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/podofo/podofo"; - description = "A library to work with the PDF file format"; + description = "Library to work with the PDF file format"; platforms = lib.platforms.all; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; maintainers = []; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 85651d225f424..598366dc6eb84 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://podofo.sourceforge.net"; - description = "A library to work with the PDF file format"; + description = "Library to work with the PDF file format"; platforms = platforms.all; license = with licenses; [ gpl2Plus lgpl2Plus ]; }; diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index e6cb90994d9e0..b663c865d233f 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libselinux libsepol util-linux ]; meta = with lib; { - description = "A Qt wrapper around PolKit"; + description = "Qt wrapper around PolKit"; maintainers = with maintainers; [ ttuegel ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 69b2233a8559b..5b41fbdf6dfd4 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { # Allow changing base for paths in pkg-config file as before. # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100 ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch + + ./elogind.patch ]; depsBuildBuild = [ @@ -175,9 +177,13 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/polkit-org/polkit"; - description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; + description = "Toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.lgpl2Plus; platforms = platforms.linux; + badPlatforms = [ + # mandatory libpolkit-gobject shared library + lib.systems.inspect.platformPatterns.isStatic + ]; maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); }; } diff --git a/pkgs/development/libraries/polkit/elogind.patch b/pkgs/development/libraries/polkit/elogind.patch new file mode 100644 index 0000000000000..e7d97a7b131c1 --- /dev/null +++ b/pkgs/development/libraries/polkit/elogind.patch @@ -0,0 +1,66 @@ +From 78e625dbafa8543b17ffaf9c42cf90c9cf9a612e Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Wed, 8 May 2024 11:20:42 +0200 +Subject: [PATCH] Fix configuration with elogind + +Previously, it would try to get sysusers_dir from systemd even though +systemd_dep was undefined. Determining systemd_systemdsystemunitdir +from systemd was already checking for systemd logind specifically, and +systemd_sysusers_dir is only used in the systemd logind case, so move +both of those into the systemd-logind-specific branch above. + +(cherry picked from commit b58b58af10c390ab9a11a4cfe6a4ff3d50cc0fa5) +--- + meson.build | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index 2f81c90..0888322 100644 +--- a/meson.build ++++ b/meson.build +@@ -202,6 +202,16 @@ if enable_logind + if not logind_dep.found() + logind_dep = dependency('libsystemd-login', not_found_message: 'libsystemd support requested but libsystemd or libsystemd-login library not found') + endif ++ ++ # systemd unit / service files ++ systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') ++ if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' ++ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') ++ # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used ++ systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') ++ endif ++ ++ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') + else + logind_dep = dependency('libelogind', not_found_message: 'libelogind support requested but libelogind library not found') + endif +@@ -210,16 +220,6 @@ if enable_logind + config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) + func = 'sd_pidfd_get_session' + config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) +- +- # systemd unit / service files +- systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') +- if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' +- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') +- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used +- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') +- endif +- +- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') + endif + config_h.set('HAVE_LIBSYSTEMD', enable_logind) + +@@ -404,7 +404,7 @@ output += ' introspection: ' + enable_introspection.to_string( + output += ' Distribution/OS: ' + os_type + '\n' + output += ' Authentication framework: ' + auth_fw + '\n' + output += ' Session tracking: ' + session_tracking + '\n' +-if enable_logind ++if session_tracking == 'logind' + output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n' + endif + output += ' polkitd user: ' + polkitd_user + ' \n' +-- +2.44.0 + diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 6e22ec349d5fd..17ab3f100b81a 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { homepage = "https://poppler.freedesktop.org/"; changelog = "https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-${version}/NEWS"; - description = "A PDF rendering library"; + description = "PDF rendering library"; longDescription = '' Poppler is a PDF rendering library based on the xpdf-3.0 code base. In addition it provides a number of tools that can be installed separately. diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index fdccb4d093367..e97629b0dfd05 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchpatch2 +, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { @@ -13,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-wlpIOPyOTByKrLi9Yg7bMISj1jv4mH/a08onWMYyQPk="; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + patches = lib.optionals stdenv.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index d49f3e6bd5382..863ffed429328 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - description = "The Parma Polyhedra Library"; + description = "Parma Polyhedra Library"; longDescription = '' The Parma Polyhedra Library (PPL) provides numerical abstractions diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 873386e90abd9..372a2940e0ae3 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gcc, boost, eigen, libxml2, mpi, python3, petsc, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, mpi, python3, petsc, pkg-config }: stdenv.mkDerivation rec { pname = "precice"; - version = "3.0.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "precice"; - repo = pname; + repo = "precice"; rev = "v${version}"; - hash = "sha256-RuZ18BFdusMHC+Yuapc2N8cEetLu32e28J34HH+gHOg="; + hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0="; }; - patches = [ - (fetchpatch { - url = "https://github.com/precice/precice/commit/9dffe04144ab0f6a92fbff9be91cda71718b9c8e.patch"; - hash = "sha256-kSvIfBQH1mBA5CFJo9Usiypol0u9VgHMlUEHK/uHVNQ="; - }) - ]; - cmakeFlags = [ "-DPRECICE_PETScMapping=OFF" "-DBUILD_SHARED_LIBS=ON" @@ -43,5 +36,3 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; }; } - - diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/development/libraries/presage/default.nix index 8f7e15867099f..c9e44e5859146 100644 --- a/pkgs/development/libraries/presage/default.nix +++ b/pkgs/development/libraries/presage/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { checkTarget = "check"; meta = with lib; { - description = "An intelligent predictive text entry system"; + description = "Intelligent predictive text entry system"; homepage = "https://presage.sourceforge.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/libraries/process-cpp/default.nix b/pkgs/development/libraries/process-cpp/default.nix deleted file mode 100644 index f73f72e4545d1..0000000000000 --- a/pkgs/development/libraries/process-cpp/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, cmake -, boost -, properties-cpp -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "process-cpp"; - version = "unstable-2021-05-11"; - - src = fetchFromGitLab { - domain = "gitlab.com"; - owner = "ubports"; - repo = "development/core/lib-cpp/process-cpp"; - rev = "ee6d99a3278343f5fdcec7ed3dad38763e257310"; - sha256 = "sha256-jDYXKCzrg/ZGFC2xpyfkn/f7J3t0cdOwHK2mLlYWNN0="; - }; - - postPatch = '' - # Excludes tests from tainting nativeBuildInputs with their dependencies when not being run - # Tests fail upon verifying OOM score adjustment via /proc/<pid>/oom_score - # [ RUN ] LinuxProcess.adjusting_proc_oom_score_adj_works - # /build/source/tests/linux_process_test.cpp:83: Failure - # Value of: is_approximately_equal(oom_score.value, core::posix::linux::proc::process::OomScoreAdj::max_value()) - # Actual: false (333 > 10) - # Expected: true - sed -i '/tests/d' CMakeLists.txt - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - boost - properties-cpp - ]; - - meta = with lib; { - description = "A simple convenience library for handling processes in C++11"; - homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp"; - license = with licenses; [ gpl3Only lgpl3Only ]; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index daab5ac2a5663..8fedba3ef08c5 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , buildPackages @@ -17,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.4.0"; + version = "9.4.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA="; + hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU="; }; patches = [ diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix index f9f580c9717ce..4d695eff64085 100644 --- a/pkgs/development/libraries/prometheus-client-c/default.nix +++ b/pkgs/development/libraries/prometheus-client-c/default.nix @@ -67,12 +67,12 @@ rec { libprom = build { pname = "libprom"; subdir = "prom"; - description = "A Prometheus Client in C"; + description = "Prometheus Client in C"; }; libpromhttp = build { pname = "libpromhttp"; subdir = "promhttp"; buildInputs = [ libmicrohttpd libprom ]; - description = "A Prometheus HTTP Endpoint in C"; + description = "Prometheus HTTP Endpoint in C"; }; } diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index 65ad4ed6a2933..2c510afdfa158 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp"; - description = "A very simple convenience library for handling properties and signals in C++11"; + description = "Very simple convenience library for handling properties and signals in C++11"; license = licenses.lgpl3Only; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/protobuf/27.nix b/pkgs/development/libraries/protobuf/27.nix new file mode 100644 index 0000000000000..0f256c5c783af --- /dev/null +++ b/pkgs/development/libraries/protobuf/27.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "27.1"; + hash = "sha256-9XOcjNm4k4VhQ/XagcVO2tXxp6bBdyuvrS7sNGy4wG0="; +} // args) diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix index d152512783f0e..5a39725275508 100644 --- a/pkgs/development/libraries/protobufc/default.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -10,15 +10,17 @@ stdenv.mkDerivation rec { pname = "protobuf-c"; - version = "unstable-2023-07-08"; + version = "1.5.0"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - rev = "fa86fddbd000316772d1deb5a8d1201fa7599ef7"; - hash = "sha256-pmqZYFREPgSrWPekymTglhtAv6gQR1gP3dOl3hqjYig="; + rev = "refs/tags/v${version}"; + hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I="; }; + outputs = [ "out" "dev" "lib" ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix index fd06b49604add..b3ded7025e99c 100644 --- a/pkgs/development/libraries/prototypejs/default.nix +++ b/pkgs/development/libraries/prototypejs/default.nix @@ -7,7 +7,7 @@ in fetchurl { sha256 = "0q43vvrsb22h4jvavs1gk3v4ps61yx9k85b5n6q9mxivhmxprg26"; meta = with lib; { - description = "A foundation for ambitious web user interfaces"; + description = "Foundation for ambitious web user interfaces"; longDescription = '' Prototype takes the complexity out of client-side web programming. Built to solve real-world problems, it adds diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/development/libraries/pslib/default.nix index 98aaa5dcf335e..f91f55530aed7 100644 --- a/pkgs/development/libraries/pslib/default.nix +++ b/pkgs/development/libraries/pslib/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A C-library for generating multi page PostScript documents"; + description = "C-library for generating multi page PostScript documents"; homepage = "https://pslib.sourceforge.net/"; changelog = "https://sourceforge.net/p/pslib/git/ci/master/tree/pslib/ChangeLog"; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 7cb9046acf212..bbbc5017c410e 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with lib; { - description = "The GNU Portable Threads library"; + description = "GNU Portable Threads library"; mainProgram = "pth-config"; homepage = "https://www.gnu.org/software/pth"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 2410c22ad2161..fa0718b993fc6 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "An open source UPnP development kit for Linux"; + description = "Open source UPnP development kit for Linux"; longDescription = '' The Linux SDK for UPnP Devices (libupnp) provides developers diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index eeb73472253a2..f99f1927295aa 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pyotherside"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "thp"; repo = "pyotherside"; rev = version; - sha256 = "sha256-IIvL704snJIJbigAgJZ3WWg5a/mX/8qzgFN+dBEClG8="; + sha256 = "sha256-Fh0gtbBi391ZgwS68FX1zUzeuz8ayEjlwnEM8LjaB8k="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/pystring/default.nix b/pkgs/development/libraries/pystring/default.nix index 3a1e64c0b0004..4ed250439803b 100644 --- a/pkgs/development/libraries/pystring/default.nix +++ b/pkgs/development/libraries/pystring/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/imageworks/pystring/"; - description = "A collection of C++ functions which match the interface and behavior of python's string class methods using std::string"; + description = "Collection of C++ functions which match the interface and behavior of python's string class methods using std::string"; license = licenses.bsd3; maintainers = [ maintainers.rytone ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 2b7ac684974e6..404aa4921c4ef 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, python3, qmake, qtwebengine, diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 0c50c9e3649bf..95827b630f1a7 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { ]; meta = with lib; { - description = "A QML plugin for Box2D engine"; + description = "QML plugin for Box2D engine"; homepage = "https://github.com/qml-box2d/qml-box2d"; maintainers = with maintainers; [ guibou ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 863d5f25d2869..0984912463e1c 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { dontWrapQtApps = true; meta = { - description = "A QML port of qtermwidget"; + description = "QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 33967e39ccfa6..ab6078c619f5a 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://qpdf.sourceforge.io/"; - description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; + description = "C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.asl20; # as of 7.0.0, people may stay at artistic2 maintainers = with maintainers; [ abbradar ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 394446feb0170..69adf65643d02 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -51,7 +51,7 @@ in stdenv'.mkDerivation rec { ''; meta = with lib; { - description = "A Qt port of the Scintilla text editing library"; + description = "Qt port of the Scintilla text editing library"; longDescription = '' QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control. diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index a8885fc5647bc..b1308159eb688 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -36,6 +36,14 @@ let ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch ./qtbase.patch.d/0014-aarch64-darwin.patch + + # Fix typo that breaks build on Darwin + # FIXME: remove this once merged upstream + # See: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/325 + (fetchpatch { + url = "https://invent.kde.org/qt/qt/qtbase/-/commit/e84c0df50f51c61aa49b47823582b0f8de406e3d.patch"; + hash = "sha256-d1RIY03E71aMzOOVtcIaMeariki/72QRekUne6P2D3M="; + }) ] ++ [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch @@ -173,23 +181,11 @@ let }) ]; qtwebengine = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a6f16c6daea3b5a1f7bc9f175d1645922c131563/qt5/qt5-webengine-python3.patch"; - hash = "sha256-rUSDwTucXVP3Obdck7LRTeKZ+JYQSNhQ7+W31uHZ9yM="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-chromium-python3.patch"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - hash = "sha256-MZGYeMdGzwypfKoSUaa56K3inbcGRx7he/+AFyk5ekA="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/7ae178a617d1e0eceb742557e63721af949bd28a/qt5/qt5-webengine-gcc12.patch"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - hash = "sha256-s4GsGMJTBNWw2gTJuIEP3tqT82AmTsR2mbj59m2p6rM="; - }) ./qtwebengine-link-pulseaudio.patch + # Fixes Chromium build failure with Ninja 1.12. + # See: https://bugreports.qt.io/browse/QTBUG-124375 + # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09 + ./qtwebengine-ninja-1.12.patch ] ++ lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch @@ -320,11 +316,6 @@ let in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; - postPatch = '' - # update catapult for python3 compatibility - rm -r src/3rdparty/chromium/third_party/catapult - cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult - ''; inherit (darwin) cctools xnu; inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch new file mode 100644 index 0000000000000..c70788516fd4e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch @@ -0,0 +1,11 @@ +diff -ur a/src/3rdparty/chromium/content/public/browser/BUILD.gn b/src/3rdparty/chromium/content/public/browser/BUILD.gn +--- a/src/3rdparty/chromium/content/public/browser/BUILD.gn 1969-12-31 19:00:01.000000000 -0500 ++++ b/src/3rdparty/chromium/content/public/browser/BUILD.gn 2024-05-29 22:12:36.416136269 -0400 +@@ -469,6 +469,7 @@ + "//build:chromeos_buildflags", + "//cc", + "//components/viz/host", ++ "//components/spellcheck:buildflags", + "//content/browser", # Must not be public_deps! + "//device/fido", + "//gpu", 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 63a284be6c801..f3281a17170ee 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,202 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "e1b1a0d2970fd384bd52c734a72536d8452ad070", - "sha256": "14q7xf6n8giz5v1s23ndibiv4d6g0ds4v88bx5v984319qxyvpqh" + "rev": "9bf4d03e2515f7c454647d54542330b6e90f8191", + "sha256": "1w1lq332q270vld7sz0xqpa0f7mvi5gizycfsx9zz9c73qy4idlp" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "4fc1cba4c415d84a5879da29f7c459b70fbc15e9", - "sha256": "0mrw7rr6fnjkjxx882ga253kzn4di1agikyq6h9ixwfn2j242qlq" + "rev": "91bfd21f86c450b129ac2dde9d33b32e140d8a0c", + "sha256": "06fbiggjq1c1z1wgx63ir8rj1ppd1c046xwz4nzsrf1pi8dqcyl7" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "12d064b16117c6f3418b494c927ef72cf1927929", - "sha256": "1rcpldpzwbmyww50rh58avmhgj93ks40bwm0bqz7dgwakm4n76lj" + "rev": "197a7e05cda87a4645f30c8ef5044b342442ebd1", + "sha256": "0j5al7h2gy67cb2lj4yymdsidr1dcvvahqfysbdl2lwz3zzpdql1" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "a43df98d037ad07cf096ef2f775958ceba743613", - "sha256": "01bjkfb7ql1f168q67d5jr2xjfrn8bvh1ggiba0algkgll8alad4" + "rev": "0e1ff2f06ddac7c32c5a5e0b65e402c9332e56f8", + "sha256": "1pfby0ilkikq8802diaslnkxw8qzbp4r0f80v696wfynn973mhdd" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "393a84ad5b16a9ec93d8a44bebf1ae86e881bc06", - "sha256": "1ki307wkm3wxf3jc508zgdr5p7fb297hf0rdg5x1hyv7qb03bvxx" + "rev": "7315c48bcec88014e78165bbda54abfcd557e0af", + "sha256": "043lbxkaw53qah9ny4nbpp8g7q4rq9x2k21vkprk7nim66d6pmy3" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "70020cb64f71dcf2fd65a8a167cb785d2127e159", - "sha256": "10kajc98avdz8a7f5ifrrrzwrkdlbsdmiamh7blsnfcix1063ihq" + "rev": "99f30db37c63447c59d5fac15bc8feb832a7fd04", + "sha256": "09v76kb7fx7bq4vplyk3cf7il3a6f9p673z1l28nrv4w308bhqfy" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "c887477198cae44585fe9db371db0ddf4c3b205e", - "sha256": "0fkw096w81lzdj7zgc6xfy719lh10x3f7mqm832mjq86h8f3gyc5" + "rev": "79cd0fb6cafcd42e4037ae1363fda3bc2cec934a", + "sha256": "19y33v3l4crzrk7qf5qhx7phxkiax14c2q4xjd1klw7n333d43cq" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "792a55bb701d233116c3731c7a53ffdb8c67e407", - "sha256": "1d87mkl3dj3ysham1rrfxw07jvc5jqh8g2w8psv5858i29aclyqn" + "rev": "50c8def854806485d66aabcf6918e8b987032e55", + "sha256": "0qvw72w0m1q4yg4l35rh7ydqgp35xqfwpq0pc7q5578n1xspihhn" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "8a3dfe33cb4f1e81b609f41716a3f0610a50db72", - "sha256": "18x3gn6wv8vm5wfa6hjfzbkxcpclnwi4s3mbbc3hj9yar53hznqp" + "rev": "bc4503b8b70f4cd435d6e64a9e6c623ca44b9fcd", + "sha256": "0pvimmw5c6gh6xi2iblzyikgaw7cr8gqjdvyappcahjpalxxsjbw" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "8ed95136b3c265b01db6cc33869228f41878e173", - "sha256": "1m774ah9c1didj60rph6p4gibyqgynmdqngqkq1bv1p7m2jkq1ss" + "rev": "b1c2f272f69e222a532485e6f820776c220b3535", + "sha256": "1zga6sa901g0fpqyjlyj73s2f94yjm0z3599gngnlvvd7jsnlgnv" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "e33716bd6bb8926688fef20cb568e11618d08a35", - "sha256": "1klm5rhx6lpc0knhc15lz6sj07znv2d601gbi360wfqkvbi3g78p" + "rev": "2c39e673d6c15a84dcc7882d3772fa04cc79f9ed", + "sha256": "177xkhi3syx6r3my5rly5bncgjfhdvgrhf6fw5ajqplik6yln4pq" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "142040e8a652e708ff6e004361f6bcfe85fefdf9", - "sha256": "1vc1ahanm40bh8qj3x2x4d4niihsrjai298alxfcxinfrsmw9m32" + "rev": "4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498", + "sha256": "1w68v55y1l1biv7krzv9vmi2czz84jk89f4pymq3ri1w3y4rc1id" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "5b27b8921f1f2de93573df903c47aee634209f80", - "sha256": "1w8hq3mdlrdkkykhza4dx0f21j6k697xqqvpm2g2xyk2izadq2m0" + "rev": "3beb9c810611337fde61d89aa981e9f177a9ede9", + "sha256": "1fwn9x3n01dlkhw53n12z5kb06qj2lmangzvj3fjr5ff0yy47df9" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "db33cc9a4c0bad1006dbc9ed46d71b80ee284df3", - "sha256": "1wjzhk6zn0vh9fjldpi5gi7qlpgfc2gcznh3a7icpbx7n9cc9qh5" + "rev": "b8c1fa109dce6f8bff9f55738d2f1e21ff677796", + "sha256": "0qydaqj8945hikby7a9529i0g5ycpvhws6y0zc566jv50qida725" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "4cb89b861dbdbe8733c62bcdadc0a8d6617528a5", - "sha256": "1pygs8l1nk7mgqcgv7ilwx87i9i8jxwxn2h8fcqqvgn96c5sd9kg" + "rev": "e66cba7cf02aa8aecce03540cd167621f2cda5f0", + "sha256": "0q7d3lh3fpkrakxx1sqx9csa7l7rxzskcavbidxb5298jxn49wn8" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "36603a39aa590c12cbe2b192b56b29edd09a7a6b", - "sha256": "1i6hfddkwf0x74kxz5vrjkc3r507m6icr59p8b6n1bms5y5731j6" + "rev": "53069c9c6eb52b744333812f42aed36c3db6e752", + "sha256": "0y8km2mp5mj1zw1v3acsdvzrc1jyiwpxy3rmif5ssn40wwxifilp" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "3fccc9b8fdaff1252fb4a9c516868d0bbbd4384d", - "sha256": "0h0i6r5w2vdmm9nxyk8vzdim739fja4ddf42s9pa25r1vs6i9rdw" + "rev": "28180f28c98e329676463e24cef0097cba45bc00", + "sha256": "1g6clwmrpdvl9m6flyrk4vlckjnjv3phqhy1xbxlra3zcfn3357r" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "f563e7f2d1668a3d216e9d396e050df25fd15532", - "sha256": "1kbzf8nadia31sfc4r53p3p733i85w23yznwp2fc2117z81vd9p7" + "rev": "d4903bf08c576a6c085278c1960a2676cd83dca7", + "sha256": "04bry3ys15bd6kaiwyb8fh037s50mcplircpzvrwdc1h8milx7y7" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "d4f5966ba085a1146a04f2ea8449bbf14833a593", - "sha256": "05617q59ldzavm79bf3vgz2sc4paa6d4s0q7adqzpnib6pryr2xj" + "rev": "ad229f0c135f74801fba2bcd22c78abc0e3cf1d2", + "sha256": "17jdsahdw72l5lpbng8733qv2fp2qkfzlzrayzigz2slfdqgjxnk" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "1ca962198a703f591efc7c8f7540fc4120746a00", - "sha256": "1r4z0lfcs1mhdmxgd7saw49p5y2009a0vxn043v0z2w47yrqprb6" + "rev": "9325659ec390eda5b160736a926ba58ccb445cce", + "sha256": "0r1kkn6pr6yynk8x2ggkfqqrh27g1qra102ilglj7chsmrp92xgc" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "134ca5dbef9d137a9c46faa79b0225bc650d9283", - "sha256": "09r6a0vdpyxzrhx6h49v9nyky3xzgm0z1wd320qi3zh7baxxrzm4" + "rev": "69fea340f8f4c483a9b2889e4e24a4b1b52ebc87", + "sha256": "0v6g146ryabks0sff5dgyx42690xckaqpx44c6g7x0b0w24lj6ws" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "58f4f22662023efe6f223d5ef4a6d0be3708182b", - "sha256": "15braxxp4ldvfqxz7a1xywskycmkwv88cypgaxfipkis9jvaykdi" + "rev": "bf6c73064c82b07fcb1f7e72c263b249e137e224", + "sha256": "0pnn5ds6sxls8i6pzzmraalvln2pabgga3gnv761b2skgkv26gnq" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "f64e34be9ac4b7e92c63e47235c04471a1d40c93", - "sha256": "1hjg1vimipszcdk89ivq1iym05m9yz2li6chyg52n1wqjm628gx1" + "rev": "3873bdc809ca8d58d91968cb0de34da26646bc79", + "sha256": "0bncsi45zjwd6q3g40gxdqxqq4zhjrgw7xnxj1v53npbyw4vd0h5" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "3f56c6b4bd1e3883581340243b4a7289807fffc9", - "sha256": "15yhdp77p4i1as53cssx038hwmqjh2zgh35hrad4mhk4g6za85na" + "rev": "6834b183966d08d9f061642ee7ea2d482cbbf073", + "sha256": "1h88idcfcsbpx2x2djcg1lzazadm676miz19x6n0n6n4gwp46738" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "3011b16d63cadbb473b6aa3a535b9f0e33170c09", - "sha256": "06d5x03bzbal4npbdl8y74fdizl9phz76q29f798196hjyb0kz05" + "rev": "bf0b718cd0b6c7823e9d2037d3bdece44185f444", + "sha256": "1my7ls1nsaf26kh3hn75jjnxp6gm0ilyfzcczqps0xj7xj9bzwzd" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "c64de6ad9f646aaa66fca0500d21cde802a7bb17", - "sha256": "09jp80yrql450bz7c2rfjyyfy0zd59kmrc0lww5ws0lyp95n116y" + "rev": "616bc5b962cdcacb1c1ba985d7236392e9cadb8c", + "sha256": "0njahb52kshci23xw89j1rgffmrmric8kz54dzmqsmlcqp181qkh" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "c3a7debff7a4c6ddaedb795290180dd99d7ac4be", - "sha256": "1aslr9msddnrkxrlzplbzpfydjkiw1haa67mcsmr2phxkfh05329" + "rev": "34c19c6441cd440dc65b59ae7670eadf099d51f8", + "sha256": "0hiqfvz5jc6ha6ln8jl8vv4ijsdz55f3zp801dbh2r68cmf9qsrm" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "c41437acf07c2c4703351b07925fce3ce0e6b75d", - "sha256": "1ihv2k4swbhd4kiaprrjgq8kmx3vrg64y2dqkvg6nd26dfwhxr0f" + "rev": "8ad0f08ad7e2a8d27dc5e69806812c6a3f298946", + "sha256": "0pyiiqj18c2gvbqvgnaki2hzcizi1lam82x761y2lp717sgb09v9" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "5b1b4a99d6bc98c42a11b7a3f6c9f0b0f9e56f34", - "sha256": "0ji4kaphlqmlpcvcvlqklhzmdlwv712cvsdxnv41fdab6b49yghw" + "rev": "690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638", + "sha256": "1iiml673isnqakjzspq5gf6818zmmd7pj6z9y2jwxb2xkkn8ahpc" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "bd0ceb7de5d0c918ae596150e95b069dca8b9150", - "sha256": "100qhcdcnnx0l3sl9zl5p3l7707h7vdbjjk7dmy7ap1r0218m5zy" + "rev": "f82ed367d1b80b69d738cfcde534b75854a45476", + "sha256": "1pv7af4z3f9d1ifqjwbf7fhgglpnjfby8h2fg5h114mpils661bn" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "f7745c117041e7adf9705e1de8d71086c160dd9f", - "sha256": "0nx8qdg3m4wf8pynh4pr1j0m0p1y5pws7fnx5mpqccvwgj4bwrdj" + "rev": "c601106c8b5d5495f951c8ea0ad6a9e171416ae0", + "sha256": "0w8ggzc4sxfa1y3n40m24zxp59c2y1mfb2c7zdd8nmlrg7xnqsf0" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "8b885af5ad3c2f2ff500c060a41e312ea7276e50", - "sha256": "0mh4bva1msczgwl2x3b960rml5rmxnvvzi1wk94cc51888vyajiv" + "rev": "7389450a5de5fdd210f1459abcf73621ec0496bd", + "sha256": "1hv8yi4lq3mdxqkcln2b75drdyfiaqj63khzvy09gdf1x6fyjnn5" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "c8b37a1bda9b8f29d56775ed6556d56ac5d3ea1d", - "sha256": "15spjyc6gq1r5vdryhm21mhaim1iw24y80p0srp58qm9jwqg9dys" + "rev": "75f434f14499eb47ede2cb66f0946527bf555791", + "sha256": "17d7bcc3v55ywakaybp88c493bfx63vyiz7n8f5kcijj5q5hdf1r" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "6d2f0c3a36d9b2cdcd759a464c608365a0afda98", - "sha256": "1aqhvniysjc14xqcwvqhylcd4lpsl5vsym0spfahxs55s9jsvbyl" + "rev": "fca83088ef430f96257d2014e77d08bd350259af", + "sha256": "1jc7myns24mzfnfybzzjqkpnl235c0fm0zqkai55xwi3vcv9xyr5" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "8f879e6bcf941a612c568fbfe2b49ddb1bb409cd", - "sha256": "02glac0m95naxl5c6n22xclxhp7fjl1whf6sf3388h41wwdhv11c" + "rev": "3681356904277e055759693551357e7e488d1be9", + "sha256": "14v9r4mhqq453dzkc5gvv660gq11zsmzngvwgi44srhzcx7k1qqv" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "9a7b9972a54137d5f2e0d49559fe58d07c90662e", - "sha256": "1hcf18cls9kmq4xjxzjm2viqs80pxr4ykrzx0vg1bd83bc509vqp" + "rev": "dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f", + "sha256": "1gbgga8qy26nxxq0537hm3h6la04xb6m4cc2aifjhhhj8py95170" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "53fa44709992faae54e4f5c8a128cea7b6f0cbd5", - "sha256": "12w6znmy2hijcnwqqva8abydcryh6jcp8lhx0kz0m3cvhwpq1fbx" + "rev": "bbb1891595aba23ff3c6d137aa74442f9e54479b", + "sha256": "0j59r6dj4wvassng39whnidd6nzhndwssfwjppppqbs5xy57zh2z" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "ee931eba5d129284d5c33157cd7d0b9232fbee7b", - "sha256": "17fyfkm8qfl9jmlq3ppnqwdx47230bk2laikfbq2188vn42yxnqv" + "rev": "907009a4f7e5d2b99805547caf4b901bdbb0d4d6", + "sha256": "0aam2imp4rkbrjir5gsk4ja7vf7vv68ybsh7qchavb3zdmjsvxcd" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "aaa54153970d1d63a44b873cad5f62ffa71ef9b8", - "sha256": "0q34pi4mqqi4vzk57f59xsk303jgpk1fkxvnvm9r08jkckxxbisw" + "rev": "6c3605fcb3b34e55951f597e06c135d97dfa6cd7", + "sha256": "0dqmw2yqh5b5ayq93px2na50ghfk55y55zsgwraxglly0zgm39w9" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "6e0917d518e07f737cc663b8d632c8021634fd3b", - "sha256": "062riy66z3v1fxrdnbdhafqdv67xqz12pscidj4fhhp9fzi92a45" + "rev": "087f6f35bd027f940818b1696d0aad822e034377", + "sha256": "0y3hkz7ss6iibpfr7dc855bzhdanz79ix0jm6b28viqjy3bdzgar" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 5ac474afeda32..60ce4e4daf495 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.12"; + version = "5.15.14"; mk = name: args: { @@ -63,31 +63,25 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) }; }; - catapult = fetchgit { - url = "https://chromium.googlesource.com/catapult"; - rev = "5eedfe23148a234211ba477f76fc2ea2e8529189"; - hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o="; - }; - qtscript = rec { - version = "5.15.16"; + version = "5.15.17"; src = fetchFromGitHub { owner = "qt"; repo = "qtscript"; rev = "v${version}-lts"; - hash = "sha256-4Jqsmk5EBQ2Biv69yYCNx7l7AWFikRMBfl0fbZcsSaA="; + hash = "sha256-wXEKdu2gdlkVsWr3nb/tCBwyo9H8GPHWTUele1cP0ks="; }; }; qtwebengine = rec { - version = "5.15.16"; + version = "5.15.17"; src = fetchFromGitHub { owner = "qt"; repo = "qtwebengine"; rev = "v${version}-lts"; - hash = "sha256-Arg/tfJcx9+CSV1VXBieHNoCSwmWNTnyBdgSkthOdfA="; + hash = "sha256-1be8Y96yHYBCxQsRC/PD2X0TVWpA2/r1hvi8sBKOais="; fetchSubmodules = true; }; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 594489a0d7505..d92287feb1511 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -397,7 +397,7 @@ stdenv.mkDerivation (finalAttrs: ({ meta = with lib; { homepage = "https://www.qt.io/"; - description = "A cross-platform application framework for C++"; + description = "Cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; pkgConfigModules = [ diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index a9897648d8e6f..338911a5afd5f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -9,5 +9,6 @@ qtModule { # This flag re-enables this feature # https://libcxx.llvm.org/docs/UsingLibcxx.html#c-17-specific-configuration-macros "QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" + "QMAKE_CXXFLAGS+=-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION" ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 347a5cf643428..cb2357a1ebf47 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,4 +1,4 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, wayland-scanner, pkg-config }: +{ qtModule, qtbase, qtquickcontrols, wayland, wayland-scanner, pkg-config, lib }: qtModule { pname = "qtwayland"; @@ -12,4 +12,5 @@ qtModule { # context). ./qtwayland-app_id.patch ]; + meta.badPlatforms = lib.platforms.darwin; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 44007bec07b84..b2715fbe7502c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,8 +1,8 @@ { qtModule , qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel -, bison, flex, git, gperf, ninja, pkg-config, python, which, python3 -, nodejs, qtbase, perl +, bison, flex, git, gperf, ninja, pkg-config, python, which +, nodejs, perl , buildPackages , pkgsBuildTarget , pkgsBuildBuild @@ -22,9 +22,9 @@ , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate -, cups, openbsm, runCommand, xcbuild, writeScriptBin +, cups, openbsm, xcbuild, writeScriptBin , ffmpeg_4 ? null -, lib, stdenv, fetchpatch +, lib, stdenv , version ? null , qtCompatVersion , pipewireSupport ? stdenv.isLinux @@ -32,7 +32,6 @@ , postPatch ? "" , nspr , lndir -, dbusSupport ? !stdenv.isDarwin, expat }: let @@ -52,17 +51,12 @@ let ''; }; - qtPlatformCross = plat: with plat; - if isLinux - then "linux-generic-g++" - else throw "Please add a qtPlatformCross entry for ${plat.config}"; - in qtModule ({ pname = "qtwebengine"; nativeBuildInputs = [ - bison flex git gperf ninja pkg-config python which gn nodejs + bison flex git gperf ninja pkg-config (python.withPackages(ps: [ ps.html5lib ])) which gn nodejs ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ perl lndir (lib.getDev pkgsBuildTarget.targetPackages.qt5.qtbase) @@ -93,12 +87,6 @@ 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 @@ -292,7 +280,7 @@ qtModule ({ requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { - description = "A web engine based on the Chromium web browser"; + description = "Web engine based on the Chromium web browser"; mainProgram = "qwebengine_convert_dict"; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 54d24e46092f2..c2e329b1f11ff 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -86,7 +86,7 @@ mkDerivation (args // { meta = { homepage = "https://www.qt.io"; - description = "A cross-platform application framework for C++"; + description = "Cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index c4b8512079546..c724bd21d11ff 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -4,7 +4,6 @@ , generateSplicesForMkScope , makeScopeWithSplicing' , fetchurl -, fetchpatch , fetchpatch2 , makeSetupHook , makeWrapper diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index a327b88991ef0..43c2c88ecd799 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -266,7 +266,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.qt.io/"; - description = "A cross-platform application framework for C++"; + description = "Cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao LunNova ]; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 8f0ddad4a58a1..997fe0394fa25 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -311,7 +311,7 @@ qtModule { ''; meta = with lib; { - description = "A web engine based on the Chromium web browser"; + description = "Web engine based on the Chromium web browser"; platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7a-linux" "armv7l-linux" "x86_64-linux" ]; # This build takes a long time; particularly on slow architectures # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index addcd53aea81e..ef5aa994ce908 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (args // { pos = builtins.unsafeGetAttrPos "pname" args; in { homepage = "https://www.qt.io/"; - description = "A cross-platform application framework for C++"; + description = "Cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index a7372dfba22e6..3d44f556a0ffb 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${finalAttrs.version}"; - hash = "sha256-cGMS0lEtgd64rjeEfYwJplf9rva0FtpaQMCfxyramE8="; + hash = "sha256-1aeXcN9DwPE8CoaxCqCNL9UEcRHJdaKxS7Ivjp3YNN8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 0ac930710bf4d..e9deed9d8ac18 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.14.0"; + version = "6.14.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-pg2SaFfFkP2v1qHo8CRCn7b9B4XKX+R4UqRNzNG4to4="; + hash = "sha256-WUrxBlSS1Z3+tQGmAi+d3wpqutqNjPrVOxmpUy01aqU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/development/libraries/quantlib/default.nix index a0ca48b1afd89..a84221b1b176a 100644 --- a/pkgs/development/libraries/quantlib/default.nix +++ b/pkgs/development/libraries/quantlib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A free/open-source library for quantitative finance"; + description = "Free/open-source library for quantitative finance"; homepage = "https://quantlib.org"; platforms = platforms.unix; license = licenses.bsd3; diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 78dc32fbbf550..816139a1693d0 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.554"; + version = "1.4.555"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-/RID+nqjMAEg2jzTBYc/8hz/t+k4TJlks7oCJ5YrjIY="; + sha256 = "sha256-uBKKgRsM7kUDeF0kMYbo6RjmiU6wq4EEcE94qqMSzt8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 440d52d08f81d..d0b4d22b87e34 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU libGL glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. meta = with lib; { - description = "A free implementation of the OpenGL Character Renderer"; + description = "Free implementation of the OpenGL Character Renderer"; longDescription = '' QuesoGLC is a free (as in free speech) implementation of the OpenGL Character Renderer (GLC). QuesoGLC is based on the FreeType library, diff --git a/pkgs/development/libraries/quickflux/default.nix b/pkgs/development/libraries/quickflux/default.nix index 9f56e67931911..3ab3058b478e7 100644 --- a/pkgs/development/libraries/quickflux/default.nix +++ b/pkgs/development/libraries/quickflux/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A Flux implementation for QML"; + description = "Flux implementation for QML"; homepage = "https://github.com/benlau/quickflux"; license = licenses.asl20; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index f22f9860d9cd4..7ea5d6a4e72d7 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y27rTJc2taFGOjDmy0KKQQxSdXOwteLunHwICh5pSEc="; + sha256 = "sha256-8AF+deDRxipN+YMHE9vUyTaUbSJIckMkB7t3YVtupQs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index a500e5dbc045c..66c70fcf4dd00 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -2,25 +2,18 @@ stdenv.mkDerivation rec { pname = "rabbitmq-c"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "alanxz"; repo = "rabbitmq-c"; rev = "v${version}"; - sha256 = "sha256-4tSZ+eaLZAkSmFsGnIrRXNvn3xA/4sTKyYZ3hPUMcd0="; + hash = "sha256-ffdnLEgUg+4G12JntjFag3ZXMvEL42hsrY6VT58ccJ0="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ openssl popt xmlto ]; - # https://github.com/alanxz/rabbitmq-c/issues/733 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ - --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} - ''; - meta = with lib; { description = "RabbitMQ C AMQP client library"; homepage = "https://github.com/alanxz/rabbitmq-c"; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 77db5869f62a1..9b9c2bd39d648 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "range-v3"; diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 880f1706b2995..ad8252f48e8cb 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A C++ framework for property based testing inspired by QuickCheck"; + description = "C++ framework for property based testing inspired by QuickCheck"; inherit (finalAttrs.src.meta) homepage; maintainers = with maintainers; [ ]; license = licenses.bsd2; diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix index 1275f2fa5452b..53994cecd3815 100644 --- a/pkgs/development/libraries/rapidyaml/default.nix +++ b/pkgs/development/libraries/rapidyaml/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git ]; meta = with lib; { - description = "A library to parse and emit YAML, and do it fast."; + description = "Library to parse and emit YAML, and do it fast"; homepage = "https://github.com/biojppm/rapidyaml"; license = licenses.mit; maintainers = with maintainers; [ martfont ]; diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index bb59eb9d654c1..64e327ec34afd 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - description = "A simple and easy-to-use library to enjoy videogames programming"; + description = "Simple and easy-to-use library to enjoy videogames programming"; homepage = "https://www.raylib.com/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 400c7297d22ba..3b9580840f4d8 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-F67aKmyMmqBVG5sF8ZwqemmfvVi/0bDjaiugKKSipuA="; + sha256 = "sha256-RLjshOnMmCdlv73M8siIvBZ5kVG3v2XttkLVPU+BHY4="; }; nativeBuildInputs = [ pkg-config python3 which ]; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 9a9e1f634df8d..2310ce33ea4f3 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A regular expression library"; + description = "Regular expression library"; longDescription = '' RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ diff --git a/pkgs/development/libraries/readline/8.2.nix b/pkgs/development/libraries/readline/8.2.nix index 72e3370576e72..7bf5caf4060f1 100644 --- a/pkgs/development/libraries/readline/8.2.nix +++ b/pkgs/development/libraries/readline/8.2.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchpatch, fetchurl +, updateAutotoolsGnuConfigScriptsHook , ncurses, termcap , curses-library ? if stdenv.hostPlatform.isWindows @@ -20,6 +21,7 @@ stdenv.mkDerivation rec { strictDeps = true; propagatedBuildInputs = [ curses-library ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; patchFlags = [ "-p0" ]; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 8ba1f571b0287..0f746c36483c6 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "An open source library to extract valid data from within an Open Street Map input file"; + description = "Open source library to extract valid data from within an Open Street Map input file"; homepage = "https://www.gaia-gis.it/fossil/readosm"; license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix index ae920f4cb0d23..5092cc2ab7bdf 100644 --- a/pkgs/development/libraries/reproc/default.nix +++ b/pkgs/development/libraries/reproc/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/DaanDeMeyer/reproc"; - description = "A cross-platform (C99/C++11) process library"; + description = "Cross-platform (C99/C++11) process library"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 58863d6e26425..bb58fbaad3702 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = "A wrapper for the user, group and hosts NSS API"; + description = "Wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 1323bd98a43c6..7387e69130730 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "The GTK Libretro frontend framework"; + description = "GTK Libretro frontend framework"; mainProgram = "retro-demo"; longDescription = '' Libretro is a plugin format design to implement video game diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix index c8661f173e672..75760fed577f0 100644 --- a/pkgs/development/libraries/rlog/default.nix +++ b/pkgs/development/libraries/rlog/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.arg0.net/rlog"; - description = "A C++ logging library used in encfs"; + description = "C++ logging library used in encfs"; platforms = lib.platforms.linux; license = lib.licenses.lgpl3; }; diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index cbc46f819e5f4..541c805bba5bb 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/Samsung/rlottie"; - description = "A platform independent standalone c++ library for rendering vector based animations and art in realtime"; + description = "Platform independent standalone c++ library for rendering vector based animations and art in realtime"; license = with licenses; [ mit bsd3 mpl11 ftl ]; platforms = platforms.all; maintainers = with maintainers; [ CRTified ]; diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index 39a8f1a4b6a6f..ad7ba8a5a5497 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation rec { pname = "rnnoise-plugin"; - version = "1.03"; + version = "1.10"; src = fetchFromGitHub { owner = "werman"; repo = "noise-suppression-for-voice"; rev = "v${version}"; - sha256 = "sha256-1DgrpGYF7G5Zr9vbgtKm/Yv0HSdI7LrFYPSGKYNnNDQ="; + sha256 = "sha256-sfwHd5Fl2DIoGuPDjELrPp5KpApZJKzQikCJmCzhtY8="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A real-time noise suppression plugin for voice based on Xiph's RNNoise"; + description = "Real-time noise suppression plugin for voice based on Xiph's RNNoise"; homepage = "https://github.com/werman/noise-suppression-for-voice"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index c584ef2976d1c..af52b6a9fa7c7 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , bzip2 @@ -18,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.1.1"; + version = "9.2.1"; src = fetchFromGitHub { owner = "facebook"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc="; + hash = "sha256-Zifn5Gu/4h6TaEqSaWQ2mFdryeAarqbHWW3fKUGGFac="; }; nativeBuildInputs = [ cmake ninja ]; @@ -98,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://rocksdb.org"; - description = "A library that provides an embeddable, persistent key-value store for fast storage"; + description = "Library that provides an embeddable, persistent key-value store for fast storage"; changelog = "https://github.com/facebook/rocksdb/raw/v${finalAttrs.version}/HISTORY.md"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/rtrlib/default.nix b/pkgs/development/libraries/rtrlib/default.nix index 05429a72fb667..2f0ae61b9a9c3 100644 --- a/pkgs/development/libraries/rtrlib/default.nix +++ b/pkgs/development/libraries/rtrlib/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An open-source C implementation of the RPKI/Router Protocol client"; + description = "Open-source C implementation of the RPKI/Router Protocol client"; homepage = "https://github.com/rtrlib/rtrlib"; license = licenses.mit; maintainers = with maintainers; [ Anillc ]; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 7830e62ccb181..66b3dbbea3fb1 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libsamplerate, libsndfile, fftw -, lv2, jdk +, lv2, jdk_headless , vamp-plugin-sdk, ladspaH, meson, ninja, darwin }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-2e+J4rjvn4WxOsPC+uww4grPLJ86nIxFzmN/K8leV2w="; }; - nativeBuildInputs = [ pkg-config meson ninja jdk ]; + nativeBuildInputs = [ pkg-config meson ninja jdk_headless ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH lv2 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo]); makeFlags = [ "AR:=$(AR)" ]; diff --git a/pkgs/development/libraries/rure/default.nix b/pkgs/development/libraries/rure/default.nix index 1771abd3367af..308eb41d1a902 100644 --- a/pkgs/development/libraries/rure/default.nix +++ b/pkgs/development/libraries/rure/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage { passthru.updateScript = ./update.sh; meta = { - description = "A C API for Rust's regular expression library"; + description = "C API for Rust's regular expression library"; homepage = "https://crates.io/crates/rure"; license = [ lib.licenses.mit diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 36f11372775d7..60e6eaf5b5350 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.4.12"; + version = "1.4.14"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-gOCnRuJ1YM+SkrOJ/5TGANl442e7Umh3HK5DFNLJi/A="; + hash = "sha256-FEEjsJ5l87yuFDDzJPcAQ0O7OG6neK5PX+DMY5OIKJM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 5403d77eb7524..b4e8831b31775 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An implementation of the Dirac video codec in ANSI C"; + description = "Implementation of the Dirac video codec in ANSI C"; homepage = "https://sourceforge.net/projects/schrodinger/"; maintainers = [ ]; license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 50ba7e8273fa8..0fd659b0e1b74 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.0.7"; + version = "2.0.8"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-sbs20BbAnvHTtJEuTWMCJrjzyvH7NSXS1+Ah5BdJZHA="; + hash = "sha256-qdPQMC8HCMdcbHyO8B0OFiefO+jM1ytA2dYNymE0Xuc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index 3b512a3976dc3..c24388582d36b 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -6,7 +6,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${version}"; - hash = "sha256-u5UpI6ll2TnI02xWSaZRC5v6BOT0EHaQ2md5iY/Ymjs="; + hash = "sha256-0M+k3A2Lw9EU9V5bX9dGztmdcJzc71XQZv8srmY5NmY="; }; indi-firmware = callPackage ./indi-firmware.nix { inherit version; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 8b1aa7d01e818..8e1c0a939daf3 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A C library for reading/writing high-throughput sequencing data"; + description = "C library for reading/writing high-throughput sequencing data"; license = licenses.mit; homepage = "http://www.htslib.org/"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/chemistry/harminv/default.nix b/pkgs/development/libraries/science/chemistry/harminv/default.nix index dc8289e14ce91..f9d8573ca6d5f 100644 --- a/pkgs/development/libraries/science/chemistry/harminv/default.nix +++ b/pkgs/development/libraries/science/chemistry/harminv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "NanoComp"; repo = pname; rev = "v${version}"; - hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; + hash = "sha256-HV8xylK2IOvbONYGgyaqAabp6xA7/uvN4DU7upIlZh0="; }; # File is missing in the git checkout but required by autotools @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack ]; - configureFlags = [ "--enable-shared" ]; + configureFlags = [ + "--enable-shared" + "--enable-maintainer-mode" + ]; meta = with lib; { description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; - mainProgram = "GDSIIConvert"; homepage = "https://github.com/NanoComp/harminv"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ sheepforce markuskowa ]; diff --git a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix index 6c4061c4c05b9..ef77380396730 100644 --- a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix +++ b/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ msgpack ]; meta = with lib; { - description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; + description = "Library of exchange-correlation functionals with arbitrary-order derivatives"; homepage = "https://github.com/rcsb/mmtf-cpp"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/chemistry/mstore/default.nix b/pkgs/development/libraries/science/chemistry/mstore/default.nix index e187a9a9833f0..c77667a8d71ae 100644 --- a/pkgs/development/libraries/science/chemistry/mstore/default.nix +++ b/pkgs/development/libraries/science/chemistry/mstore/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mstore"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "grimme-lab"; repo = pname; rev = "v${version}"; - hash = "sha256-dN2BulLS/ENRFVdJIrZRxgBV8S4d5+7BjTCGnhBbf4I="; + hash = "sha256-zfrxdrZ1Um52qTRNGJoqZNQuHhK3xM/mKfk0aBLrcjw="; }; nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; diff --git a/pkgs/development/libraries/science/chemistry/plumed/default.nix b/pkgs/development/libraries/science/chemistry/plumed/default.nix index b825c8270d628..b70d2146b2da1 100644 --- a/pkgs/development/libraries/science/chemistry/plumed/default.nix +++ b/pkgs/development/libraries/science/chemistry/plumed/default.nix @@ -8,13 +8,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "plumed"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "plumed"; repo = "plumed2"; rev = "v${version}"; - hash = "sha256-yL+59f908IhbxGIylI1ydi1BPZwAapjK/vP4/h5gcHk="; + hash = "sha256-68/ajM87ApEXUs4xPIq7Vfmzl7Ms4ck6jnjlIv7woMs="; }; postPatch = '' diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/development/libraries/science/chemistry/xcfun/default.nix index 0534c7b46b033..cac389333e49c 100644 --- a/pkgs/development/libraries/science/chemistry/xcfun/default.nix +++ b/pkgs/development/libraries/science/chemistry/xcfun/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DXCFUN_MAX_ORDER=3" ]; meta = with lib; { - description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; + description = "Library of exchange-correlation functionals with arbitrary-order derivatives"; homepage = "https://github.com/dftlibs/xcfun"; license = licenses.mpl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index f67d68d768a0f..dfd33ed603afc 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ]; meta = with lib; { - description = "A C++ library for Quadratic Programming"; + description = "C++ library for Quadratic Programming"; longDescription = '' QuadProg++ is a C++ library for Quadratic Programming which implements the Goldfarb-Idnani active-set dual method. diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix index 2bbd698f7fa7b..272d13b1711ec 100644 --- a/pkgs/development/libraries/science/math/bonmin/default.nix +++ b/pkgs/development/libraries/science/math/bonmin/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; + description = "Open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; mainProgram = "bonmin"; homepage = "https://github.com/coin-or/Bonmin"; license = licenses.epl10; diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 311ffefcfaad5..88053a41af69e 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jluttine/cholmod-extra"; - description = "A set of additional routines for SuiteSparse CHOLMOD Module"; + description = "Set of additional routines for SuiteSparse CHOLMOD Module"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ jluttine ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/science/math/clblas/default.nix b/pkgs/development/libraries/science/math/clblas/default.nix index dfa157d05d655..e5ad0e3e63d9c 100644 --- a/pkgs/development/libraries/science/math/clblas/default.nix +++ b/pkgs/development/libraries/science/math/clblas/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/clMathLibraries/clBLAS"; - description = "A software library containing BLAS functions written in OpenCL"; + description = "Software library containing BLAS functions written in OpenCL"; longDescription = '' This package contains a library of BLAS functions on top of OpenCL. ''; diff --git a/pkgs/development/libraries/science/math/clblast/default.nix b/pkgs/development/libraries/science/math/clblast/default.nix index e4bbd09a7586b..a7c8d8faee4c0 100644 --- a/pkgs/development/libraries/science/math/clblast/default.nix +++ b/pkgs/development/libraries/science/math/clblast/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "The tuned OpenCL BLAS library"; + description = "Tuned OpenCL BLAS library"; homepage = "https://github.com/CNugteren/CLBlast"; license = licenses.asl20; maintainers = with maintainers; [ Tungsten842 ]; diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix index b60bd1fe76c11..73874641e477e 100644 --- a/pkgs/development/libraries/science/math/ecos/default.nix +++ b/pkgs/development/libraries/science/math/ecos/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A lightweight conic solver for second-order cone programming"; + description = "Lightweight conic solver for second-order cone programming"; homepage = "https://www.embotech.com/ECOS"; downloadPage = "https://github.com/embotech/ecos/releases"; license = licenses.gpl3; diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 25d6542f8da1b..59494fadfd900 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -97,20 +97,21 @@ stdenv.mkDerivation { "-DCUDAToolkit_INCLUDE_DIR=${cudaJoined}/include" ]; + buildFlags = [ + "faiss" + "demo_ivfpq_indexing" + ] ++ lib.optionals pythonSupport [ + "swigfaiss" + ]; # pip wheel->pip install commands copied over from opencv4 - buildPhase = '' - make -j faiss - make demo_ivfpq_indexing - '' + lib.optionalString pythonSupport '' - make -j swigfaiss + postBuild = lib.optionalString pythonSupport '' (cd faiss/python && python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) ''; - installPhase = '' - make install + postInstall = '' mkdir -p $demos/bin cp ./demos/demo_ivfpq_indexing $demos/bin/ '' + lib.optionalString pythonSupport '' @@ -118,7 +119,7 @@ stdenv.mkDerivation { (cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache) ''; - fixupPhase = lib.optionalString (pythonSupport && cudaSupport) '' + postFixup = lib.optionalString (pythonSupport && cudaSupport) '' addOpenGLRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so addOpenGLRunpath $demos/bin/* ''; @@ -144,7 +145,7 @@ stdenv.mkDerivation { }; meta = with lib; { - description = "A library for efficient similarity search and clustering of dense vectors by Facebook Research"; + description = "Library for efficient similarity search and clustering of dense vectors by Facebook Research"; mainProgram = "demo_ivfpq_indexing"; homepage = "https://github.com/facebookresearch/faiss"; license = licenses.mit; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 286a630f4b411..ac04711ff71f8 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A software package for large-scale nonlinear optimization"; + description = "Software package for large-scale nonlinear optimization"; homepage = "https://projects.coin-or.org/Ipopt"; license = licenses.epl10; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index f6603f7d8fb82..ebab7c00809ad 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.com/sagemath/lcalc"; - description = "A program for calculating with L-functions"; + description = "Program for calculating with L-functions"; mainProgram = "lcalc"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix index a40091bac8b50..f74808462ae1d 100644 --- a/pkgs/development/libraries/science/math/libamplsolver/default.nix +++ b/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substitute, fetchurl, fetchpatch }: +{ lib, stdenv, substitute, fetchurl }: stdenv.mkDerivation rec { pname = "libamplsolver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A library of routines that help solvers work with AMPL"; + description = "Library of routines that help solvers work with AMPL"; homepage = "https://ampl.com/netlib/ampl/"; license = [ licenses.mit ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix index a7940cd1db8d7..a4b8c2f79140d 100644 --- a/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -27,7 +27,13 @@ in stdenv.mkDerivation { pname = "libtorch-test"; version = libtorch-bin.version; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./CMakeLists.txt + ./test.cpp + ]; + }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 53a613522bb05..4084aa83a20a4 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; meta = { - description = "A collection of special mathematical functions"; + description = "Collection of special mathematical functions"; homepage = "https://github.com/JuliaLang/openspecfun"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 1b17f95761752..acb0ece75463c 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -2,6 +2,7 @@ , bzip2 , cbc , cmake +, DarwinTools # sw_vers , eigen , ensureNewerSourcesForZipFilesHook , fetchFromGitHub @@ -72,6 +73,8 @@ stdenv.mkDerivation rec { python.pythonOnBuildForHost swig4 unzip + ] ++ lib.optionals stdenv.isDarwin [ + DarwinTools ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 485c5322cacd9..45d5fc5b1f9b5 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { passthru = { inherit withGurobi withCplex; }; meta = with lib; { - description = "An abstract base class to a generic linear programming (LP) solver"; + description = "Abstract base class to a generic linear programming (LP) solver"; homepage = "https://github.com/coin-or/Osi"; license = licenses.epl20; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix index bf22e1d74d931..d308302e2c9f3 100644 --- a/pkgs/development/libraries/science/math/osqp/default.nix +++ b/pkgs/development/libraries/science/math/osqp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "A quadratic programming solver using operator splitting"; + description = "Quadratic programming solver using operator splitting"; homepage = "https://osqp.org"; license = licenses.asl20; maintainers = with maintainers; [ taktoa ]; diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index db70bf8dd7a4b..5023390a182cb 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices"; + description = "MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"; platforms = platforms.all; license = licenses.unfree; diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix index 196ee5de576b9..21791267e1aec 100644 --- a/pkgs/development/libraries/science/math/planarity/default.nix +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; - description = "A library for implementing graph algorithms"; + description = "Library for implementing graph algorithms"; mainProgram = "planarity"; license = licenses.bsd3; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 84949e0a53447..6ace83fd043d9 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "9.1.0"; + version = "9.2.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-YK0REOqoNa55tQt6NH/0QQ07pzAImDR5kC00sbFILH8="; + hash = "sha256-UtJ5AXbmoUA1NokgXDUDnhCZzOT1bTen6C89bsCWEIo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index b8ce3eca888ca..c87bc4d31a8c2 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; - description = "A suite of sparse matrix algorithms"; + description = "Suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index cbc24b1546565..f47b5c0ce818f 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; - description = "A suite of sparse matrix algorithms"; + description = "Suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 9561cf2ed7795..fcfd9b56a1b14 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; - description = "A suite of sparse matrix algorithms"; + description = "Suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index f99e86ffe478c..4f52c2d6c507a 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"; license = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt"; - description = "A library for the solution of large, sparse, nonsymmetric systems of linear equations"; + description = "Library for the solution of large, sparse, nonsymmetric systems of linear equations"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch index cbcf18b4cdb23..97c0a7dad3005 100644 --- a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch +++ b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch @@ -13,18 +13,18 @@ Date: Tue Mar 2 22:07:11 2021 -0300 mechanism already in sympow to trim this new message. diff --git a/Configure b/Configure -index 1ef9756..776bec2 100755 +index 53b556e..53999ae 100755 --- a/Configure +++ b/Configure @@ -322,7 +322,7 @@ echo "datafiles/param_data: \$(OTHERb)" >> $FILE echo " \$(MKDIR) -p datafiles" >> $FILE echo " \$(TOUCH) datafiles/param_data" >> $FILE echo " \$(SH) armd.sh" >> $FILE --echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE +-echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE +echo " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE + echo " \$(SED) -i -e '/logfile is/d' datafiles/*.txt" >> $FILE echo "sympow.1: sympow" >> $FILE echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE - echo "clean:" >> $FILE diff --git a/generate.c b/generate.c index dbb811f..783320c 100644 --- a/generate.c diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index 1033f26f43603..91daf30686f8f 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv -, fetchFromGitLab -, fetchpatch -, makeWrapper -, which -, autoconf -, help2man -, file -, pari +{ + lib, + stdenv, + fetchFromGitLab, + makeWrapper, + which, + autoconf, + help2man, + file, + pari, }: stdenv.mkDerivation rec { - version = "2.023.6"; + version = "2.023.7"; pname = "sympow"; src = fetchFromGitLab { @@ -18,17 +19,10 @@ stdenv.mkDerivation rec { owner = "forks"; repo = "sympow"; rev = "v${version}"; - sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; + hash = "sha256-sex8gRiBdTcVMV3nSeiTYamAjPoXQdiiZwjRmeKA+mc="; }; - patches = [ - ./clean-extra-logfile-output-from-pari.patch - (fetchpatch { - name = "null-terminate-dupdirname.patch"; - url = "https://gitlab.com/rezozer/forks/sympow/-/merge_requests/5.diff"; - sha256 = "sha256-yKjio+qN9teL8L+mb7WOBN/iv545vRIxW20FJU37oO4="; - }) - ]; + patches = [ ./clean-extra-logfile-output-from-pari.patch ]; postUnpack = '' patchShebangs . @@ -66,12 +60,11 @@ stdenv.mkDerivation rec { # Example from the README as a sanity check. doInstallCheck = true; installCheckPhase = '' - export HOME="$TMP/home" - mkdir -p "$HOME" + export HOME=$TMPDIR "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' ''; - meta = with lib; { + meta = { description = "Compute special values of symmetric power elliptic curve L-functions"; mainProgram = "sympow"; license = { @@ -79,7 +72,7 @@ stdenv.mkDerivation rec { fullName = "Custom, BSD-like. See COPYING file."; free = true; }; - maintainers = teams.sage.members; - platforms = platforms.linux; + maintainers = lib.teams.sage.members; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 1bee7f46d37ca..4ecd08d103fac 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -99,7 +99,7 @@ buildBazelPackage rec { configurePlatforms = []; meta = with lib; { - description = "An open source deep learning framework for on-device inference."; + description = "Open source deep learning framework for on-device inference"; homepage = "https://www.tensorflow.org/lite"; license = licenses.asl20; maintainers = with maintainers; [ mschwaig cpcloud ]; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index bdaf6e6284ef1..1c61bb07471be 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , gmp , python3 , tune ? false # tune to hardware, impure diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index fa6e5e48f8462..6e63520031c14 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -1,5 +1,4 @@ { stdenv -, breakpointHook , fetchFromGitLab , python , libxml2 @@ -79,7 +78,7 @@ stdenv.mkDerivation rec { sqlite.dev gsl boost - root + root # provides cppyy glib.out glib.dev libpcap @@ -134,7 +133,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.nsnam.org"; license = licenses.gpl3; - description = "A discrete time event network simulator"; + description = "Discrete time event network simulator"; platforms = with platforms; unix; maintainers = with maintainers; [ teto rgrunbla ]; # never built on aarch64-darwin since first introduction in nixpkgs diff --git a/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix b/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix index 07d978641663d..dbb62fd24f061 100644 --- a/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix +++ b/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A command line tool that compiles a TensorFlow Lite model into an Edge TPU compatible file."; + description = "Command line tool that compiles a TensorFlow Lite model into an Edge TPU compatible file"; mainProgram = "edgetpu_compiler"; homepage = "https://coral.ai/docs/edgetpu/compiler"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/development/libraries/scope-lite/default.nix b/pkgs/development/libraries/scope-lite/default.nix index 40cad6a5fc3c7..37cf8d12fd00e 100644 --- a/pkgs/development/libraries/scope-lite/default.nix +++ b/pkgs/development/libraries/scope-lite/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; meta = { - description = "A migration path to C++ library extensions scope_exit, scope_fail, scope_success, unique_resource"; + description = "Migration path to C++ library extensions scope_exit, scope_fail, scope_success, unique_resource"; license = lib.licenses.boost; maintainers = [ lib.maintainers.shlevy ]; homepage = "https://github.com/martinmoene/scope-lite"; diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix index e3c8ea00f4467..50171324b386e 100644 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A set of JavaScript libraries to enhance the user interface of web sites"; + description = "Set of JavaScript libraries to enhance the user interface of web sites"; longDescription = '' script.aculo.us provides you with easy-to-use, cross-browser user diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index ec95184707d02..38ebc3f42a096 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.7.2"; + version = "0.7.6"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-0yFRDQ/f0oVbpZ4wev28xCTVkbXr58Tt0Czda3ppRWk="; + hash = "sha256-yriFV6OLk+miaKKWQKd08MmwDx0blkiiyq6gQHUaNWE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 8bb82d4809431..707a77006acbe 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; + description = "Lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; homepage = "https://drobilla.net/software/serd"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix index 901ee48adeceb..ad6a40716bcdd 100644 --- a/pkgs/development/libraries/shhmsg/default.nix +++ b/pkgs/development/libraries/shhmsg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with lib; { - description = "A library for displaying messages"; + description = "Library for displaying messages"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; platforms = platforms.all; diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index 664d4f3330a05..324cb8203484b 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with lib; { - description = "A library for parsing command line options"; + description = "Library for parsing command line options"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; platforms = platforms.all; diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/development/libraries/sigslot/default.nix index 8bc51fdd9ec50..8a97ab9d32e9a 100644 --- a/pkgs/development/libraries/sigslot/default.nix +++ b/pkgs/development/libraries/sigslot/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontBuild = true; meta = with lib; { - description = "A header-only, thread safe implementation of signal-slots for C++"; + description = "Header-only, thread safe implementation of signal-slots for C++"; license = licenses.mit; homepage = "https://github.com/palacaze/sigslot"; maintainers = with maintainers; [ azahi ]; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 03926aebbceaa..60a4af6d0a730 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "An advanced font engine"; + description = "Advanced font engine"; homepage = "https://graphite.sil.org/"; license = licenses.lgpl21; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 410ef47b1bc3d..4d15113f3c9af 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.9.2"; + version = "3.9.4"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-7YW0ylYQMi6D7YyRQGWRv980skjZ2t//QoZb8rRDHGk="; + sha256 = "sha256-iTlIdLNOr1rRBnCwnI34e2RLL18Fmc/kRSMdZcOLp98="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index ab1d9ef50c44d..162bc8395d998 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A small, embeddable multi-platform programming library"; + description = "Small, embeddable multi-platform programming library"; longDescription = '' S-Lang is an interpreted language that was designed from the start to be easily embedded into a program to provide it with a powerful extension diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index c3c5965816f4f..84b21e2c4fa9c 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - description = "The SLIB Portable Scheme Library"; + description = "SLIB Portable Scheme Library"; mainProgram = "slib"; longDescription = '' diff --git a/pkgs/development/libraries/smooth/default.nix b/pkgs/development/libraries/smooth/default.nix index 402500dc9528d..3cb227b12d3fe 100644 --- a/pkgs/development/libraries/smooth/default.nix +++ b/pkgs/development/libraries/smooth/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "The smooth Class Library"; + description = "Smooth Class Library"; mainProgram = "smooth-translator"; license = licenses.artistic2; homepage = "http://www.smooth-project.org/"; diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/development/libraries/snap7/default.nix index f83ee00d04fd1..39cdf6d2b45e2 100644 --- a/pkgs/development/libraries/snap7/default.nix +++ b/pkgs/development/libraries/snap7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchzip, p7zip }: +{ stdenv, lib, fetchzip, p7zip }: stdenv.mkDerivation rec { pname = "snap7"; diff --git a/pkgs/development/libraries/soci/bc-soci.nix b/pkgs/development/libraries/soci/bc-soci.nix index d728d61a8f57e..a3c967d80fe40 100644 --- a/pkgs/development/libraries/soci/bc-soci.nix +++ b/pkgs/development/libraries/soci/bc-soci.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "Database access library for C++. Belledonne Communications' fork for Linphone."; + description = "Database access library for C++. Belledonne Communications' fork for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/external/soci"; license = licenses.boost; platforms = platforms.all; diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 0a7f5ac91eaa9..d73c521997a08 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = "A library passing all socket communications through unix sockets"; + description = "Library passing all socket communications through unix sockets"; homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index fb77eebce1e9c..f8f1af00fe66b 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -55,7 +55,7 @@ gnustep.stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An extensive set of frameworks which form a complete Web application server environment"; + description = "Extensive set of frameworks which form a complete Web application server environment"; license = licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 6ce3ca60c0f59..b04e1fbbf001f 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://drobilla.net/software/sord"; - description = "A lightweight C library for storing RDF data in memory"; + description = "Lightweight C library for storing RDF data in memory"; license = with licenses; [ bsd0 isc ]; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 2778f7ff6f7cd..40179b269efd9 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "A program and library for changing the tempo, pitch and playback rate of audio"; + description = "Program and library for changing the tempo, pitch and playback rate of audio"; homepage = "https://www.surina.net/soundtouch/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 4e155f496ec26..021554c3a1205 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; license = licenses.bsd3; - description = "A GUI binding for using Open Inventor with Xt/Motif"; + description = "GUI binding for using Open Inventor with Xt/Motif"; maintainers = with maintainers; [ tmplt ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/span-lite/default.nix b/pkgs/development/libraries/span-lite/default.nix index 724870e0751cc..d0a3cd15e7bba 100644 --- a/pkgs/development/libraries/span-lite/default.nix +++ b/pkgs/development/libraries/span-lite/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "A C++20-like span for C++98, C++11 and later in a single-file header-only library"; + description = "C++20-like span for C++98, C++11 and later in a single-file header-only library"; homepage = "https://github.com/martinmoene/span-lite"; license = lib.licenses.bsd1; maintainers = with lib.maintainers; [ icewind1991 ]; diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index 9e916273809f0..772388405c49f 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -1,11 +1,4 @@ -{ lib -, stdenv -, fetchFromGitHub -, audiofile -, libtiff -, autoreconfHook -, fetchpatch -, buildPackages +{ fetchFromGitHub , callPackage }: diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix index 0701bf74d2c6e..61439924b749d 100644 --- a/pkgs/development/libraries/spandsp/common.nix +++ b/pkgs/development/libraries/spandsp/common.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; meta = { - description = "A portable and modular SIP User-Agent with audio and video support"; + description = "Portable and modular SIP User-Agent with audio and video support"; homepage = "https://github.com/freeswitch/spandsp"; platforms = with lib.platforms; unix; maintainers = with lib.maintainers; [ misuzu ]; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index cf5e53c3f9117..38e250ddef907 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,11 +1,4 @@ -{ lib -, stdenv -, fetchurl -, audiofile -, libtiff -, buildPackages -, fetchpatch -, autoreconfHook +{ fetchurl , callPackage }: diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index 35208d021b83a..813024623a1a7 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sparsehash/sparsehash"; - description = "An extremely memory-efficient hash_map implementation"; + description = "Extremely memory-efficient hash_map implementation"; platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch b/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch deleted file mode 100644 index 3c3fb50fc1525..0000000000000 --- a/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3f718fc1873c9c138684ea019e9bd42c9b24506c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Tue, 28 Nov 2023 11:28:11 +0100 -Subject: [PATCH] fix setuptools installation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - python/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/Makefile b/python/Makefile -index f835daa..b41995a 100644 ---- a/python/Makefile -+++ b/python/Makefile -@@ -12,7 +12,7 @@ setup_cmd += --root $(DESTDIR) - endif - - ifneq ($(CONFIG_PYDIR),) --setup_cmd += --install-purelib $(CONFIG_PYDIR) -+setup_cmd += --root / --prefix $(CONFIG_PYDIR) - purelibdir := $(CONFIG_PYDIR) - else - purelibdir := $(shell python3 -c "import sysconfig; print(sysconfig.get_paths()['purelib'])") --- -2.42.0 - diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 46ee5600a4daf..4541042ed5c5f 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -4,6 +4,7 @@ , python3 , cunit , dpdk +, fuse3 , libaio , libbsd , libuuid @@ -22,19 +23,22 @@ stdenv.mkDerivation rec { pname = "spdk"; - version = "23.09"; + version = "24.05"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-P10NDa+MIEY8B3bu34Dq2keyuv2a24XV5Wf+Ah701b8="; + sha256 = "sha256-kjZWaarvNSYXseJ/uH7Ak7DbWEgrLnAwXcL8byJ9fjU="; fetchSubmodules = true; }; nativeBuildInputs = [ python3 + python3.pkgs.pip python3.pkgs.setuptools + python3.pkgs.wheel + python3.pkgs.wrapPython pkg-config ensureNewerSourcesForZipFilesHook ]; @@ -42,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ cunit dpdk + fuse3 jansson libaio libbsd @@ -56,10 +61,8 @@ stdenv.mkDerivation rec { zstd ]; - patches = [ - # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 - ./setuptools.patch - ./0001-fix-setuptools-installation.patch + propagatedBuildInputs = [ + python3.pkgs.configshell ]; postPatch = '' @@ -70,13 +73,16 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk}" - "--pydir=${placeholder "out"}" ]; postCheck = '' python3 -m spdk ''; + postFixup = '' + wrapPythonPrograms + ''; + env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling env.NIX_LDFLAGS = "-lbsd"; diff --git a/pkgs/development/libraries/spdk/setuptools.patch b/pkgs/development/libraries/spdk/setuptools.patch deleted file mode 100644 index b3e7644c0076b..0000000000000 --- a/pkgs/development/libraries/spdk/setuptools.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/spectra/default.nix b/pkgs/development/libraries/spectra/default.nix index 1fc3ccd757653..4e4901d6c73da 100644 --- a/pkgs/development/libraries/spectra/default.nix +++ b/pkgs/development/libraries/spectra/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://spectralib.org/"; - description = "A C++ library for large scale eigenvalue problems, built on top of Eigen"; + description = "C++ library for large scale eigenvalue problems, built on top of Eigen"; license = licenses.mpl20; maintainers = with maintainers; [ vonfry ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index cba0e4e76f3f4..9e3f97b034485 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.speex.org/"; - description = "An Open Source/Free Software patent-free audio compression format designed for speech"; + description = "Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix ++ platforms.windows; }; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index b8f8a3bc7c5f9..0f5e09cf83e54 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.speex.org/"; - description = "An Open Source/Free Software patent-free audio compression format designed for speech"; + description = "Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix ++ platforms.windows; }; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index b3e89ae9548e8..af7848cdf85f2 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.7"; + version = "4.6.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-0cPb78CTxrCdDZAY8hyt7Kid5DKszDl1v+6XNKyNrLM="; + hash = "sha256-ds+0ckQiHikNMr4Xf/wCWwQySpadGgnccENd6u6gIzQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index fe39cac8a25f8..f7a870e276209 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, zlib, readline, ncurses +, updateAutotoolsGnuConfigScriptsHook # for tests , python3Packages, sqldiff, sqlite-analyzer, tracker @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; # required for aarch64 but applied for all arches for simplicity @@ -100,7 +102,7 @@ stdenv.mkDerivation rec { meta = with lib; { changelog = "https://www.sqlite.org/releaselog/${lib.replaceStrings [ "." ] [ "_" ] version}.html"; - description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; + description = "Self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = "https://sqlite.org/download.html"; homepage = "https://www.sqlite.org/"; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index d988a71e54e88..0f6fe766a3de3 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -32,14 +32,14 @@ in sqldiff = mkTool { pname = "sqldiff"; makeTarget = "sqldiff"; - description = "A tool that displays the differences between SQLite databases"; + description = "Tool that displays the differences between SQLite databases"; homepage = "https://www.sqlite.org/sqldiff.html"; mainProgram = "sqldiff"; }; sqlite-analyzer = mkTool { pname = "sqlite-analyzer"; makeTarget = "sqlite3_analyzer"; - description = "A tool that shows statistics about SQLite databases"; + description = "Tool that shows statistics about SQLite databases"; homepage = "https://www.sqlite.org/sqlanalyze.html"; mainProgram = "sqlite3_analyzer"; }; diff --git a/pkgs/development/libraries/sregex/default.nix b/pkgs/development/libraries/sregex/default.nix index a4d2ef526db94..f69e09c8873b5 100644 --- a/pkgs/development/libraries/sregex/default.nix +++ b/pkgs/development/libraries/sregex/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/openresty/sregex"; - description = "A non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams"; + description = "Non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams"; mainProgram = "sregex-cli"; license = licenses.bsd3; maintainers = with maintainers; []; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index e848b4330955b..b79020e3ba712 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.clifford.at/stfl/"; - description = "A library which implements a curses-based widget set for text terminals"; + description = "Library which implements a curses-based widget set for text terminals"; maintainers = with lib.maintainers; [ lovek323 ]; license = lib.licenses.lgpl3; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 499532092f026..a11544dd78930 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; + description = "Implementation of the C++ standard template library STL for external memory (out-of-core) computations"; homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index ed0c5a2d87202..188759fc4e7ed 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; meta = with lib; { - description = "A streaming protocol for test results"; + description = "Streaming protocol for test results"; mainProgram = "subunit-diff"; homepage = "https://launchpad.net/subunit"; license = licenses.asl20; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 05b1b996ea3f7..fffe96dbf5c1b 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "An XMPP library for C++, used by the Swift client"; + description = "XMPP library for C++, used by the Swift client"; mainProgram = "swiften-config"; homepage = "http://swift.im/swiften.html"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index cc08b7ff3c2e8..25043bbb0265d 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - hash = "sha256-CwVDpDbx00r7Fys+5r1n0m/E86zTx1i4ti5JCcVp20g="; + hash = "sha256-SfifujR2VM1OlPN0ZRUC3hWImXO/8PuiyrBdpyNoKW4="; }; nativeBuildInputs = [ cmake ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "A fast symbolic manipulation library"; + description = "Fast symbolic manipulation library"; homepage = "https://github.com/symengine/symengine"; platforms = platforms.unix ++ platforms.windows; license = licenses.bsd3; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 66c9863c38a42..16112f32b1e2f 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.t1lib.org/"; - description = "A type 1 font rasterizer library for UNIX/X11"; + description = "Type 1 font rasterizer library for UNIX/X11"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 2efee140a7e3c..0446d2cac6e7d 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { cp -r scenes "$out/share/tachyon/scenes" ''; meta = { - description = "A Parallel / Multiprocessor Ray Tracing System"; + description = "Parallel / Multiprocessor Ray Tracing System"; mainProgram = "tachyon"; license = lib.licenses.bsd3; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index fc3914b26d293..17918f5f43739 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://taglib.org/"; - description = "A library for reading and editing audio file metadata"; + description = "Library for reading and editing audio file metadata"; mainProgram = "taglib-config"; longDescription = '' TagLib is a library for reading and editing the meta-data of several diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 73cb8a65a162d..793fc1ccf5cb5 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -9,6 +9,7 @@ , docbook_xml_dtd_42 , fixDarwinDylibNames , wafHook +, buildPackages }: stdenv.mkDerivation rec { @@ -50,6 +51,9 @@ stdenv.mkDerivation rec { "--enable-talloc-compat1" "--bundled-libraries=NONE" "--builtin-libraries=replace" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; # python-config from build Python gives incorrect values when cross-compiling. diff --git a/pkgs/development/libraries/tbb/2020_3.nix b/pkgs/development/libraries/tbb/2020_3.nix index 55bb9849d9190..dcd21b27ff334 100644 --- a/pkgs/development/libraries/tbb/2020_3.nix +++ b/pkgs/development/libraries/tbb/2020_3.nix @@ -57,8 +57,12 @@ stdenv.mkDerivation rec { ] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.hostPlatform.isAarch64 then "arch=arm64" else if stdenv.hostPlatform.isx86_64 then "arch=intel64" + else if stdenv.hostPlatform.isi686 then "arch=ia32" else throw "Unsupported cross architecture")); + # Fix undefined reference errors with version script under LLVM. + NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; + enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/development/libraries/tbb/2021_5.nix b/pkgs/development/libraries/tbb/2021_5.nix new file mode 100644 index 0000000000000..3bfa9278106d9 --- /dev/null +++ b/pkgs/development/libraries/tbb/2021_5.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tbb"; + version = "2021.5.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "oneTBB"; + rev = "v${version}"; + hash = "sha256-TJ/oSSMvgtKuz7PVyIoFEbBW6EZz7t2wr/kP093HF/w="; + }; + + nativeBuildInputs = [ + cmake + ]; + + patches = [ + # port of https://github.com/oneapi-src/oneTBB/pull/1031 + ./gcc13-fixes-2021.5.0.patch + + (fetchpatch { + # Fix "field used uninitialized" on modern gcc versions (https://github.com/oneapi-src/oneTBB/pull/958) + url = "https://github.com/oneapi-src/oneTBB/commit/3003ec07740703e6aed12b028af20f4b0f16adae.patch"; + hash = "sha256-l4+9IxIEdRX/q8JyDY9CPKWzSLatpIVSiNjmIM7ilj0="; + }) + ]; + + # Disable failing test on musl + # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace test/CMakeLists.txt \ + --replace-fail 'conformance_resumable_tasks' "" + ''; + + # 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=array-bounds" "-Wno-error=stringop-overflow" "-Wno-address" ] ++ + # 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" ]; + + # Fix undefined reference errors with version script under LLVM. + NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; + + + meta = with lib; { + description = "Intel Thread Building Blocks C++ Library"; + homepage = "http://threadingbuildingblocks.org/"; + license = licenses.asl20; + longDescription = '' + Intel Threading Building Blocks offers a rich and complete approach to + expressing parallelism in a C++ program. It is a library that helps you + take advantage of multi-core processor performance without having to be a + threading expert. Intel TBB is not just a threads-replacement library. It + represents a higher-level, task-based parallelism that abstracts platform + details and threading mechanisms for scalability and performance. + ''; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice tmarkus ]; + }; +} diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index c02a9ed49577e..73ea56b306869 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { # https://gcc.gnu.org/PR108854 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + # Fix undefined reference errors with version script under LLVM. + NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; + # Disable failing test on musl # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch b/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch new file mode 100644 index 0000000000000..28b5a0e695f70 --- /dev/null +++ b/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch @@ -0,0 +1,13 @@ +diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h +index 33bc8ab4..a3d21baf 100644 +--- a/test/common/utils_assert.h ++++ b/test/common/utils_assert.h +@@ -20,6 +20,8 @@ + #include "config.h" + #include "utils_report.h" + ++#include <cstdlib> ++ + #define REPORT_FATAL_ERROR REPORT + + namespace utils { diff --git a/pkgs/development/libraries/tbox/default.nix b/pkgs/development/libraries/tbox/default.nix index 6f65ded6f104b..b2406d19e7017 100644 --- a/pkgs/development/libraries/tbox/default.nix +++ b/pkgs/development/libraries/tbox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A glib-like multi-platform c library"; + description = "Glib-like multi-platform c library"; homepage = "https://docs.tboox.org"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index a0a1c0ae53ccd..dbc095b64e0ba 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -17,7 +17,7 @@ tcl.mkTclDerivation rec { meta = { homepage = "https://core.tcl-lang.org/tcltls/index"; - description = "An OpenSSL / RSA-bsafe Tcl extension"; + description = "OpenSSL / RSA-bsafe Tcl extension"; maintainers = [ lib.maintainers.agbrooks ]; license = lib.licenses.tcltk; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 1a289f7c2d618..d78f4abafab00 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -2,6 +2,7 @@ , fetchurl , pkg-config , wafHook +, buildPackages , python3 , readline , libxslt @@ -46,6 +47,9 @@ stdenv.mkDerivation rec { wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; postFixup = if stdenv.isDarwin @@ -58,7 +62,7 @@ stdenv.mkDerivation rec { PYTHON_CONFIG = "/invalid"; meta = with lib; { - description = "The trivial database"; + description = "Trivial database"; longDescription = '' TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB except that it allows multiple simultaneous writers diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 0d60f0412267c..7564d33636f16 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.28"; + version = "1.8.30"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation { # 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 = "38d31da77a72619cf7ec5d479338a48274cc7446"; - hash = "sha256-y6Gt8gDfvIBJd/2O4vTs38DzAPyL9pAZBbrf2qcv9cY="; + rev = "fab354add5a257a8121a4a7f1ff6b1b9fa9a9073"; + hash = "sha256-fyAWfAG/zLf3XTlgHnrIAShS4wo6hGIwu46k5TL6Zoo="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 71960010d56da..a8dfade71bfdc 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A library for template expansion which supports calling into GObject Introspection from templates"; + description = "Library for template expansion which supports calling into GObject Introspection from templates"; homepage = "https://gitlab.gnome.org/GNOME/template-glib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 18e4522de9ea2..c9f03ee0555f2 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -10,6 +10,7 @@ , docbook_xml_dtd_42 , which , wafHook +, buildPackages , libxcrypt }: @@ -52,6 +53,9 @@ stdenv.mkDerivation rec { wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; # python-config from build Python gives incorrect values when cross-compiling. @@ -60,7 +64,7 @@ stdenv.mkDerivation rec { PYTHON_CONFIG = "/invalid"; meta = with lib; { - description = "An event system based on the talloc memory management library"; + description = "Event system based on the talloc memory management library"; homepage = "https://tevent.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 3d39075dd26ad..e053814dddd96 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A C library for property-based testing"; + description = "C library for property-based testing"; homepage = "https://github.com/silentbicycle/theft/"; platforms = platforms.unix; license = licenses.isc; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index c12178d833de4..9f22ae65d28cd 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sourceforge.net/projects/libtirpc/"; - description = "The transport-independent Sun RPC implementation (TI-RPC)"; + description = "Transport-independent Sun RPC implementation (TI-RPC)"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index aa54616cf42a6..e00eaf632e973 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - description = "A program that can validate your HTML, as well as modify it to be more clean and standard"; + description = "Program that can validate your HTML, as well as modify it to be more clean and standard"; mainProgram = "tidyp"; homepage = "http://tidyp.com/"; platforms = platforms.all; diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/development/libraries/timezonemap/default.nix index 25efaa6518c61..f2ceb056f25a8 100644 --- a/pkgs/development/libraries/timezonemap/default.nix +++ b/pkgs/development/libraries/timezonemap/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://launchpad.net/timezonemap"; - description = "A GTK+3 Timezone Map Widget"; + description = "GTK+3 Timezone Map Widget"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.mkg20001 ]; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index a46b2499964c3..0a6adbb5882a0 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -54,7 +54,7 @@ tcl.mkTclDerivation { ]; meta = with lib; { - description = "A widget library for Tcl/Tk"; + description = "Widget library for Tcl/Tk"; homepage = "https://tix.sourceforge.net/"; platforms = platforms.all; license = with licenses; [ diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index fbf4560517547..c5317a8545dd5 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -2,7 +2,6 @@ , stdenv , callPackage , fetchurl -, fetchpatch , tcl , ... } @ args: diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 57a9b617d950d..540f5d5d7e367 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -65,7 +65,7 @@ tcl.mkTclDerivation { }; meta = with lib; { - description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; + description = "Widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; homepage = "https://www.tcl.tk/"; license = licenses.tcltk; platforms = platforms.all; diff --git a/pkgs/development/libraries/tkimg/default.nix b/pkgs/development/libraries/tkimg/default.nix index 90970a45602a2..8b66e195d5a5e 100644 --- a/pkgs/development/libraries/tkimg/default.nix +++ b/pkgs/development/libraries/tkimg/default.nix @@ -22,7 +22,7 @@ tcl.mkTclDerivation rec { meta = { homepage = "https://sourceforge.net/projects/tkimg/"; - description = "The Img package adds several image formats to Tcl/Tk"; + description = "Img package adds several image formats to Tcl/Tk"; maintainers = with lib.maintainers; [ matthewcroughan ]; license = lib.licenses.bsd3; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index 1d57c8164c03e..6470924a9ce21 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.29"; + version = "1.0.31"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-q6q9b8iaGe2KICrDcRvDsHY9kovDqO7upzo2effn95A="; + hash = "sha256-7FdHglIBTHGKRt66WNTGEe5qUcrIyTYPrnuVrUc8l08="; }; postPatch = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = false; # memory intensive meta = with lib; { - description = "A set of implementations of DBM"; + description = "Set of implementations of DBM"; homepage = "https://dbmx.net/tkrzw/"; maintainers = with maintainers; [ ehmry ]; license = licenses.asl20; diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix index e24ceec58c075..3f95d5682f9e0 100644 --- a/pkgs/development/libraries/toml-f/default.nix +++ b/pkgs/development/libraries/toml-f/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - doCheck = true; + # tftest-build fails on aarch64-linux + doCheck = !stdenv.isAarch64; meta = with lib; { description = "TOML parser implementation for data serialization and deserialization in Fortran"; diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 354ab06d26b23..b28d031be83ad 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "4.1.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - hash = "sha256-paqTQ7DQI0Nd8q0qUPRa2UZ/oE5nrVEq5KUiG8hRXuQ="; + hash = "sha256-BP28utEUI9g1VNv3lCXuiKrDtEImFQxxZfIjLiE3Wr8="; }; outputs = [ "out" "man" "dev" ]; diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix index 257b966808d20..131cf2194ae85 100644 --- a/pkgs/development/libraries/tweeny/default.nix +++ b/pkgs/development/libraries/tweeny/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; meta = with lib; { - description = "A modern C++ tweening library"; + description = "Modern C++ tweening library"; license = licenses.mit; homepage = "http://mobius3.github.io/tweeny"; maintainers = [ maintainers.doronbehar ]; diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index e81e47e094aac..eba2fdfe81c5c 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found" meta = with lib;{ - description = "A MP2 encoder"; + description = "MP2 encoder"; mainProgram = "twolame"; longDescription = '' TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 71a1b2a2001f4..464ea6e374c37 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "sha256-dihWwGlQclfa2ke+1V5c6coqfFjjuMyI8QRzNdx33zQ="; + sha256 = "sha256-Qd3c51LeF04haZA4wK6loNZwX2a3ju+ljwdPYPoUKCQ="; }; outputs = [ "out" "doc" "dev" ]; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 17efccce82a97..48ffb94175f98 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.unidata.ucar.edu/software/udunits/"; - description = "A C-based package for the programatic handling of units of physical quantities"; + description = "C-based package for the programatic handling of units of physical quantities"; longDescription = '' The UDUNITS package supports units of physical quantities. Its C library provides for arithmetic manipulation of units and for conversion of diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 61f7242b5d8c4..f606bdde14c28 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - description = "A wrapper for the user, group and hosts NSS API"; + description = "Wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 2d543f5a5364f..b7926eecb4f24 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -2,7 +2,6 @@ , lib , docbook-xsl-nons , fetchurl -, fetchpatch , glib , gobject-introspection , gtk-doc @@ -22,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.18.1"; + version = "0.18.2"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZRtoaQM7sUiBNu1zxY6SRfWwGFYmHhzqBBAwuD+x7Xw="; + hash = "sha256-1HKV6IA8bWfgdgMcIlgeP470aIAj1I925ed2qM7IkHM="; }; patches = [ diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 332b2deddf783..f2e2e27b35d7c 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with lib; { - description = "A very basic terminfo library"; + description = "Very basic terminfo library"; license = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/updfparser/default.nix b/pkgs/development/libraries/updfparser/default.nix index aa25f9f2dffdd..6eb4e65e657ae 100644 --- a/pkgs/development/libraries/updfparser/default.nix +++ b/pkgs/development/libraries/updfparser/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A very simple PDF parser"; + description = "Very simple PDF parser"; homepage = "https://indefero.soutade.fr/p/updfparser"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ autumnal ]; diff --git a/pkgs/development/libraries/urdfdom-headers/default.nix b/pkgs/development/libraries/urdfdom-headers/default.nix index 138597ad89a61..7809355cb3015 100644 --- a/pkgs/development/libraries/urdfdom-headers/default.nix +++ b/pkgs/development/libraries/urdfdom-headers/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "urdfdom-headers"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "ros"; repo = "urdfdom_headers"; rev = version; - hash = "sha256-ry5wDMRxR7TtupUghe9t1XP0XMvWKiOesO5RFHPrSdI="; + hash = "sha256-FQSnYuTc40MOxyFsMPfoCIonP+4AUQxdq74eoQ9tOoo="; }; patches = [ # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom_headers/pull/66) (fetchpatch { - url = "https://github.com/ros/urdfdom_headers/commit/c9c993147bbf18d5ec83bae684c5780281e529b4.patch"; - hash = "sha256-BnYPdcetYSim2O1R38N0d1tY0Id++AgKNic8+dlM6Vg="; + url = "https://github.com/ros/urdfdom_headers/commit/6e0cea148c3a7123f8367cd48d5709a4490c32f1.patch"; + hash = "sha256-LC2TACGma/k6+WE9fTkzY98SgJYKsVuj5O9v84Q5mQ4="; }) ]; diff --git a/pkgs/development/libraries/urdfdom/default.nix b/pkgs/development/libraries/urdfdom/default.nix index 6e59914044fc0..f26162ac8c83b 100644 --- a/pkgs/development/libraries/urdfdom/default.nix +++ b/pkgs/development/libraries/urdfdom/default.nix @@ -1,27 +1,28 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, validatePkgConfig -, urdfdom-headers, console-bridge, tinyxml }: +, tinyxml-2, console-bridge, urdfdom-headers }: stdenv.mkDerivation rec { pname = "urdfdom"; - version = "3.1.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "ros"; repo = pname; rev = version; - hash = "sha256-UdkGJAXK3Q8QJaqMZBA5/FKUgWq9EVeqkqwVewTlTD8="; + hash = "sha256-t1ff5aRHE7LuQdCXuooWPDUgPWjyYyQmQUB1RJmte1w="; }; patches = [ # Fix CMake relative install dir assumptions (https://github.com/ros/urdfdom/pull/142) (fetchpatch { - url = "https://github.com/ros/urdfdom/commit/cbe6884d267779463bb444be851f6404e692cc0a.patch"; - hash = "sha256-1gTRKIGqiSRion76bGecSfFJSBskYUJguUIa6ePIiX4="; + url = "https://github.com/ros/urdfdom/commit/61a7e35cd5abece97259e76aed8504052b2f5b53.patch"; + hash = "sha256-b3bEbbaSUDkwTEHJ8gVPEb+AR/zuWwLqiAW5g1T1dPU="; }) ]; nativeBuildInputs = [ cmake pkg-config validatePkgConfig ]; - propagatedBuildInputs = [ urdfdom-headers console-bridge tinyxml ]; + buildInputs = [ tinyxml-2 console-bridge ]; + propagatedBuildInputs = [ urdfdom-headers ]; meta = with lib; { description = "Provides core data structures and a simple XML parser for populating the class data structures from an URDF file"; diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix index 9723f887b82b9..8b172ebb45d7e 100644 --- a/pkgs/development/libraries/usrsctp/default.nix +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sctplab/usrsctp"; - description = "A portable SCTP userland stack"; + description = "Portable SCTP userland stack"; maintainers = with maintainers; [ misuzu ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 7bdb9747472b0..f248d6d972255 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A clean C library for processing UTF-8 Unicode data"; + description = "Clean C library for processing UTF-8 Unicode data"; homepage = "https://juliastrings.github.io/utf8proc/"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index f697e8c7a125b..98c5200fcc2c6 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A hash table for C structures"; + description = "Hash table for C structures"; homepage = "http://troydhanson.github.io/uthash"; license = licenses.bsd2; # it's one-clause, actually, as it's source-only platforms = platforms.all; diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/development/libraries/uthenticode/default.nix index 68a896d136499..e8d08745de8f2 100644 --- a/pkgs/development/libraries/uthenticode/default.nix +++ b/pkgs/development/libraries/uthenticode/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { checkPhase = "test/uthenticode_test"; meta = with lib; { - description = "A small cross-platform library for verifying Authenticode digital signatures."; + description = "Small cross-platform library for verifying Authenticode digital signatures"; homepage = "https://github.com/trailofbits/uthenticode"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 0eb3bda4286da..9320fe34bb64a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub +{ stdenv, lib, fetchgit , gn, ninja, python3, glib, pkg-config, icu , xcbuild, darwin , fetchpatch @@ -190,5 +190,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; + knownVulnerabilities = [ "Severely outdated with multiple publicly known vulnerabilities" ]; }; } diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 54d9bad1644f7..8ddc1d88fe443 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ]; meta = with lib; { - description = "A set of filters for motion estimation and compensation"; + description = "Set of filters for motion estimation and compensation"; homepage = "https://github.com/dubhater/vapoursynth-mvtools"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 242294462ed6b..bf21723875bf8 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix - description = "A video processing framework with the future in mind"; + description = "Video processing framework with the future in mind"; homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 02b202365b9bf..6eb3c3db64278 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.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "sha256-tbHDGbul68blBAvok17oz7AfhHpEY9Y7RIEsqCQvOJ0="; + sha256 = "sha256-A2qUzjXv50unFcoZp2nRVinkph+CoHyiU7AgOphDphM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/development/libraries/vectorscan/default.nix index e9724ced0c70f..835db0f3566b7 100644 --- a/pkgs/development/libraries/vectorscan/default.nix +++ b/pkgs/development/libraries/vectorscan/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A portable fork of the high-performance regular expression matching library"; + description = "Portable fork of the high-performance regular expression matching library"; longDescription = '' A fork of Intel's Hyperscan, modified to run on more platforms. Currently ARM NEON/ASIMD is 100% functional, and Power VSX are in development. diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 5a28ad3822363..f0e844360cca7 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; + description = "Virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering"; mainProgram = "virgl_test_server"; homepage = "https://virgil3d.github.io/"; license = licenses.mit; diff --git a/pkgs/development/libraries/virtualpg/default.nix b/pkgs/development/libraries/virtualpg/default.nix index 277ca47d66e34..d9778decd129e 100644 --- a/pkgs/development/libraries/virtualpg/default.nix +++ b/pkgs/development/libraries/virtualpg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, validatePkgConfig, postgresql, sqlite }: +{ lib, stdenv, fetchurl, validatePkgConfig, postgresql, sqlite, darwin }: stdenv.mkDerivation rec { pname = "virtualpg"; @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { postgresql # for pg_config ]; - buildInputs = [ postgresql sqlite ]; + buildInputs = [ postgresql sqlite ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; meta = with lib; { description = "Loadable dynamic extension to both SQLite and SpatiaLite"; diff --git a/pkgs/development/libraries/vkd3d/default.nix b/pkgs/development/libraries/vkd3d/default.nix deleted file mode 100644 index 087a56df970fa..0000000000000 --- a/pkgs/development/libraries/vkd3d/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, wine, flex, bison -, vulkan-headers, spirv-headers, vulkan-loader }: - -stdenv.mkDerivation rec { - pname = "vkd3d"; - version = "1.10"; - - nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; - buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; - - src = fetchFromGitLab { - domain = "gitlab.winehq.org"; - owner = "wine"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-/5tc8agqpRbFRnfv8O1fBo2SPNOuO6exs0BZ9MnOTA0="; - }; - - meta = with lib; { - homepage = "https://gitlab.winehq.org/wine/vkd3d"; - description = "A 3D graphics library with an API very similar, but not identical, to Direct3D 12"; - license = licenses.lgpl21; - maintainers = with maintainers; [ expipiplus1 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 921284bca4814..11df1a495f02f 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; - description = "A vector and matrix math library implemented using C++ templates"; + description = "Vector and matrix math library implemented using C++ templates"; longDescription = ''vmmlib is a vector and matrix math library implemented using C++ templates. Its basic functionality includes a vector diff --git a/pkgs/development/libraries/volk/2.5.0.nix b/pkgs/development/libraries/volk/2.5.0.nix index 35216cb7e31c2..3e15993efc39f 100644 --- a/pkgs/development/libraries/volk/2.5.0.nix +++ b/pkgs/development/libraries/volk/2.5.0.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://libvolk.org/"; - description = "The Vector Optimized Library of Kernels"; + description = "Vector Optimized Library of Kernels"; license = licenses.gpl3Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 02240ac1febff..caf3c848a1ed8 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://libvolk.org/"; - description = "The Vector Optimized Library of Kernels"; + description = "Vector Optimized Library of Kernels"; license = licenses.gpl3Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index e6aa378d01e58..ea40b8a27da63 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 1 tests, needs `certutil` meta = with lib; { - description = "A library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool"; + description = "Library for manipulating storage volume encryption keys and storing them separately from volumes to handle forgotten passphrases, and the associated command-line tool"; mainProgram = "volume_key"; homepage = "https://pagure.io/volume_key/"; license = licenses.gpl2; diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix index b4a2f9a388f19..f6ab54dba0304 100644 --- a/pkgs/development/libraries/vrb/default.nix +++ b/pkgs/development/libraries/vrb/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A virtual ring buffer library written in C"; + description = "Virtual ring buffer library written in C"; mainProgram = "vbuf"; license = licenses.lgpl21; homepage = "http://vrb.sourceforge.net/"; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 89af6e847a887..87cf27f70fd47 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.76.1"; + version = "0.76.3"; outputs = [ "out" "dev" ] ++ lib.optional (gtkVersion != null) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-CE6D73ZXdCaaSynfl8oi7cNDuaHYFDPTALjLLQh6HsI="; + hash = "sha256-9njpTAVvN3/QAhIUrf9UUMsXLpoIsWCREYHd/3t9XWA="; }; patches = [ @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://www.gnome.org/"; - description = "A library implementing a terminal emulator widget for GTK"; + description = "Library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for GTK, and a minimal sample application (vte) using that. Vte is diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 81793528e84de..769cdb95908dd 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ vulkan-headers ]; meta = with lib; { - description = "A set of utility libraries for Vulkan"; + description = "Set of utility libraries for Vulkan"; homepage = "https://github.com/KhronosGroup/Vulkan-Utility-Libraries"; platforms = platforms.all; license = licenses.asl20; diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 6867f9da410ef..9f8d4e914b71e 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime"; + description = "Cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime"; mainProgram = "wflinfo"; homepage = "https://www.waffle-gl.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index 080bfb4d018c6..e90d05318eac4 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "An open-source C++ networking library"; + description = "Open-source C++ networking library"; longDescription = '' Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and diff --git a/pkgs/development/libraries/wapp/default.nix b/pkgs/development/libraries/wapp/default.nix index 8c414a28f1226..fd98f419da9af 100644 --- a/pkgs/development/libraries/wapp/default.nix +++ b/pkgs/development/libraries/wapp/default.nix @@ -25,7 +25,7 @@ tcl.mkTclDerivation { meta = with lib; { homepage = "https://wapp.tcl-lang.org/home/doc/trunk/README.md"; - description = "A framework for writing web applications in Tcl"; + description = "Framework for writing web applications in Tcl"; license = licenses.bsd2; maintainers = with maintainers; [ nat-418 ]; }; diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix index d8522e1f64ff7..1cc5332cf777c 100644 --- a/pkgs/development/libraries/waylib/default.nix +++ b/pkgs/development/libraries/waylib/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "bin" ]; meta = { - description = "A wrapper for wlroots based on Qt"; + description = "Wrapper for wlroots based on Qt"; homepage = "https://github.com/vioken/waylib"; license = with lib.licenses; [ gpl3Only lgpl3Only asl20 ]; outputsToInstall = [ "out" ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index cbe910b4469ed..98c28ca67997d 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -48,6 +48,8 @@ , lcms2 , libmanette , geoclue2 +, flite +, openssl , sqlite , gst-plugins-base , gst-plugins-bad @@ -62,6 +64,7 @@ , unifdef , addOpenGLRunpath , enableGeoLocation ? true +, enableExperimental ? false , withLibsecret ? true , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , testers @@ -165,6 +168,9 @@ stdenv.mkDerivation (finalAttrs: { systemd ] ++ lib.optionals enableGeoLocation [ geoclue2 + ] ++ lib.optionals enableExperimental [ + flite + openssl ] ++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [ @@ -184,6 +190,7 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_LIBHYPHEN=OFF" "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" + "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}" ] ++ lib.optionals stdenv.isLinux [ # Have to be explicitly specified when cross. # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353 diff --git a/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/pkgs/development/libraries/webp-pixbuf-loader/default.nix index b3f4e4d483901..78496c0e919e3 100644 --- a/pkgs/development/libraries/webp-pixbuf-loader/default.nix +++ b/pkgs/development/libraries/webp-pixbuf-loader/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { GDK_PIXBUF_MODULEDIR="$out/${moduleDir}" \ gdk-pixbuf-query-loaders --update-cache + # gdk-pixbuf disables the thumbnailer in cross-builds (https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/fc37708313a5fc52083cf10c9326f3509d67701f) + # and therefore makeWrapper will fail because 'gdk-pixbuf-thumbnailer' the executable does not exist. + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment. # So we replace it with a wrapped executable. mkdir -p "$out/bin" diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix index b7887bce3e1b2..3ac5e2bd4adc9 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 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"; + description = "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/v0.3.1/webrtc/typedefs.h # + our patches diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b400893067353..b25ea77b44b46 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { 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"; + description = "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.arm ++ platforms.aarch64 ++ platforms.mips ++ platforms.power ++ platforms.riscv ++ platforms.x86); diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index f62a4661a9949..10fb01d86d415 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -97,7 +97,7 @@ let passthru.tests.tinywl = nixosTests.tinywl; meta = { - description = "A modular Wayland compositor library"; + description = "Modular Wayland compositor library"; longDescription = '' Pluggable, composable, unopinionated modules for building a Wayland compositor; or about 50,000 lines of code you were going to write anyway. diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 76a07212c7855..cfd6b99412a14 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; + description = "Small, fast, portable implementation of TLS/SSL for embedded devices"; mainProgram = "wolfssl-config"; homepage = "https://www.wolfssl.com/"; changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${finalAttrs.version}-stable"; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 8519cbaacc246..d14a77a67004e 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "wxSVG"; - version = "1.5.24"; + version = "1.5.25"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/wxsvg-${version}.tar.bz2"; - hash = "sha256-rkcykfjQpf6voGzScMgmxr6tS86yud1vzs8tt8JeJII="; + hash = "sha256-W/asaDG1S9Ga70jN6PoFctu2PzCu6dUyP2vms/MmU0s="; }; postPatch = '' @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wxsvg.sourceforge.net/"; - description = "A SVG manipulation library built with wxWidgets"; + description = "SVG manipulation library built with wxWidgets"; mainProgram = "svgview"; longDescription = '' wxSVG is C++ library to create, manipulate and render Scalable Vector diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 447e2fa879bf1..b968af23c0dad 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.10"; + version = "4.9.11"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-L7GpDAqx7hF/PBLy6h10pAydpjaJU3JFgTZ2bJhZtG0="; + hash = "sha256-aX1YU35ATL+f18tGIba6cgNYZvYm3TshHsN7RFD+vI4="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; - description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; + description = "C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; license = with licenses; [ lgpl3Plus gpl3Plus ]; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 3bb7729f7db0e..aece1eb09cfff 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A simple SQLite database browser built with wxWidgets"; + description = "Simple SQLite database browser built with wxWidgets"; mainProgram = "wxsqliteplus"; homepage = "https://github.com/guanlisheng/wxsqliteplus"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 13052747eb5ea..be0c45c701dc8 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.wxwidgets.org/"; - description = "A Cross-Platform C++ GUI Library"; + description = "Cross-Platform C++ GUI Library"; longDescription = '' wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 3094f253a01ab..1eb1ede66cb09 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -51,23 +51,15 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-YkV150sDsfBEHvHne0GF6i8Y5881NrByPkLtPAmb24E="; + hash = "sha256-ibkXs693xO+z3JuMvlG4b/+A8f4Lf5TYqdDa67fb9ck="; }; - patches = [ - (fetchpatch { - name = "avoid_gtk3_crash.patch"; - url = "https://github.com/wxWidgets/wxWidgets/commit/8ea22b5e92bf46add0b20059f6e39a938858ff97.patch"; - hash = "sha256-zAyqVTdej4F3R7vVMLiKkXqJTAHDtGYJnyjaRyDmMOM="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -149,7 +141,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.wxwidgets.org/"; - description = "A Cross-Platform C++ GUI Library"; + description = "Cross-Platform C++ GUI Library"; longDescription = '' wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 707f819f13290..ccf914b46ee1e 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://xalan.apache.org/"; - description = "A XSLT processor for transforming XML documents"; + description = "XSLT processor for transforming XML documents"; mainProgram = "Xalan"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index 1286b5e2157cc..41710d5ca3dcc 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - hash = "sha256-ANU3suG62G0M5ZUWaNcwD4ot/EYSK7236zGVQZIjjuE="; + hash = "sha256-QfuetGPY6u4OhFiE5/CoVEpdODWnd1PHWBtM3ymsZ98="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index e28ea0da6b0a7..00af282c5277b 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -19,13 +19,13 @@ , webp-pixbuf-loader }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-gnome"; - version = "46.1"; + version = "46.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-fo2WI+nZaonAiXYWgnzUQdzygykn048TXHIlUrEXKqE="; + url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz"; + hash = "sha256-tcZeol6Eg1AtAzphO+bca3GIOsB/Gj5HStGAScR9FtY="; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "xdg-desktop-portal-gnome"; }; }; @@ -75,4 +75,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl21Plus; }; -} +}) diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index d614627a07493..6f5cac6983c34 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -8,19 +8,20 @@ , cinnamon , glib , gsettings-desktop-schemas +, gtk3 , mate , xdg-desktop-portal }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-Zz44PCociYhUuHTS3HJNxJPCkiIl01FFe4//7jtgDsk="; + hash = "sha256-ujfXZfBXr3T4e8+bIfkvdvBnEQfW7oPByaiXg/SBwJY="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { cinnamon.cinnamon-desktop # org.cinnamon.desktop.background glib gsettings-desktop-schemas # org.gnome.system.location + gtk3 mate.mate-desktop # org.mate.background xdg-desktop-portal ]; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 0018a73341e31..e5432430cac3e 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -2,6 +2,7 @@ , stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , gtest , doCheck ? true @@ -27,11 +28,12 @@ let # This ensures xgboost gets the correct libstdc++ when # built with cuda support. This may be removed once # #226165 rewrites cudaStdenv - inherit (cudaPackages) backendStdenv; - stdenv = if cudaSupport then backendStdenv else inputs.stdenv; + effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; + # Ensures we don't use the stdenv value by accident. + stdenv = builtins.throw "Use effectiveStdenv instead of stdenv in xgboost derivation."; in -stdenv.mkDerivation rec { +effectiveStdenv.mkDerivation rec { pnameBase = "xgboost"; # prefix with r when building the R library # The R package build results in a special xgboost.so file @@ -56,8 +58,16 @@ stdenv.mkDerivation rec { hash = "sha256-LWco3A6zwdnAf8blU4qjW7PFEeZaTcJlVTwVrs7nwWM="; }; + patches = lib.optionals (cudaSupport && cudaPackages.cudaMajorMinorVersion == "12.4") [ + (fetchpatch { # https://github.com/dmlc/xgboost/pull/10123 + name = "Fix compilation with the ctk 12.4."; + url = "https://github.com/dmlc/xgboost/commit/c760f85db0bc7bd6379901fbfb67ceccc2b37700.patch"; + hash = "sha256-iP9mll9pg8T2ztCR7dBPnLP17/x3ImJFrr5G3e2dqHo="; + }) + ]; + nativeBuildInputs = [ cmake ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals effectiveStdenv.isDarwin [ llvmPackages.openmp ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ] ++ lib.optionals rLibrary [ R ]; @@ -75,13 +85,9 @@ stdenv.mkDerivation rec { "-DUSE_CUDA=ON" # Their CMakeLists.txt does not respect CUDA_HOST_COMPILER, instead using the CXX compiler. # https://github.com/dmlc/xgboost/blob/ccf43d4ba0a94e2f0a3cc5a526197539ae46f410/CMakeLists.txt#L145 - "-DCMAKE_C_COMPILER=${cudaPackages.backendStdenv.cc}/bin/gcc" - "-DCMAKE_CXX_COMPILER=${cudaPackages.backendStdenv.cc}/bin/g++" - ] ++ lib.optionals - (cudaSupport - && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") - [ "-DBUILD_WITH_CUDA_CUB=ON" ] - ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] + "-DCMAKE_C_COMPILER=${effectiveStdenv.cc}/bin/gcc" + "-DCMAKE_CXX_COMPILER=${effectiveStdenv.cc}/bin/g++" + ] ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ] ++ lib.optionals rLibrary [ "-DR_LIB=ON" ]; preConfigure = lib.optionals rLibrary '' @@ -104,7 +110,7 @@ stdenv.mkDerivation rec { GTEST_FILTER = let # Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456 - filteredTests = lib.optionals stdenv.hostPlatform.isDarwin [ + filteredTests = lib.optionals effectiveStdenv.hostPlatform.isDarwin [ "ThreadGroup.TimerThread" "ThreadGroup.TimerThreadSimple" ]; @@ -112,8 +118,7 @@ stdenv.mkDerivation rec { "-${builtins.concatStringsSep ":" filteredTests}"; installPhase = - let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; - in '' + '' runHook preInstall '' # the R library option builds a completely different binary xgboost.so instead of @@ -137,6 +142,7 @@ stdenv.mkDerivation rec { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; + broken = cudaSupport && cudaPackages.cudaOlder "11.4"; license = licenses.asl20; mainProgram = "xgboost"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 6e002a28543f3..af73a81fcb20d 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - description = "A lightweight RPC library based on XML and HTTP"; + description = "Lightweight RPC library based on XML and HTTP"; homepage = "https://xmlrpc-c.sourceforge.net/"; # <xmlrpc-c>/doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 8096b2edd295f..dd50c68574c4d 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.codesynthesis.com/products/xsd"; - description = "An open-source, cross-platform W3C XML Schema to C++ data binding compiler"; + description = "Open-source, cross-platform W3C XML Schema to C++ data binding compiler"; mainProgram = "xsd"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index d775cef4d6734..019b3afbefc84 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -1,39 +1,31 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doctest }: stdenv.mkDerivation (finalAttrs: { pname = "xsimd"; - version = "12.1.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; rev = finalAttrs.version; - hash = "sha256-ofUFieeRtpnzNv3Ad5oYwKWb2XcqQHoj601TIhydJyI="; + hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE="; }; patches = [ - # Ideally, Accelerate/Accelerate.h should be used for this implementation, - # but it doesn't work... Needs a Darwin user to debug this. We apply this - # patch unconditionally, because the #if macros make sure it doesn't - # interfer with the Linux implementations. - ./fix-darwin-exp10-implementation.patch + # Fix of https://github.com/xtensor-stack/xsimd/pull/1024 for + # https://github.com/xtensor-stack/xsimd/issues/456 and + # https://github.com/xtensor-stack/xsimd/issues/807, + (fetchpatch { + url = "https://github.com/xtensor-stack/xsimd/commit/c8a87ed6e04b6782f48f94713adfb0cad6c11ddf.patch"; + hash = "sha256-2/FvBGdqTPcayD7rdHPSzL+F8IYKAfMW0WBJ0cW9EZ0="; + }) ] ++ lib.optionals stdenv.isDarwin [ - # https://github.com/xtensor-stack/xsimd/issues/807 - ./disable-test_error_gamma-test.patch - ] ++ lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ - # - Darwin report: https://github.com/xtensor-stack/xsimd/issues/917 - # - Musl report: https://github.com/xtensor-stack/xsimd/issues/798 - ./disable-exp10-test.patch - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # https://github.com/xtensor-stack/xsimd/issues/798 - ./disable-polar-test.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - # Fix suggested here: https://github.com/xtensor-stack/xsimd/issues/798#issuecomment-1356884601 - # Upstream didn't merge that from some reason. - ./fix-atan-test.patch + # https://github.com/xtensor-stack/xsimd/issues/1030 + ./disable-test_error_gamma.patch ]; nativeBuildInputs = [ @@ -41,7 +33,9 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DBUILD_TESTS=${if (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" + # Always build the tests, even if not running them, because testing whether + # they can be built is a test in itself. + "-DBUILD_TESTS=ON" ]; doCheck = true; diff --git a/pkgs/development/libraries/xsimd/disable-exp10-test.patch b/pkgs/development/libraries/xsimd/disable-exp10-test.patch deleted file mode 100644 index 8d2940c3b080b..0000000000000 --- a/pkgs/development/libraries/xsimd/disable-exp10-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 87433035c70578507e08565723c99158290f2488 -Author: Doron Behar <doron.behar@gmail.com> -Date: Tue Aug 1 13:26:04 2023 +0300 - - Darwin & Musl: Disable failing exp10 test - ---- a/test/test_xsimd_api.cpp -+++ b/test/test_xsimd_api.cpp -@@ -515,15 +515,6 @@ struct xsimd_api_float_types_functions - value_type val(2); - CHECK_EQ(extract(xsimd::exp(T(val))), std::exp(val)); - } -- void test_exp10() -- { -- value_type val(2); --#ifdef EMSCRIPTEN -- CHECK_EQ(extract(xsimd::exp10(T(val))), doctest::Approx(std::pow(value_type(10), val))); --#else -- CHECK_EQ(extract(xsimd::exp10(T(val))), std::pow(value_type(10), val)); --#endif -- } - void test_exp2() - { - value_type val(2); -@@ -813,11 +804,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) - Test.test_exp(); - } - -- SUBCASE("exp10") -- { -- Test.test_exp10(); -- } -- - SUBCASE("exp2") - { - Test.test_exp2(); diff --git a/pkgs/development/libraries/xsimd/disable-polar-test.patch b/pkgs/development/libraries/xsimd/disable-polar-test.patch deleted file mode 100644 index 91128f43c2d5c..0000000000000 --- a/pkgs/development/libraries/xsimd/disable-polar-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 9374b88b97911d9c6e19d5e764e25183cd45d534 -Author: Doron Behar <doron.behar@gmail.com> -Date: Tue Aug 1 13:29:16 2023 +0300 - - aarch64-Darwin: Disable failing polar test - ---- a/test/test_xsimd_api.cpp -+++ b/test/test_xsimd_api.cpp -@@ -661,17 +661,6 @@ struct xsimd_api_float_types_functions - value_type val1(4); - CHECK_EQ(extract(xsimd::nextafter(T(val0), T(val1))), std::nextafter(val0, val1)); - } -- void test_polar() -- { -- value_type val0(3); -- value_type val1(4); --#ifndef EMSCRIPTEN -- CHECK_EQ(extract(xsimd::polar(T(val0), T(val1))), std::polar(val0, val1)); --#else -- CHECK_EQ(std::real(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::real(std::polar(val0, val1)))); -- CHECK_EQ(std::imag(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::imag(std::polar(val0, val1)))); --#endif -- } - void test_pow() - { - value_type val0(2); -@@ -931,11 +920,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) - Test.test_nextafter(); - } - -- SUBCASE("polar") -- { -- Test.test_polar(); -- } -- - SUBCASE("pow") - { - Test.test_pow(); diff --git a/pkgs/development/libraries/xsimd/disable-test_error_gamma-test.patch b/pkgs/development/libraries/xsimd/disable-test_error_gamma.patch index a7344d231b8db..49957ea62ed74 100644 --- a/pkgs/development/libraries/xsimd/disable-test_error_gamma-test.patch +++ b/pkgs/development/libraries/xsimd/disable-test_error_gamma.patch @@ -1,13 +1,7 @@ -commit 3f751cef6b27ec13418a92c5b5f36b22bb5ffd55 -Author: Doron Behar <doron.behar@gmail.com> -Date: Tue Aug 1 13:24:34 2023 +0300 - - Darwin: Disable failing test from test_error_gamma.cpp - -diff --git a/test/test_error_gamma.cpp b/test/test_error_gamma.cpp +diff --git i/test/test_error_gamma.cpp w/test/test_error_gamma.cpp index 214cbb5..299e5b8 100644 ---- a/test/test_error_gamma.cpp -+++ b/test/test_error_gamma.cpp +--- i/test/test_error_gamma.cpp ++++ w/test/test_error_gamma.cpp @@ -131,25 +131,6 @@ struct error_gamma_test INFO("lgamma"); CHECK_EQ(diff, 0); diff --git a/pkgs/development/libraries/xsimd/fix-atan-test.patch b/pkgs/development/libraries/xsimd/fix-atan-test.patch deleted file mode 100644 index 3d1517610aae5..0000000000000 --- a/pkgs/development/libraries/xsimd/fix-atan-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit f60dad2c1d8ad47fbff761ce1cb027fc7c3a40e8 -Author: Doron Behar <doron.behar@gmail.com> -Date: Tue Aug 1 13:47:37 2023 +0300 - - Musl: Fix atan test from test_complex_trigonometric.cpp - -diff --git a/test/test_complex_trigonometric.cpp b/test/test_complex_trigonometric.cpp -index a486110..691db77 100644 ---- a/test/test_complex_trigonometric.cpp -+++ b/test/test_complex_trigonometric.cpp -@@ -155,7 +155,7 @@ struct complex_trigonometric_test - out = atan(in); - detail::store_batch(out, res, i); - } -- size_t diff = detail::get_nb_diff(res, expected); -+ size_t diff = detail::get_nb_diff_near(res, expected, 1e-12); - CHECK_EQ(diff, 0); - } - diff --git a/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch b/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch deleted file mode 100644 index caa7db0bcc134..0000000000000 --- a/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git i/include/xsimd/arch/xsimd_scalar.hpp w/include/xsimd/arch/xsimd_scalar.hpp -index 9066da6..7aa3b6b 100644 ---- i/include/xsimd/arch/xsimd_scalar.hpp -+++ w/include/xsimd/arch/xsimd_scalar.hpp -@@ -502,16 +502,7 @@ namespace xsimd - return !(x0 == x1); - } - --#if defined(__APPLE__) -- inline float exp10(const float& x) noexcept -- { -- return __exp10f(x); -- } -- inline double exp10(const double& x) noexcept -- { -- return __exp10(x); -- } --#elif defined(__GLIBC__) -+#if defined(__GLIBC__) - inline float exp10(const float& x) noexcept - { - return ::exp10f(x); diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index 678f87af74cfa..da85a37ab5bc0 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -13,24 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "xtensor"; - version = "0.24.7"; + version = "0.25.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtensor"; rev = finalAttrs.version; - hash = "sha256-dVbpcBW+jK9nIl5efk5LdKdBm8CkaJWEZ0ZY7ZuApwk="; + hash = "sha256-hVfdtYcJ6mzqj0AUu6QF9aVKQGYKd45RngY6UN3yOH4="; }; - patches = [ - # Support for xsimd 11 - (fetchpatch { - url = "https://github.com/xtensor-stack/xtensor/commit/77a650a8018e0be6fcc76bf66685ff352ae23ef1.patch"; - hash = "sha256-vOdUzzsSK+lYcA7fZXWOTVV202GZC0DhkMMjzggnmWE="; - }) - # A single test fails on Darwin, see: - # https://github.com/xtensor-stack/xtensor/issues/2718 - ./remove-failing-test_xinfo.patch - ]; nativeBuildInputs = [ cmake @@ -38,18 +28,15 @@ stdenv.mkDerivation (finalAttrs: { 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 xsimd ]; - cmakeFlags = let - cmakeBool = x: if x then "ON" else "OFF"; - in [ - "-DBUILD_TESTS=${cmakeBool finalAttrs.finalPackage.doCheck}" - "-DXTENSOR_ENABLE_ASSERT=${cmakeBool enableAssertions}" - "-DXTENSOR_CHECK_DIMENSION=${cmakeBool enableBoundChecks}" + cmakeFlags = [ + # Always build the tests, even if not running them, because testing whether + # they can be built is a test in itself. + (lib.cmakeBool "BUILD_TESTS" true) + (lib.cmakeBool "XTENSOR_ENABLE_ASSERT" enableAssertions) + (lib.cmakeBool "XTENSOR_CHECK_DIMENSION" enableBoundChecks) ]; doCheck = true; @@ -59,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "xtest"; meta = with lib; { - description = "Multi-dimensional arrays with broadcasting and lazy computing."; + description = "Multi-dimensional arrays with broadcasting and lazy computing"; homepage = "https://github.com/xtensor-stack/xtensor"; license = licenses.bsd3; maintainers = with maintainers; [ cpcloud ]; diff --git a/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch b/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch deleted file mode 100644 index c3352c453c598..0000000000000 --- a/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git i/test/CMakeLists.txt w/test/CMakeLists.txt -index 46127597..727b66bd 100644 ---- i/test/CMakeLists.txt -+++ w/test/CMakeLists.txt -@@ -189,7 +189,6 @@ set(XTENSOR_TESTS - test_xhistogram.cpp - test_xpad.cpp - test_xindex_view.cpp -- test_xinfo.cpp - test_xio.cpp - test_xlayout.cpp - test_xmanipulation.cpp diff --git a/pkgs/development/libraries/yaml-cpp/0.3.0.nix b/pkgs/development/libraries/yaml-cpp/0.3.0.nix index fad3397b74b6f..7e244261005e3 100644 --- a/pkgs/development/libraries/yaml-cpp/0.3.0.nix +++ b/pkgs/development/libraries/yaml-cpp/0.3.0.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = with lib; { - description = "A YAML parser and emitter for C++"; + description = "YAML parser and emitter for C++"; homepage = "https://github.com/jbeder/yaml-cpp"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix index 20d546e346b8f..3ee2dcf770411 100644 --- a/pkgs/development/libraries/yaml-cpp/default.nix +++ b/pkgs/development/libraries/yaml-cpp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - description = "A YAML parser and emitter for C++"; + description = "YAML parser and emitter for C++"; homepage = "https://github.com/jbeder/yaml-cpp"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index d8c29e56aaab0..6d9856fd61a91 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { doCheck = true; meta = with lib; { - description = "A network library for client/server games with dedicated servers"; + description = "Network library for client/server games with dedicated servers"; longDescription = '' yojimbo is a network library for client/server games with dedicated servers. It's designed around the networking requirements of competitive multiplayer games like first person shooters. diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix index e1d42ccce7b6b..96e075c02f4b9 100644 --- a/pkgs/development/libraries/yyjson/default.nix +++ b/pkgs/development/libraries/yyjson/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "The fastest JSON library in C"; + description = "Fastest JSON library in C"; homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index d5e058ef726e3..a198b1b6046ec 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A service which logs the users’s activities and events"; + description = "Service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 3ccb7c17f9c99..b41ec7f511745 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zeroc.com/ice.html"; - description = "The internet communications engine"; + description = "Internet communications engine"; license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 2a4119e0fe225..d8509c8fc3f4b 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { branch = "4"; homepage = "http://www.zeromq.org"; - description = "The Intelligent Transport Layer"; + description = "Intelligent Transport Layer"; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/zint/default.nix b/pkgs/development/libraries/zint/default.nix index 8ba4a68e4b82d..e6f40879a9cee 100644 --- a/pkgs/development/libraries/zint/default.nix +++ b/pkgs/development/libraries/zint/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A barcode generating tool and library"; + description = "Barcode generating tool and library"; longDescription = '' The Zint project aims to provide a complete cross-platform open source barcode generating solution. The package currently consists of a Qt based diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index 528d545c37c66..edd62ed3340bd 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/tsyrogit/zxcvbn-c"; - description = "A C/C++ implementation of the zxcvbn password strength estimation"; + description = "C/C++ implementation of the zxcvbn password strength estimation"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ xurei ]; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index c40cf9594cfa9..cae01170f290b 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , perl , pkg-config |