diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
| commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
| tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/development/libraries | |
| parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
| parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
| download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
447 files changed, 1934 insertions, 1452 deletions
diff --git a/nixpkgs/pkgs/development/libraries/SDL/default.nix b/nixpkgs/pkgs/development/libraries/SDL/default.nix index fa816c0add0f..a791d94a2c03 100644 --- a/nixpkgs/pkgs/development/libraries/SDL/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL/default.nix @@ -127,6 +127,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-platform multimedia library"; + mainProgram = "sdl-config"; homepage = "http://www.libsdl.org/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 1aac55d6ef9e..838bb9ecdbe5 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.0"; + version = "2.30.1"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-uKL9/T6vCEqMqmD3Q3rCMtKPRJZ4fRYVUr+4628/Ajg="; + hash = "sha256-nwmmyJK1/5Mu7l1YCk4PsasJIrx3jdiM5f/Cu3n0paA="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -180,6 +180,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A cross-platform multimedia library"; + mainProgram = "sdl2-config"; homepage = "http://www.libsdl.org/"; changelog = "https://github.com/libsdl-org/SDL/releases/tag/release-${version}"; license = licenses.zlib; diff --git a/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix index b412e22b8f0c..70d080e57ab8 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_mixer/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "SDL2_mixer"; - version = "2.6.3"; + version = "2.8.0"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_mixer/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-emuoakeGSM5hfjpekncYG8Z/fOmHZgXupq/9Sg1u6o8="; + sha256 = "sha256-HPs0yHsm29vHr9aMT1RcARarX5C7/sxa6+Kpy0uzFUk="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/SDL2_sound/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_sound/default.nix index 3a2d05c31a10..056991c9aca4 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_sound/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_sound/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { 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/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix index e46b9d9c537a..3407478b39b1 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2_ttf"; - version = "2.20.2"; + version = "2.22.0"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; + sha256 = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM="; }; configureFlags = [ "--disable-harfbuzz-builtin" ] diff --git a/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix b/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix index 3f3521de60a1..f7d997cd52e5 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-platform multimedia library - build SDL 1.2 applications against 2.0"; + mainProgram = "sdl-config"; homepage = "https://www.libsdl.org/"; license = licenses.zlib; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix index 1bc4c8ba35c0..189fdee05b26 100644 --- a/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL_sixel/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { 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; diff --git a/nixpkgs/pkgs/development/libraries/a52dec/default.nix b/nixpkgs/pkgs/development/libraries/a52dec/default.nix deleted file mode 100644 index fdb309c634da..000000000000 --- a/nixpkgs/pkgs/development/libraries/a52dec/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "a52dec"; - version = "0.7.4"; - - src = fetchurl { - url = "https://liba52.sourceforge.io/files/${pname}-${version}.tar.gz"; - sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM="; - }; - - configureFlags = [ - "--enable-shared" - # Define inline as __attribute__ ((__always_inline__)) - "ac_cv_c_inline=yes" - ]; - - makeFlags = [ - "AR=${stdenv.cc.targetPrefix}ar" - ]; - - # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 - # which can also be fixed with - # hardeningDisable = lib.optional stdenv.isi686 "pic"; - # but it's better to disable tests than loose ASLR on i686 - doCheck = !stdenv.isi686; - - meta = with lib; { - description = "ATSC A/52 stream decoder"; - homepage = "https://liba52.sourceforge.io/"; - platforms = platforms.unix; - license = licenses.gpl2Plus; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix index 7d2617a6ee60..8a11d3375491 100644 --- a/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/accounts-qt/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Qt library for accessing the online accounts database"; + mainProgram = "accountstest"; homepage = "https://gitlab.com/accounts-sso"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/ace/default.nix b/nixpkgs/pkgs/development/libraries/ace/default.nix index bae0401a781a..01041c858623 100644 --- a/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.dre.vanderbilt.edu/~schmidt/ACE.html"; description = "ADAPTIVE Communication Environment"; + mainProgram = "ace_gperf"; license = licenses.doc; maintainers = with maintainers; [ nico202 ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix b/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix index 89b0fb60c365..4d39fa0325f2 100644 --- a/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix +++ b/nixpkgs/pkgs/development/libraries/agda/1lab/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { description = "A formalised, cross-linked reference resource for mathematics done in Homotopy Type Theory "; homepage = src.meta.homepage; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ ncfavier ]; }; diff --git a/nixpkgs/pkgs/development/libraries/alkimia/default.nix b/nixpkgs/pkgs/development/libraries/alkimia/default.nix index b6fb92ae62dd..d5c89209ce5d 100644 --- a/nixpkgs/pkgs/development/libraries/alkimia/default.nix +++ b/nixpkgs/pkgs/development/libraries/alkimia/default.nix @@ -22,6 +22,7 @@ mkDerivation rec { meta = { description = "Library used by KDE finance applications"; + mainProgram = "onlinequoteseditor5"; longDescription = '' Alkimia is the infrastructure for common storage and business logic that will be used by all financial applications in KDE. diff --git a/nixpkgs/pkgs/development/libraries/allegro/default.nix b/nixpkgs/pkgs/development/libraries/allegro/default.nix index d9c862443653..0318c3133d63 100644 --- a/nixpkgs/pkgs/development/libraries/allegro/default.nix +++ b/nixpkgs/pkgs/development/libraries/allegro/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A game programming library"; homepage = "https://liballeg.org/"; - license = licenses.free; # giftware + license = licenses.giftware; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix index ff953b621635..b2b1e40576ea 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/default.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix @@ -6,6 +6,7 @@ , mesonEmulatorHook , ninja , pkg-config +, cmake , gettext , xmlto , docbook-xsl-nons @@ -23,6 +24,10 @@ , gperf , vala , curl +, cairo +, gdk-pixbuf +, pango +, librsvg , systemd , nixosTests , testers @@ -31,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "appstream"; - version = "1.0.1"; + version = "1.0.2"; outputs = [ "out" "dev" "installedTests" ]; @@ -39,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ximion"; repo = "appstream"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ULqRHepWVuAluXsXJUoqxqJfrN168MGlwdVkoLLwSN0="; + sha256 = "sha256-0NzZku6TQyyaTOAMWZD459RayhsH8cotlOaSKkVY/EQ="; }; patches = [ @@ -63,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config + cmake gettext libxslt xmlto @@ -85,6 +91,10 @@ stdenv.mkDerivation (finalAttrs: { libxmlb libyaml curl + cairo + gdk-pixbuf + pango + librsvg ] ++ lib.optionals withSystemd [ systemd ]; @@ -94,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { "-Ddocs=false" "-Dvapi=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dcompose=true" ] ++ lib.optionals (!withSystemd) [ "-Dsystemd=false" ]; diff --git a/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/nixpkgs/pkgs/development/libraries/appstream/qt.nix index 492037d721ed..1916774b8cfc 100644 --- a/nixpkgs/pkgs/development/libraries/appstream/qt.nix +++ b/nixpkgs/pkgs/development/libraries/appstream/qt.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation { nativeBuildInputs = appstream.nativeBuildInputs ++ [ qttools ]; - mesonFlags = appstream.mesonFlags ++ [ "-Dqt${qtSuffix}=true" ]; + mesonFlags = appstream.mesonFlags ++ [ + (lib.mesonBool "qt" true) + (lib.mesonOption "qt-versions" (lib.versions.major qtbase.version)) + ]; patches = appstream.patches; diff --git a/nixpkgs/pkgs/development/libraries/apr-util/default.nix b/nixpkgs/pkgs/development/libraries/apr-util/default.nix index a1cbbc5e6642..bd32ad45c47b 100644 --- a/nixpkgs/pkgs/development/libraries/apr-util/default.nix +++ b/nixpkgs/pkgs/development/libraries/apr-util/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apr.apache.org/"; description = "A companion library to APR, the Apache Portable Runtime"; + mainProgram = "apu-1-config"; maintainers = [ maintainers.eelco ]; platforms = platforms.unix; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/apr/default.nix b/nixpkgs/pkgs/development/libraries/apr/default.nix index b0809829c541..6428489173da 100644 --- a/nixpkgs/pkgs/development/libraries/apr/default.nix +++ b/nixpkgs/pkgs/development/libraries/apr/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://apr.apache.org/"; description = "The Apache Portable Runtime library"; + mainProgram = "apr-1-config"; platforms = platforms.all; license = licenses.asl20; maintainers = [ maintainers.eelco ]; diff --git a/nixpkgs/pkgs/development/libraries/aptdec/default.nix b/nixpkgs/pkgs/development/libraries/aptdec/default.nix index f969f0d66ada..2c3c9b3bdfd7 100644 --- a/nixpkgs/pkgs/development/libraries/aptdec/default.nix +++ b/nixpkgs/pkgs/development/libraries/aptdec/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NOAA APT satellite imagery decoding library"; + mainProgram = "aptdec"; homepage = "https://github.com/Xerbo/aptdec"; license = licenses.gpl2; maintainers = with maintainers; [ alexwinter ]; diff --git a/nixpkgs/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix index 8baf539b26ef..ccdc06e906fe 100644 --- a/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.30"; + version = "0.8.31"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-1OxvLpzEKxIXiLJIUr+hCx+sxnH9Z5dBM5Lug1acCok="; + sha256 = "sha256-CsXnwrZqBCS7JVAB/7JlAAvks5HnYxgrdc4Bmg68QdE="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/arguments/default.nix b/nixpkgs/pkgs/development/libraries/arguments/default.nix index bacb7662386e..524e00dc5a76 100644 --- a/nixpkgs/pkgs/development/libraries/arguments/default.nix +++ b/nixpkgs/pkgs/development/libraries/arguments/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Library for argument handling for MINC programs"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/development/libraries/assimp/default.nix b/nixpkgs/pkgs/development/libraries/assimp/default.nix index ec2d5561570e..654935391602 100644 --- a/nixpkgs/pkgs/development/libraries/assimp/default.nix +++ b/nixpkgs/pkgs/development/libraries/assimp/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library to import various 3D model formats"; + mainProgram = "assimp"; homepage = "https://www.assimp.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ehmry ]; diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 271c54ea97fa..6ebab7eb4760 100644 --- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.50.0"; + version = "2.50.1"; outputs = [ "out" "dev" ]; separateDebugInfo = true; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6fWoyCNcndljshcd6RIDARKcZ33ekzlV4d9hi5ScStw="; + sha256 = "Vye1wGh6xXuoBA55vWcxtxSja4/PMhkPI2uPs2mHiec="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/audiality2/default.nix b/nixpkgs/pkgs/development/libraries/audiality2/default.nix index 11625bc64f79..c189cd7e1ea4 100644 --- a/nixpkgs/pkgs/development/libraries/audiality2/default.nix +++ b/nixpkgs/pkgs/development/libraries/audiality2/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A realtime scripted modular audio engine for video games and musical applications"; + mainProgram = "a2play"; homepage = "http://audiality.org"; license = licenses.zlib; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/audio/cubeb/default.nix b/nixpkgs/pkgs/development/libraries/audio/cubeb/default.nix index baad8a1efd64..dd7033b1910e 100644 --- a/nixpkgs/pkgs/development/libraries/audio/cubeb/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/cubeb/default.nix @@ -60,6 +60,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Cross platform audio library"; + mainProgram = "cubeb-test"; homepage = "https://github.com/mozilla/cubeb"; license = licenses.isc; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix index b8b89abc8ea7..cb515ebde884 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.3"; + version = "0.7.4"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-LPg2m3kWsJJk8/FLn7bO81pum+4DKN7E9J2YIRzP1yI="; + hash = "sha256-FgD5M16uOQQImmKG9SWBKWHFTONqBd/m7qpXbdkyjz8="; }; enableParallelBuilding = true; @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform C++ and C library to decode tracked music files into a raw PCM audio stream"; + mainProgram = "openmpt123"; longDescription = '' libopenmpt is a cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream. openmpt123 is a cross-platform command-line or terminal based module file player. diff --git a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix index d0f85c95a077..473b246f3f9d 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lv2/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; + mainProgram = "lv2_validate"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix index 9822640f8d67..b1a6adaaeca2 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A set C++ wrappers around the LV2 C API"; + mainProgram = "ttl2c"; homepage = "https://lvtk.org/"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; diff --git a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix index 57070c8f442e..d0d899fe9935 100644 --- a/nixpkgs/pkgs/development/libraries/avro-c++/default.nix +++ b/nixpkgs/pkgs/development/libraries/avro-c++/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library which implements parts of the Avro Specification"; + mainProgram = "avrogencpp"; homepage = "https://avro.apache.org/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rasendubi ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-cal/aws-c-cal-musl-compat.patch b/nixpkgs/pkgs/development/libraries/aws-c-cal/aws-c-cal-musl-compat.patch new file mode 100644 index 000000000000..2cf1d4e81e0b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/aws-c-cal/aws-c-cal-musl-compat.patch @@ -0,0 +1,33 @@ +From: Emil Lerch <emil@lerch.org> +Date: Wed, 28 Apr 2021 17:46:24 -0700 +Subject: [PATCH] Allow dlopen to fail on musl systems + +Now that references are forced when linking statically, the assertion is +no longer necessary. See https://github.com/awslabs/aws-c-cal/pull/54 +--- + source/unix/openssl_platform_init.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/source/unix/openssl_platform_init.c b/source/unix/openssl_platform_init.c +index 5266ecc1..99f210bd 100644 +--- a/source/unix/openssl_platform_init.c ++++ b/source/unix/openssl_platform_init.c +@@ -496,7 +502,6 @@ static enum aws_libcrypto_version s_resolve_libcrypto(void) { + /* Try to auto-resolve against what's linked in/process space */ + FLOGF("searching process and loaded modules"); + void *process = dlopen(NULL, RTLD_NOW); +- AWS_FATAL_ASSERT(process && "Unable to load symbols from process space"); + enum aws_libcrypto_version result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_LC, process); + if (result == AWS_LIBCRYPTO_NONE) { + result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_1_0_2, process); +@@ -504,7 +509,9 @@ static enum aws_libcrypto_version s_resolve_libcrypto(void) { + if (result == AWS_LIBCRYPTO_NONE) { + result = s_resolve_libcrypto_symbols(AWS_LIBCRYPTO_1_1_1, process); + } +- dlclose(process); ++ if (process) { ++ dlclose(process); ++ } + + if (result == AWS_LIBCRYPTO_NONE) { + FLOGF("libcrypto symbols were not statically linked, searching for shared libraries"); diff --git a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index 68c575312d49..0188c8937c90 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -1,16 +1,21 @@ { lib, stdenv, fetchFromGitHub, cmake, aws-c-common, nix, openssl, Security }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aws-c-cal"; version = "0.6.10"; src = fetchFromGitHub { owner = "awslabs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-rzJypIf0DrKI/2Wt5vFop34dL+KYTeCfWC0RflZpiMo="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-rzJypIf0DrKI/2Wt5vFop34dL+KYTeCfWC0RflZpiMo="; }; + patches = [ + # Fix openssl adaptor code for musl based static binaries. + ./aws-c-cal-musl-compat.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ aws-c-common openssl ]; @@ -32,4 +37,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index 12dcbd12b9dd..b3ec8194c92a 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Image pixel format conversion library"; + mainProgram = "babl"; homepage = "https://gegl.org/babl/"; changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS"; license = licenses.lgpl3Plus; diff --git a/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix b/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix index f8a17f3bb11e..c3e2269a8a12 100644 --- a/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix +++ b/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix @@ -78,6 +78,7 @@ resholve.mkDerivation rec { meta = with lib; { inherit branch; description = "An event listener/callback API for creating extensible bash programs"; + mainProgram = "bashup.events"; homepage = "https://github.com/bashup/events"; license = licenses.cc0; maintainers = with maintainers; [ abathur ]; diff --git a/nixpkgs/pkgs/development/libraries/basu/default.nix b/nixpkgs/pkgs/development/libraries/basu/default.nix index 25e5adf65771..4665c4c2d158 100644 --- a/nixpkgs/pkgs/development/libraries/basu/default.nix +++ b/nixpkgs/pkgs/development/libraries/basu/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sr.ht/~emersion/basu"; description = "The sd-bus library, extracted from systemd"; + mainProgram = "basuctl"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index e473fa97a0ea..1da254093b1b 100644 --- a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities library for Linphone"; + mainProgram = "bctoolbox_tester"; homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin jluttine ]; diff --git a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 338b0082be5e..b4b5629cdafb 100644 --- a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -44,6 +44,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."; + mainProgram = "belle_sip_tester"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix deleted file mode 100644 index 6da88ee8258f..000000000000 --- a/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -# doc: https://github.com/ivmai/bdwgc/blob/v8.2.4/doc/README.macros (LARGE_CONFIG) -, enableLargeConfig ? false -, enableMmap ? true -, enableStatic ? false -, nixVersions -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "boehm-gc"; - version = "8.2.4"; - - src = fetchFromGitHub { - owner = "ivmai"; - repo = "bdwgc"; - rev = "v${finalAttrs.version}"; - hash = "sha256-KHijT4BBKfDvTpHpwognN+3ZXoC6JabBTFSYFyOUT9o="; - }; - - outputs = [ "out" "dev" "doc" ]; - separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - - nativeBuildInputs = [ - autoreconfHook - ]; - - configureFlags = [ - "--enable-cplusplus" - "--with-libatomic-ops=none" - ] - ++ lib.optional enableStatic "--enable-static" - ++ lib.optional enableMmap "--enable-mmap" - ++ lib.optional enableLargeConfig "--enable-large-config"; - - # This stanza can be dropped when a release fixes this issue: - # https://github.com/ivmai/bdwgc/issues/376 - # The version is checked with == instead of versionAtLeast so we - # don't forget to disable the fix (and if the next release does - # not fix the problem the test failure will be a reminder to - # extend the set of versions requiring the workaround). - makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && - finalAttrs.version == "8.2.4") - [ - # do not use /proc primitives to track dirty bits; see: - # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537 - # https://github.com/ivmai/bdwgc/blob/54522af853de28f45195044dadfd795c4e5942aa/include/private/gcconfig.h#L741 - "CFLAGS_EXTRA=-DNO_SOFT_VDB" - ]; - - # `gctest` fails under emulation on aarch64-darwin - doCheck = !(stdenv.isDarwin && stdenv.isx86_64); - - enableParallelBuilding = true; - - passthru.tests = nixVersions; - - meta = with lib; { - homepage = "https://hboehm.info/gc/"; - description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; - longDescription = '' - The Boehm-Demers-Weiser conservative garbage collector can be used as a - garbage collecting replacement for C malloc or C++ new. It allows you - to allocate memory basically as you normally would, without explicitly - deallocating memory that is no longer useful. The collector - automatically recycles memory when it determines that it can no longer - be otherwise accessed. - - The collector is also used by a number of programming language - implementations that either use C as intermediate code, want to - facilitate easier interoperation with C libraries, or just prefer the - simple collector interface. - - Alternatively, the garbage collector may be used as a leak detector for - C or C++ programs, though that is not its primary goal. - ''; - # non-copyleft, X11-style license - changelog = "https://github.com/ivmai/bdwgc/blob/v${finalAttrs.version}/ChangeLog"; - license = "https://hboehm.info/gc/license.txt"; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; - }; -}) diff --git a/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix index 0383adca64a4..7987629b60d3 100644 --- a/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix +++ b/nixpkgs/pkgs/development/libraries/boost-ext/boost-sml/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "boost-sml"; - version = "1.1.9"; + version = "1.1.11"; src = fetchFromGitHub { owner = "boost-ext"; repo = "sml"; rev = "v${version}"; - hash = "sha256-RYgSpnsmgZybpkJALIzxpkDRfe9QF2FHG+nA3msFaK0="; + hash = "sha256-/eR/B8rE+mh5zDPjx1kS9nVJf1rCeHP04QDavh6z6fM="; }; buildInputs = [ boost ]; diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix index 3e8908416185..fadf478e037f 100644 --- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -59,6 +59,7 @@ buildGoModule { meta = with lib; { description = "Free TLS/SSL implementation"; + mainProgram = "bssl"; homepage = "https://boringssl.googlesource.com"; maintainers = [ maintainers.thoughtpolice ]; license = with licenses; [ openssl isc mit bsd3 ]; diff --git a/nixpkgs/pkgs/development/libraries/botan/generic.nix b/nixpkgs/pkgs/development/libraries/botan/generic.nix index 8e053581e88b..a2acb8183283 100644 --- a/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cryptographic algorithms library"; + mainProgram = "botan"; maintainers = with maintainers; [ raskin thillux ]; platforms = platforms.unix; license = licenses.bsd2; diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 8ac9da237d19..7408a43272e9 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -93,6 +93,7 @@ in { meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; + mainProgram = "cairo-trace"; longDescription = '' Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X diff --git a/nixpkgs/pkgs/development/libraries/cdo/default.nix b/nixpkgs/pkgs/development/libraries/cdo/default.nix index b016aa4d4d68..18a6dc57434a 100644 --- a/nixpkgs/pkgs/development/libraries/cdo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cdo/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; + mainProgram = "cdo"; longDescription = '' Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. There are more than 600 operators available. diff --git a/nixpkgs/pkgs/development/libraries/cegui/default.nix b/nixpkgs/pkgs/development/libraries/cegui/default.nix index c56c59d02ad1..1e884b3d8a81 100644 --- a/nixpkgs/pkgs/development/libraries/cegui/default.nix +++ b/nixpkgs/pkgs/development/libraries/cegui/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://cegui.org.uk/"; description = "C++ Library for creating GUIs"; + mainProgram = "CEGUISampleFramework-0.9999"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/cgreen/default.nix b/nixpkgs/pkgs/development/libraries/cgreen/default.nix index 60d5bc1289ac..921eb6c79724 100644 --- a/nixpkgs/pkgs/development/libraries/cgreen/default.nix +++ b/nixpkgs/pkgs/development/libraries/cgreen/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/cgreen-devs/cgreen"; description = "The Modern Unit Test and Mocking Framework for C and C++"; + mainProgram = "cgreen-runner"; license = lib.licenses.isc; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/chipmunk/default.nix b/nixpkgs/pkgs/development/libraries/chipmunk/default.nix index 8290e60a4850..599cf9cfcee2 100644 --- a/nixpkgs/pkgs/development/libraries/chipmunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/chipmunk/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fast and lightweight 2D game physics library"; + mainProgram = "chipmunk_demos"; homepage = "http://chipmunk2d.net/"; license = licenses.mit; platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work diff --git a/nixpkgs/pkgs/development/libraries/chromaprint/default.nix b/nixpkgs/pkgs/development/libraries/chromaprint/default.nix index 189154da8c4e..bc53e2257f12 100644 --- a/nixpkgs/pkgs/development/libraries/chromaprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/chromaprint/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; + mainProgram = "fpcalc"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/nixpkgs/pkgs/development/libraries/civetweb/default.nix index 3222702f5a1a..f6fe616957d6 100644 --- a/nixpkgs/pkgs/development/libraries/civetweb/default.nix +++ b/nixpkgs/pkgs/development/libraries/civetweb/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Embedded C/C++ web server"; + mainProgram = "civetweb"; homepage = "https://github.com/civetweb/civetweb"; license = [ lib.licenses.mit ]; }; diff --git a/nixpkgs/pkgs/development/libraries/cln/default.nix b/nixpkgs/pkgs/development/libraries/cln/default.nix index a7094d18e6ea..ae3ed853a026 100644 --- a/nixpkgs/pkgs/development/libraries/cln/default.nix +++ b/nixpkgs/pkgs/development/libraries/cln/default.nix @@ -13,6 +13,7 @@ gccStdenv.mkDerivation rec { meta = with lib; { description = "C/C++ library for numbers, a part of GiNaC"; + mainProgram = "pi"; homepage = "https://www.ginac.de/CLN/"; license = licenses.gpl2; platforms = platforms.unix; # Once had cygwin problems diff --git a/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix b/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix index 65d6a392ffdb..3a6f926b3f32 100644 --- a/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix +++ b/nixpkgs/pkgs/development/libraries/cloog-ppl/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "CLooG-PPL, the Chunky Loop Generator"; + mainProgram = "cloog"; longDescription = '' CLooG is a free software library to generate code for scanning diff --git a/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix b/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix index 12e279797e76..a1ba3aaf93f3 100644 --- a/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix +++ b/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that generates loops for scanning polyhedra"; + mainProgram = "cloog"; longDescription = '' CLooG is a free software library to generate code for scanning diff --git a/nixpkgs/pkgs/development/libraries/cloog/default.nix b/nixpkgs/pkgs/development/libraries/cloog/default.nix index bfca886e03d5..3ae266c61cdd 100644 --- a/nixpkgs/pkgs/development/libraries/cloog/default.nix +++ b/nixpkgs/pkgs/development/libraries/cloog/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that generates loops for scanning polyhedra"; + mainProgram = "cloog"; longDescription = '' CLooG is a free software library to generate code for scanning diff --git a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index 650913fc3888..75ff3acdb947 100644 --- a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C"; + mainProgram = "cmark-gfm"; homepage = "https://github.com/github/cmark-gfm"; changelog = "https://github.com/github/cmark-gfm/raw/${version}/changelog.txt"; maintainers = with maintainers; [ cyplo ]; diff --git a/nixpkgs/pkgs/development/libraries/cmark/default.nix b/nixpkgs/pkgs/development/libraries/cmark/default.nix index 23d00769ee1b..5720f87c5bc4 100644 --- a/nixpkgs/pkgs/development/libraries/cmark/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmark/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CommonMark parsing and rendering library and program in C"; + mainProgram = "cmark"; homepage = "https://github.com/commonmark/cmark"; changelog = "https://github.com/commonmark/cmark/raw/${version}/changelog.txt"; maintainers = [ maintainers.michelk ]; diff --git a/nixpkgs/pkgs/development/libraries/codec2/default.nix b/nixpkgs/pkgs/development/libraries/codec2/default.nix index 7b1a226de812..8637f5b7ab2d 100644 --- a/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; + mainProgram = "freedv_rx"; homepage = "https://www.rowetel.com/codec2.html"; license = licenses.lgpl21Only; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/nixpkgs/pkgs/development/libraries/coin3d/default.nix index 7675ddae378e..8c331a28dcb1 100644 --- a/nixpkgs/pkgs/development/libraries/coin3d/default.nix +++ b/nixpkgs/pkgs/development/libraries/coin3d/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/coin3d/coin"; description = "High-level, retained-mode toolkit for effective 3D graphics development"; + mainProgram = "coin-config"; license = licenses.bsd3; maintainers = with maintainers; [ gebner viric ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/cppunit/default.nix b/nixpkgs/pkgs/development/libraries/cppunit/default.nix index fba624a861d7..73c96de4ff24 100644 --- a/nixpkgs/pkgs/development/libraries/cppunit/default.nix +++ b/nixpkgs/pkgs/development/libraries/cppunit/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://freedesktop.org/wiki/Software/cppunit/"; description = "C++ unit testing framework"; + mainProgram = "DllPlugInTester"; license = licenses.lgpl21; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/nixpkgs/pkgs/development/libraries/ctpl/default.nix b/nixpkgs/pkgs/development/libraries/ctpl/default.nix index 634c2cf44cf4..c9925d162f99 100644 --- a/nixpkgs/pkgs/development/libraries/ctpl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctpl/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://ctpl.tuxfamily.org/"; description = "Template engine library written in C"; + mainProgram = "ctpl"; platforms = platforms.linux; maintainers = [ ]; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index 943b9f28584c..c7876a98bd54 100644 --- a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast inference engine for Transformer models"; + mainProgram = "ct2-translator"; homepage = "https://github.com/OpenNMT/CTranslate2"; changelog = "https://github.com/OpenNMT/CTranslate2/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix b/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix index 644c68e85d86..c06eff11aad0 100644 --- a/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A foreign function interface for bash"; + mainProgram = "ctypes.sh"; homepage = "https://github.com/taviso/ctypes.sh"; license = licenses.mit; maintainers = with maintainers; [ tadeokondrak ]; diff --git a/nixpkgs/pkgs/development/libraries/curlpp/default.nix b/nixpkgs/pkgs/development/libraries/curlpp/default.nix index 0aee75751d9e..c8fe78d0462f 100644 --- a/nixpkgs/pkgs/development/libraries/curlpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/curlpp/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.curlpp.org/"; description = "C++ wrapper around libcURL"; + mainProgram = "curlpp-config"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; }; diff --git a/nixpkgs/pkgs/development/libraries/cutee/default.nix b/nixpkgs/pkgs/development/libraries/cutee/default.nix index 07e2b7cbcee2..eb5f51cbcfeb 100644 --- a/nixpkgs/pkgs/development/libraries/cutee/default.nix +++ b/nixpkgs/pkgs/development/libraries/cutee/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ Unit Testing Easy Environment"; + mainProgram = "cutee"; homepage = "https://www.codesink.org/cutee_unit_testing.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars]; diff --git a/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix b/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix index c06171e72ce5..a2864fbb89df 100644 --- a/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix @@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Safe FFI between Rust and C++"; + mainProgram = "cxxbridge"; homepage = "https://github.com/dtolnay/cxx"; license = licenses.mit; maintainers = with maintainers; [ centromere ]; diff --git a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix index 4228a3cb5876..545aa4bc0e0c 100644 --- a/nixpkgs/pkgs/development/libraries/cxxtest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cxxtest/default.nix @@ -40,6 +40,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; + mainProgram = "cxxtestgen"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos ]; diff --git a/nixpkgs/pkgs/development/libraries/czmq/default.nix b/nixpkgs/pkgs/development/libraries/czmq/default.nix index bb8ecafbb347..db2b99c96650 100644 --- a/nixpkgs/pkgs/development/libraries/czmq/default.nix +++ b/nixpkgs/pkgs/development/libraries/czmq/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://czmq.zeromq.org/"; description = "High-level C Binding for ZeroMQ"; + mainProgram = "zmakecert"; license = licenses.mpl20; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix index 0d8504c9234c..d92d28d094e6 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-6.0.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-6.0.nix @@ -3,7 +3,7 @@ import ./generic.nix (args // { version = "6.0.30"; sha256 = "1lhglbvg65j5slrlv7qv4vi3cvd7kjywa07gq1abzschycf4p3k0"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch diff --git a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix index 2c1cb455feae..fd5a53253522 100644 --- a/nixpkgs/pkgs/development/libraries/db/db-6.2.nix +++ b/nixpkgs/pkgs/development/libraries/db/db-6.2.nix @@ -3,7 +3,7 @@ import ./generic.nix (args // { version = "6.2.32"; sha256 = "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch diff --git a/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix b/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix index c6be0dd419db..b2946872fbbd 100644 --- a/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://dbus.freedesktop.org"; license = with lib.licenses; [ afl21 gpl2Plus ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; + mainProgram = "dbus-binding-tool"; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/dbxml/default.nix b/nixpkgs/pkgs/development/libraries/dbxml/default.nix index c65e7ad93eca..b6dcf908c4f9 100644 --- a/nixpkgs/pkgs/development/libraries/dbxml/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbxml/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; description = "Embeddable XML database based on Berkeley DB"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/dee/default.nix b/nixpkgs/pkgs/development/libraries/dee/default.nix index 4a2199f450e6..4bece9069466 100644 --- a/nixpkgs/pkgs/development/libraries/dee/default.nix +++ b/nixpkgs/pkgs/development/libraries/dee/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A 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; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/nixpkgs/pkgs/development/libraries/duckdb/default.nix index e6645480d2b2..be1a20987881 100644 --- a/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -15,32 +15,22 @@ let enableFeature = yes: if yes then "ON" else "OFF"; + versions = lib.importJSON ./versions.json; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duckdb"; - version = "0.10.0"; + inherit (versions) rev version; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-qGUq0iYTaLNHKqbXNLRmvqHMqunvIlP991IKb4qdSt4="; + # to update run: + # nix-shell maintainers/scripts/update.nix --argstr path duckdb + inherit (versions) hash; + owner = "duckdb"; + repo = "duckdb"; + rev = "refs/tags/v${finalAttrs.version}"; }; - patches = [ - # remove calls to git and set DUCKDB_VERSION to version - (substituteAll { - src = ./version.patch; - version = "v${version}"; - }) - # add missing file needed for httpfs compile - # remove on next update - (fetchpatch { - name = "missing-httpfs-file.patch"; - url = "https://github.com/duckdb/duckdb/commit/3d7aa3ed46ecf5f18122559e385b75f1f5e9aba8.patch"; - hash = "sha256-Q4IHCpMpxn86OquUZdEF7P0nHEPOcWS0TQijTkvBYbQ="; - }) - ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ cmake ninja python3 ]; buildInputs = [ openssl ] @@ -48,22 +38,22 @@ stdenv.mkDerivation rec { ++ lib.optionals withOdbc [ unixODBC ]; cmakeFlags = [ - "-DDUCKDB_EXTENSION_CONFIGS=${src}/.github/config/in_tree_extensions.cmake" + "-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake" "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" "-DJDBC_DRIVER=${enableFeature withJdbc}" - ] ++ lib.optionals doInstallCheck [ + "-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}" + ] ++ lib.optionals finalAttrs.doInstallCheck [ # development settings "-DBUILD_UNITTESTS=ON" ]; - doInstallCheck = true; - - preInstallCheck = '' - export HOME="$(mktemp -d)" - '' + lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="$out/lib''${DYLD_LIBRARY_PATH:+:}''${DYLD_LIBRARY_PATH}" + postInstall = '' + mkdir -p $lib + mv $out/lib $lib ''; + doInstallCheck = true; + installCheckPhase = let excludes = map (pattern: "exclude:'${pattern}'") ([ @@ -105,26 +95,29 @@ stdenv.mkDerivation rec { "test/sql/copy/csv/auto/test_csv_auto.test" # test expects installed file timestamp to be > 2024 "test/sql/table_function/read_text_and_blob.test" - # can re-enable next update (broken for 0.10.0) - "test/sql/secrets/create_secret_non_writable_persistent_dir.test" - # https://github.com/duckdb/duckdb/issues/10722 - "test/sql/types/nested/list/list_aggregate_dict.test" + # fails with Out of Memory Error + "test/sql/copy/parquet/batched_write/batch_memory_usage.test" + # wants http connection + "test/sql/copy/csv/test_mixed_lines.test" ] ++ lib.optionals stdenv.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" "test/sql/aggregate/aggregates/test_skewness.test" "test/sql/function/list/aggregates/skewness.test" ]); + LD_LIBRARY_PATH = lib.optionalString stdenv.isDarwin "DY" + "LD_LIBRARY_PATH"; in '' runHook preInstallCheck - ./test/unittest ${toString excludes} + HOME="$(mktemp -d)" ${LD_LIBRARY_PATH}="$lib/lib" ./test/unittest ${toString excludes} runHook postInstallCheck ''; + passthru.updateScript = ./update.sh; + meta = with lib; { - changelog = "https://github.com/duckdb/duckdb/releases/tag/v${version}"; + changelog = "https://github.com/duckdb/duckdb/releases/tag/v${finalAttrs.version}"; description = "Embeddable SQL OLAP Database Management System"; homepage = "https://duckdb.org/"; license = licenses.mit; @@ -132,4 +125,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ costrouc cpcloud ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/duckdb/update.sh b/nixpkgs/pkgs/development/libraries/duckdb/update.sh new file mode 100755 index 000000000000..f3acd176ee86 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/duckdb/update.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash -p cacert curl jq moreutils nix-prefetch +# shellcheck shell=bash + +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +nixpkgs=$(while [[ ! -e .git ]]; do [[ ${PWD} != / ]] || exit 1; cd ..; done; echo "${PWD}") + +repo=duckdb +owner=duckdb + +msg() { + echo "$*" >&2 +} + +json_get() { + jq -r "$1" < 'versions.json' +} + +json_set() { + jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json' +} + +get_latest() { + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ + "https://api.github.com/repos/${owner}/${repo}/releases/latest" | jq -r .tag_name +} + +get_sha() { + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ + "https://api.github.com/repos/${owner}/${repo}/git/ref/tags/$1" | jq -r .object.sha +} + +tag=$(get_latest) +version=${tag/v/} + +[[ ${version} = $(json_get .version) ]] && { msg "${version} is up to date"; exit 0; } + +sha=$(get_sha "${tag}") +sri=$(nix-prefetch -I nixpkgs="${nixpkgs}" -E "duckdb.overrideAttrs { version = \"${version}\"; }") + +json_set ".version" "${version}" +json_set ".rev" "${sha}" +json_set ".hash" "${sri}" diff --git a/nixpkgs/pkgs/development/libraries/duckdb/version.patch b/nixpkgs/pkgs/development/libraries/duckdb/version.patch deleted file mode 100644 index 122ad4295d41..000000000000 --- a/nixpkgs/pkgs/development/libraries/duckdb/version.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2b49e11288..0a4a69b9a0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,52 +244,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") - set(SUN TRUE) - endif() - --find_package(Git) --if(Git_FOUND) -- if (NOT DEFINED GIT_COMMIT_HASH) -- execute_process( -- COMMAND ${GIT_EXECUTABLE} log -1 --format=%h -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- RESULT_VARIABLE GIT_RESULT -- OUTPUT_VARIABLE GIT_COMMIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- endif() -- execute_process( -- COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0 -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- OUTPUT_VARIABLE GIT_LAST_TAG -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- execute_process( -- COMMAND ${GIT_EXECUTABLE} describe --tags --long -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- OUTPUT_VARIABLE GIT_ITERATION -- OUTPUT_STRIP_TRAILING_WHITESPACE) --else() -- message("Git NOT FOUND") --endif() -- --if(GIT_RESULT EQUAL "0") -- string(REGEX REPLACE "v([0-9]+).[0-9]+.[0-9]+" "\\1" DUCKDB_MAJOR_VERSION "${GIT_LAST_TAG}") -- string(REGEX REPLACE "v[0-9]+.([0-9]+).[0-9]+" "\\1" DUCKDB_MINOR_VERSION "${GIT_LAST_TAG}") -- string(REGEX REPLACE "v[0-9]+.[0-9]+.([0-9]+)" "\\1" DUCKDB_PATCH_VERSION "${GIT_LAST_TAG}") -- string(REGEX REPLACE ".*-([0-9]+)-.*" "\\1" DUCKDB_DEV_ITERATION "${GIT_ITERATION}") -- -- if(DUCKDB_DEV_ITERATION EQUAL 0) -- # on a tag; directly use the version -- set(DUCKDB_VERSION "${GIT_LAST_TAG}") -- else() -- # not on a tag, increment the patch version by one and add a -devX suffix -- math(EXPR DUCKDB_PATCH_VERSION "${DUCKDB_PATCH_VERSION}+1") -- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}") -- endif() --else() -- # fallback for when building from tarball -- set(DUCKDB_MAJOR_VERSION 0) -- set(DUCKDB_MINOR_VERSION 0) -- set(DUCKDB_PATCH_VERSION 1) -- set(DUCKDB_DEV_ITERATION 0) -- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}") --endif() -+set(DUCKDB_VERSION "@version@") - - message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}") - diff --git a/nixpkgs/pkgs/development/libraries/duckdb/versions.json b/nixpkgs/pkgs/development/libraries/duckdb/versions.json new file mode 100644 index 000000000000..efb151413e3d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/duckdb/versions.json @@ -0,0 +1,5 @@ +{ + "version": "0.10.1", + "rev": "4a89d97db8a5a23a15f3025c8d2d2885337c2637", + "hash": "sha256-/j/DaUzsfACI5Izr4lblkYmIEmKsOXr760UTwC0l/qg=" +} diff --git a/nixpkgs/pkgs/development/libraries/exempi/default.nix b/nixpkgs/pkgs/development/libraries/exempi/default.nix index 2ebf1ce7cc91..e79bc6169802 100644 --- a/nixpkgs/pkgs/development/libraries/exempi/default.nix +++ b/nixpkgs/pkgs/development/libraries/exempi/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; + mainProgram = "exempi"; homepage = "https://libopenraw.freedesktop.org/exempi/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index f080bd804b48..0ef833b8aa23 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://exiv2.org"; description = "A library and command-line utility to manage image metadata"; + mainProgram = "exiv2"; platforms = platforms.all; license = licenses.gpl2Plus; maintainers = with maintainers; [ wegank ]; diff --git a/nixpkgs/pkgs/development/libraries/expat/default.nix b/nixpkgs/pkgs/development/libraries/expat/default.nix index 27cbd38c0286..d2f4aa392cb1 100644 --- a/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { 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"; + mainProgram = "xmlwf"; platforms = platforms.all; license = licenses.mit; # expat version pkgConfigModules = [ "expat" ]; diff --git a/nixpkgs/pkgs/development/libraries/fbthrift/default.nix b/nixpkgs/pkgs/development/libraries/fbthrift/default.nix index a483fb1644a2..373d01892203 100644 --- a/nixpkgs/pkgs/development/libraries/fbthrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/fbthrift/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Facebook's branch of Apache Thrift"; + mainProgram = "thrift1"; homepage = "https://github.com/facebook/fbthrift"; license = licenses.asl20; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index 7dadbcb39502..25bab6645e07 100644 --- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lcblas" "--with-lapack-libs=-llapacke" + "--without-archnative" ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "Finite Field Linear Algebra Subroutines"; + mainProgram = "fflas-ffpack-config"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix deleted file mode 100644 index e57c0fcff5bc..000000000000 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ /dev/null @@ -1,23 +0,0 @@ -import ./generic.nix { - version = "4.4.4"; - hash = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA="; - extraPatches = [ - { - name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; - hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; - } - # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks. - # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary. - { - name = "utils-fix_crash_in_ff_seek_frame_binary.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d"; - hash = "sha256-UxZ4VneZpw+Q/UwkEUDNdb2nOx1QnMrZ40UagspNTxI="; - postFetch = '' - substituteInPlace "$out" \ - --replace libavformat/seek.c libavformat/utils.c \ - --replace 'const AVInputFormat *const ' 'const AVInputFormat *' - ''; - } - ]; -} diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix deleted file mode 100644 index 68edb0fd37e4..000000000000 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix +++ /dev/null @@ -1,21 +0,0 @@ -import ./generic.nix { - version = "5.1.3"; - hash = "sha256-twfJvANLQGO7TiyHPMPqApfHLFUlOGZTTIIGEnjyvuE="; - extraPatches = [ - { - name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; - hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; - } - { - name = "libsvtav1-1.5.0-compat-vbv_bufsize.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee"; - hash = "sha256-v9Viyo12QfZpbcVqd1aHgLl/DgSkdE9F1kr6afTGPik="; - } - { - name = "libsvtav1-1.5.0-compat-maximum_buffer_size_ms-conditional.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/96748ac54f998ba6fe22802799c16b4eba8d4ccc"; - hash = "sha256-Z5HSe7YpryYGHD3BYXejAhqR4EPnmfTGyccxNvU3AaU="; - } - ]; -} diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix deleted file mode 100644 index cebf17e071e9..000000000000 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/6.nix +++ /dev/null @@ -1,11 +0,0 @@ -import ./generic.nix { - version = "6.1"; - hash = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg="; - extraPatches = [ - { - name = "avcodec-decode-validate-hw-frames-ctx.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7"; - hash = "sha256-aE9WN7a2INbss7oRys+AC9d9+yBzlJdeBRcwSDpG0Qw="; - } - ]; -} diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix new file mode 100644 index 000000000000..5c15239541d8 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix @@ -0,0 +1,58 @@ +{ callPackage, darwin }: + +let + mkFFmpeg = + initArgs: ffmpegVariant: + callPackage ./generic.nix ( + { + inherit (darwin.apple_sdk.frameworks) + Cocoa + CoreServices + CoreAudio + CoreMedia + AVFoundation + MediaToolbox + VideoDecodeAcceleration + VideoToolbox + ; + } + // (initArgs // { inherit ffmpegVariant; }) + ); + + v4 = { + version = "4.4.4"; + hash = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA="; + }; + + v5 = { + version = "5.1.4"; + hash = "sha256-2jUL1/xGUf7aMooST2DW41KE7bC+BtgChXmj0sAJZ90="; + }; + + v6 = { + version = "6.1.1"; + hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo="; + }; +in + +rec { + ffmpeg_4 = mkFFmpeg v4 "small"; + ffmpeg_4-headless = mkFFmpeg v4 "headless"; + ffmpeg_4-full = mkFFmpeg v4 "full"; + + ffmpeg_5 = mkFFmpeg v5 "small"; + ffmpeg_5-headless = mkFFmpeg v5 "headless"; + ffmpeg_5-full = mkFFmpeg v5 "full"; + + ffmpeg_6 = mkFFmpeg v6 "small"; + ffmpeg_6-headless = mkFFmpeg v6 "headless"; + ffmpeg_6-full = mkFFmpeg v6 "full"; + + # Please make sure this is updated to the latest version on the next major + # update to ffmpeg + # Packages which use ffmpeg as a library, should pin to the relevant major + # version number which the upstream support. + ffmpeg = ffmpeg_6; + ffmpeg-headless = ffmpeg_6-headless; + ffmpeg-full = ffmpeg_6-full; +} diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 2410547e2df6..6dba78cad219 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,15 @@ -{ version, hash, extraPatches ? [] }: - { lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm + # You can fetch any upstream version using this derivation by specifying version and hash + # NOTICE: Always use this argument to override the version. Do not use overrideAttrs. +, version # ffmpeg ABI version. Also declare this if you're overriding the source. +, hash ? "" # hash of the upstream source for the given ABI version +, source ? fetchgit { + url = "https://git.ffmpeg.org/ffmpeg.git"; + rev = "n${version}"; + inherit hash; + } + , ffmpegVariant ? "small" # Decides which dependencies are enabled by default # Build with headless deps; excludes dependencies that are only necessary for @@ -71,7 +79,7 @@ , withOpenmpt ? withFullDeps # Tracked music files decoder , withOpus ? withHeadlessDeps # Opus de/encoder , withPlacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library -, withPulse ? withSmallDeps && !stdenv.isDarwin # Pulseaudio input support +, withPulse ? withSmallDeps && stdenv.isLinux # Pulseaudio input support , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) , withRtmp ? false # RTMP[E] support , withSamba ? withFullDeps && !stdenv.isDarwin && withGPLv3 # Samba protocol @@ -82,13 +90,13 @@ , withSrt ? withHeadlessDeps # Secure Reliable Transport (SRT) protocol , withSsh ? withHeadlessDeps # SFTP protocol , withSvg ? withFullDeps # SVG protocol -, withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 # AV1 encoder/decoder (focused on speed and correctness) +, withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 && !stdenv.hostPlatform.isMinGW # AV1 encoder/decoder (focused on speed and correctness) , withTensorflow ? false # Tensorflow dnn backend support , withTheora ? withHeadlessDeps # Theora encoder -, withV4l2 ? withHeadlessDeps && !stdenv.isDarwin # Video 4 Linux support +, withV4l2 ? withHeadlessDeps && stdenv.isLinux # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration -, withVdpau ? withSmallDeps # Vdpau hardware acceleration +, withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration , withVidStab ? withFullDeps && withGPL # Video stabilization , withVmaf ? withFullDeps && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder @@ -305,7 +313,7 @@ */ let - inherit (lib) optional optionals optionalString enableFeature versionAtLeast; + inherit (lib) optional optionals optionalString enableFeature versionOlder versionAtLeast; in @@ -346,12 +354,7 @@ assert buildSwscale -> buildAvutil; stdenv.mkDerivation (finalAttrs: { pname = "ffmpeg" + (optionalString (ffmpegVariant != "small") "-${ffmpegVariant}"); inherit version; - - src = fetchgit { - url = "https://git.ffmpeg.org/ffmpeg.git"; - rev = "n${finalAttrs.version}"; - inherit hash; - }; + src = source; postPatch = '' patchShebangs . @@ -362,23 +365,40 @@ stdenv.mkDerivation (finalAttrs: { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 ''; - patches = map (patch: fetchpatch patch) (extraPatches - ++ (lib.optional (lib.versionOlder version "6.1") + patches = map (patch: fetchpatch patch) ([ ] + ++ optionals (versionOlder version "5") [ + { + name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; + hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; + } { # Backport fix for binutils-2.41. name = "binutils-2.41.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; } - ) - ++ (lib.optional (lib.versionAtLeast finalAttrs.version "6" && lib.versionOlder finalAttrs.version "6.1") + # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks. + # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary. + { + name = "utils-fix_crash_in_ff_seek_frame_binary.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d"; + hash = "sha256-UxZ4VneZpw+Q/UwkEUDNdb2nOx1QnMrZ40UagspNTxI="; + postFetch = '' + substituteInPlace "$out" \ + --replace libavformat/seek.c libavformat/utils.c \ + --replace 'const AVInputFormat *const ' 'const AVInputFormat *' + ''; + } + ] + ++ (lib.optional (lib.versionAtLeast version "6" && lib.versionOlder version "6.1") { # this can be removed post 6.1 name = "fix_aacps_tablegen"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/814178f92647be2411516bbb82f48532373d2554"; hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI="; } ) - ++ (lib.optional (lib.versionAtLeast finalAttrs.version "6.1" && lib.versionOlder finalAttrs.version "6.2") + ++ (lib.optional (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; @@ -439,7 +459,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature buildAvdevice "avdevice") (enableFeature buildAvfilter "avfilter") (enableFeature buildAvformat "avformat") - ] ++ optionals (lib.versionOlder finalAttrs.version "5") [ + ] ++ optionals (lib.versionOlder version "5") [ # Ffmpeg > 4 doesn't know about the flag anymore (enableFeature buildAvresample "avresample") ] ++ [ @@ -470,7 +490,7 @@ stdenv.mkDerivation (finalAttrs: { */ (enableFeature withAlsa "alsa") (enableFeature withAom "libaom") - ] ++ optionals (versionAtLeast finalAttrs.version "6.1") [ + ] ++ optionals (versionAtLeast version "6.1") [ (enableFeature withAribcaption "libaribcaption") ] ++ [ (enableFeature withAss "libass") @@ -495,7 +515,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withGme "libgme") (enableFeature withGnutls "gnutls") (enableFeature withGsm "libgsm") - ] ++ optionals (versionAtLeast finalAttrs.version "6.1") [ + ] ++ optionals (versionAtLeast version "6.1") [ (enableFeature withHarfbuzz "libharfbuzz") ] ++ [ (enableFeature withIconv "iconv") @@ -518,7 +538,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withOpenjpeg "libopenjpeg") (enableFeature withOpenmpt "libopenmpt") (enableFeature withOpus "libopus") - ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [ + ] ++ optionals (versionAtLeast version "5.0") [ (enableFeature withPlacebo "libplacebo") ] ++ [ (enableFeature withPulse "libpulse") @@ -526,7 +546,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withRtmp "librtmp") (enableFeature withSamba "libsmbclient") (enableFeature withSdl2 "sdl2") - ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [ + ] ++ optionals (versionAtLeast version "5.0") [ (enableFeature withShaderc "libshaderc") ] ++ [ (enableFeature withSoxr "libsoxr") @@ -624,7 +644,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withModplug [ libmodplug ] ++ optionals withMp3lame [ lame ] ++ optionals withMysofa [ libmysofa ] - ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ] + ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast version "6") then nv-codec-headers-12 else nv-codec-headers) ] ++ optionals withOgg [ libogg ] ++ optionals withOpenal [ openal ] ++ optionals withOpencl [ ocl-icd opencl-headers ] @@ -634,7 +654,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withOpenjpeg [ openjpeg ] ++ optionals withOpenmpt [ libopenmpt ] ++ optionals withOpus [ libopus ] - ++ optionals withPlacebo [ (if (lib.versionAtLeast finalAttrs.version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] + ++ optionals withPlacebo [ (if (lib.versionAtLeast version "6.1") then libplacebo else libplacebo_5) vulkan-headers ] ++ optionals withPulse [ libpulseaudio ] ++ optionals withRav1e [ rav1e ] ++ optionals withRtmp [ rtmpdump ] @@ -722,7 +742,7 @@ stdenv.mkDerivation (finalAttrs: { addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so '' # https://trac.ffmpeg.org/ticket/10809 - + optionalString (versionAtLeast version "5.0" && withVulkan) '' + + optionalString (versionAtLeast version "5.0" && withVulkan && !stdenv.hostPlatform.isMinGW) '' patchelf $lib/lib/libavcodec.so --add-needed libvulkan.so --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; @@ -733,7 +753,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A 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${finalAttrs.version}/Changelog"; + changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines @@ -749,6 +769,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optional (withGPL && withUnfree) unfree; pkgConfigModules = [ "libavutil" ]; platforms = platforms.all; + # See https://github.com/NixOS/nixpkgs/pull/295344#issuecomment-1992263658 + broken = stdenv.hostPlatform.isMinGW && stdenv.hostPlatform.is64bit; maintainers = with maintainers; [ atemu arthsmn jopejoe1 ]; mainProgram = "ffmpeg"; }; diff --git a/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 381bb7b2984c..47e3c3ed42c7 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; + mainProgram = "ffmpegthumbnailer"; 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 o decode frames diff --git a/nixpkgs/pkgs/development/libraries/ffms/default.nix b/nixpkgs/pkgs/development/libraries/ffms/default.nix index 06fce3891e27..370b4267bdb4 100644 --- a/nixpkgs/pkgs/development/libraries/ffms/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffms/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/FFMS/ffms2/"; description = "FFmpeg based source library for easy frame accurate access"; + mainProgram = "ffmsindex"; license = licenses.mit; maintainers = with maintainers; [ tadeokondrak ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/flatcc/default.nix b/nixpkgs/pkgs/development/libraries/flatcc/default.nix index 1f487955b3f3..4d74627ee3c9 100644 --- a/nixpkgs/pkgs/development/libraries/flatcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatcc/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "FlatBuffers Compiler and Library in C for C "; + mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; license = [ licenses.asl20 ]; maintainers = with maintainers; [ onny ]; diff --git a/nixpkgs/pkgs/development/libraries/flint/3.nix b/nixpkgs/pkgs/development/libraries/flint/3.nix index 3be7fdc63904..b8b8c2d8ec7d 100644 --- a/nixpkgs/pkgs/development/libraries/flint/3.nix +++ b/nixpkgs/pkgs/development/libraries/flint/3.nix @@ -24,16 +24,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-ezEaAFA6hjiB64F32+uEMi8pOZ89fXLzsaTJuh1XlLQ="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ autoconf automake gettext libtool ]; + propagatedBuildInputs = [ + mpfr + ]; + buildInputs = [ gmp - mpfr ] ++ lib.optionals withBlas [ openblas ] ++ lib.optionals withNtl [ diff --git a/nixpkgs/pkgs/development/libraries/frame/default.nix b/nixpkgs/pkgs/development/libraries/frame/default.nix index f0b37b7e633c..e56ce1e68416 100644 --- a/nixpkgs/pkgs/development/libraries/frame/default.nix +++ b/nixpkgs/pkgs/development/libraries/frame/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://launchpad.net/frame"; description = "Handles the buildup and synchronization of a set of simultaneous touches"; + mainProgram = "frame-test-x11"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/freealut/default.nix b/nixpkgs/pkgs/development/libraries/freealut/default.nix index c29899922979..dbae2b20b61c 100644 --- a/nixpkgs/pkgs/development/libraries/freealut/default.nix +++ b/nixpkgs/pkgs/development/libraries/freealut/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; + mainProgram = "freealut-config"; license = lib.licenses.lgpl2; pkgConfigModules = [ "freealut" ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/freetts/default.nix b/nixpkgs/pkgs/development/libraries/freetts/default.nix index 06535c087dc6..ec948f1fdccc 100644 --- a/nixpkgs/pkgs/development/libraries/freetts/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetts/default.nix @@ -1,29 +1,49 @@ -{stdenv, fetchurl, apacheAnt, unzip, sharutils, lib, jdk}: +{ lib +, stdenv +, fetchzip +, ant +, jdk8 +, sharutils +, stripJavaArchivesHook +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freetts"; version = "1.2.2"; - src = fetchurl { - url = "mirror://sourceforge/freetts/${pname}-${version}-src.zip"; - sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; + + src = fetchzip { + url = "mirror://sourceforge/freetts/${finalAttrs.pname}-${finalAttrs.version}-src.zip"; + hash = "sha256-+bhM0ErEZVnmcz5CBqn/AeGaOhKnCjZzGeqgO/89wms="; + stripRoot = false; }; - nativeBuildInputs = [ unzip ]; - buildInputs = [ apacheAnt sharutils jdk ]; - unpackPhase = '' - unzip $src -x META-INF/* - ''; + + nativeBuildInputs = [ + ant + jdk8 + sharutils + stripJavaArchivesHook + ]; + + sourceRoot = "${finalAttrs.src.name}/freetts-${finalAttrs.version}"; buildPhase = '' - cd */lib + runHook preBuild + + pushd lib sed -i -e "s/more/cat/" jsapi.sh echo y | sh jsapi.sh - cd .. + popd + ln -s . src ant + + runHook postBuild ''; + installPhase = '' - install -v -m755 -d $out/{lib,docs/{audio,images}} - install -v -m644 lib/*.jar $out/lib + runHook preInstall + install -Dm644 lib/*.jar -t $out/lib + runHook postInstall ''; meta = { @@ -32,8 +52,12 @@ stdenv.mkDerivation rec { Text to speech system based on Festival written in Java. Can be used in combination with KDE accessibility. ''; - license = "GPL"; homepage = "http://freetts.sourceforge.net"; - maintainers = [ lib.maintainers.sander ]; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ sander ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # jsapi.jar is bundled in a self-extracting shell-script + ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/freetype/default.nix b/nixpkgs/pkgs/development/libraries/freetype/default.nix index 68e08a1a8b5f..1a8009f04ce7 100644 --- a/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A font rendering engine"; + mainProgram = "freetype-config"; longDescription = '' FreeType is a portable and efficient library for rendering fonts. It supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR diff --git a/nixpkgs/pkgs/development/libraries/fribidi/default.nix b/nixpkgs/pkgs/development/libraries/fribidi/default.nix index 5672ff5375bb..d23cd352360b 100644 --- a/nixpkgs/pkgs/development/libraries/fribidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/fribidi/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/fribidi/fribidi"; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; + mainProgram = "fribidi"; license = licenses.lgpl21; platforms = platforms.unix; pkgConfigModules = [ "fribidi" ]; diff --git a/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix b/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix index 2dfa02e71059..ab7f410eddf2 100644 --- a/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Make fuzzy comparisons of strings and byte arrays"; + mainProgram = "fstrcmp"; longDescription = '' The fstrcmp project provides a library that is used to make fuzzy comparisons of strings and byte arrays, including multi-byte character diff --git a/nixpkgs/pkgs/development/libraries/funambol/default.nix b/nixpkgs/pkgs/development/libraries/funambol/default.nix index 3e7bf0d21a2b..1ee66e008fef 100644 --- a/nixpkgs/pkgs/development/libraries/funambol/default.nix +++ b/nixpkgs/pkgs/development/libraries/funambol/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SyncML client sdk by Funambol project"; homepage = "https://www.funambol.com"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix b/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix index a3f70c062e86..1fd6d6506c28 100644 --- a/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix +++ b/nixpkgs/pkgs/development/libraries/fuzzylite/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fuzzy logic control library in C++"; + mainProgram = "fuzzylite"; homepage = "https://fuzzylite.com"; changelog = "https://github.com/fuzzylite/fuzzylite/${src.rev}/release/CHANGELOG"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/development/libraries/ganv/default.nix b/nixpkgs/pkgs/development/libraries/ganv/default.nix index d53206ca667b..32318e1fc0fc 100644 --- a/nixpkgs/pkgs/development/libraries/ganv/default.nix +++ b/nixpkgs/pkgs/development/libraries/ganv/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; + mainProgram = "ganv_bench"; homepage = "http://drobilla.net"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; diff --git a/nixpkgs/pkgs/development/libraries/gcab/default.nix b/nixpkgs/pkgs/development/libraries/gcab/default.nix index b31e93553766..6136564e5412 100644 --- a/nixpkgs/pkgs/development/libraries/gcab/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcab/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GObject library to create cabinet files"; + mainProgram = "gcab"; homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/gcr/4.nix b/nixpkgs/pkgs/development/libraries/gcr/4.nix index 650d87958c5e..243663e430d5 100644 --- a/nixpkgs/pkgs/development/libraries/gcr/4.nix +++ b/nixpkgs/pkgs/development/libraries/gcr/4.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; + mainProgram = "gcr-viewer-gtk4"; homepage = "https://gitlab.gnome.org/GNOME/gcr"; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/gcr/default.nix b/nixpkgs/pkgs/development/libraries/gcr/default.nix index 1fec6100bf2b..5a388246c154 100644 --- a/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -106,6 +106,7 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; + mainProgram = "gcr-viewer"; homepage = "https://gitlab.gnome.org/GNOME/gcr"; license = licenses.lgpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 5d0fc7a65706..6c298ac0e1d9 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -2,6 +2,7 @@ , stdenv , callPackage , fetchFromGitHub +, fetchpatch , useMinimalFeatures ? false , useTiledb ? (!useMinimalFeatures) && !(stdenv.isDarwin && stdenv.isx86_64) @@ -88,6 +89,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-R9VLof13OXPbWGHOG1Q4WZWSPoF739C6WuNWxoIwKTw="; }; + patches = [ + # bump java source option to fix build with JDK 21 + (fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/ca2eb4130750b0e6365f738a5f8ff77081f5c5bb.patch"; + sha256 = "sha256-wShYm9yA7twJR72co+Tvf/IuYXqbI0OrjWl0uqC3bwo="; + }) + ]; + nativeBuildInputs = [ bison cmake @@ -225,18 +234,19 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = with python3.pkgs; [ pytestCheckHook + pytest-benchmark pytest-env filelock lxml ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; disabledTestPaths = [ # tests that attempt to make network requests "gcore/vsis3.py" "gdrivers/gdalhttp.py" "gdrivers/wms.py" - - # disable benchmarks - "benchmark/*" ]; disabledTests = [ # tests that attempt to make network requests diff --git a/nixpkgs/pkgs/development/libraries/gdome2/default.nix b/nixpkgs/pkgs/development/libraries/gdome2/default.nix index 5aa1c487b4f9..f71753b479d7 100644 --- a/nixpkgs/pkgs/development/libraries/gdome2/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdome2/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://gdome2.cs.unibo.it/"; description = "DOM C library developed for the Gnome project"; + mainProgram = "gdome-config"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ prikhi roconnor ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/geos/3.9.nix b/nixpkgs/pkgs/development/libraries/geos/3.9.nix index cc3025928c80..4ca53e36971b 100644 --- a/nixpkgs/pkgs/development/libraries/geos/3.9.nix +++ b/nixpkgs/pkgs/development/libraries/geos/3.9.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; + mainProgram = "geos-config"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; pkgConfigModules = [ "geos" ]; diff --git a/nixpkgs/pkgs/development/libraries/getdns/default.nix b/nixpkgs/pkgs/development/libraries/getdns/default.nix index 0a6f34eab6cc..95844e36f3a0 100644 --- a/nixpkgs/pkgs/development/libraries/getdns/default.nix +++ b/nixpkgs/pkgs/development/libraries/getdns/default.nix @@ -78,6 +78,7 @@ in rec { meta = with lib; metaCommon // { description = "A local DNS Privacy stub resolver (using DNS-over-TLS)"; + mainProgram = "stubby"; longDescription = '' Stubby is an application that acts as a local DNS Privacy stub resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS diff --git a/nixpkgs/pkgs/development/libraries/gflags/default.nix b/nixpkgs/pkgs/development/libraries/gflags/default.nix index a690d8f2e154..3f07a67cbdae 100644 --- a/nixpkgs/pkgs/development/libraries/gflags/default.nix +++ b/nixpkgs/pkgs/development/libraries/gflags/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C++ library that implements commandline flags processing"; + mainProgram = "gflags_completions.sh"; longDescription = '' The gflags package contains a C++ library that implements commandline flags processing. As such it's a replacement for getopt(). diff --git a/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix index 162a64eeb5da..878f6bf97cff 100644 --- a/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/ggz_base_libs/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GGZ Gaming zone libraries"; + mainProgram = "ggz-config"; maintainers = with maintainers; [ raskin diff --git a/nixpkgs/pkgs/development/libraries/giflib/4.1.nix b/nixpkgs/pkgs/development/libraries/giflib/4.1.nix deleted file mode 100644 index 8f3ebcf7d3be..000000000000 --- a/nixpkgs/pkgs/development/libraries/giflib/4.1.nix +++ /dev/null @@ -1,21 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "giflib"; - version = "4.1.6"; - - src = fetchurl { - url = "mirror://sourceforge/giflib/giflib-${version}.tar.bz2"; - sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1"; - }; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - description = "A library for reading and writing gif images"; - branch = "4.1"; - license = licenses.mit; - platforms = platforms.unix; - }; -} - diff --git a/nixpkgs/pkgs/development/libraries/giflib/CVE-2021-40633.patch b/nixpkgs/pkgs/development/libraries/giflib/CVE-2021-40633.patch new file mode 100644 index 000000000000..8a665bb1638b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/giflib/CVE-2021-40633.patch @@ -0,0 +1,26 @@ +From ccbc956432650734c91acb3fc88837f7b81267ff Mon Sep 17 00:00:00 2001 +From: "Eric S. Raymond" <esr@thyrsus.com> +Date: Wed, 21 Feb 2024 18:55:00 -0500 +Subject: [PATCH] Clean up memory better at end of run (CVE-2021-40633) + +--- + gif2rgb.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/gif2rgb.c b/gif2rgb.c +index d51226d..fc2e683 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -517,6 +517,9 @@ static void GIF2RGB(int NumFiles, char *FileName, bool OneFileFlag, + DumpScreen2RGB(OutFileName, OneFileFlag, ColorMap, ScreenBuffer, + GifFile->SWidth, GifFile->SHeight); + ++ for (i = 0; i < GifFile->SHeight; i++) { ++ (void)free(ScreenBuffer[i]); ++ } + (void)free(ScreenBuffer); + + { +-- +2.44.0 + diff --git a/nixpkgs/pkgs/development/libraries/giflib/default.nix b/nixpkgs/pkgs/development/libraries/giflib/default.nix index 8c8a587ed548..a73d12061250 100644 --- a/nixpkgs/pkgs/development/libraries/giflib/default.nix +++ b/nixpkgs/pkgs/development/libraries/giflib/default.nix @@ -4,31 +4,20 @@ , fetchpatch , fixDarwinDylibNames , pkgsStatic +, imagemagick_light }: stdenv.mkDerivation rec { pname = "giflib"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "mirror://sourceforge/giflib/giflib-${version}.tar.gz"; - sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; + hash = "sha256-vn/70FfK3r4qoURUL9kMaDjGoIO16KkEi47jtmsp1fs="; }; patches = [ - (fetchpatch { - name = "CVE-2022-28506.patch"; - url = "https://src.fedoraproject.org/rpms/giflib/raw/2e9917bf13df114354163f0c0211eccc00943596/f/CVE-2022-28506.patch"; - sha256 = "sha256-TBemEXkuox8FdS9RvjnWcTWPaHRo4crcwSR9czrUwBY="; - }) - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # https://sourceforge.net/p/giflib/bugs/133/ - (fetchpatch { - name = "darwin-soname.patch"; - url = "https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/c323/attachment/Makefile.patch"; - sha256 = "12afkqnlkl3n1hywwgx8sqnhp3bz0c5qrwcv8j9hifw1lmfhv67r"; - extraPrefix = "./"; - }) + ./CVE-2021-40633.patch ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # Build dll libraries. (fetchurl { @@ -40,7 +29,9 @@ stdenv.mkDerivation rec { ./mingw-install-exes.patch ]; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ + imagemagick_light + ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; @@ -50,10 +41,11 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' # Upstream build system does not support NOT building shared libraries. - sed -i '/all:/ s/libgif.so//' Makefile - sed -i '/all:/ s/libutil.so//' Makefile - sed -i '/-m 755 libgif.so/ d' Makefile - sed -i '/ln -sf libgif.so/ d' Makefile + sed -i '/all:/ s/$(LIBGIFSO)//' Makefile + sed -i '/all:/ s/$(LIBUTILSO)//' Makefile + sed -i '/-m 755 $(LIBGIFSO)/ d' Makefile + sed -i '/ln -sf $(LIBGIFSOVER)/ d' Makefile + sed -i '/ln -sf $(LIBGIFSOMAJOR)/ d' Makefile ''; passthru.tests = { @@ -63,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for reading and writing gif images"; homepage = "https://giflib.sourceforge.net/"; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix ++ lib.platforms.windows; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; branch = "5.2"; diff --git a/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix b/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix index aae958518661..bf12d2c48948 100644 --- a/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ken-matsui/git2-cpp"; description = "libgit2 bindings for C++"; license = licenses.mit; - maintainers = with maintainers; [ ken-matsui ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix index c38419bed52b..a7b1eaa43831 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmpxx ]; configureFlags = [ - "--disable-optimization" + "--without-archnative" ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library for arithmetic and algebraic computations"; + mainProgram = "givaro-config"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 9a5569cd1543..7c14141554fb 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -9,7 +9,7 @@ , pkg-config , perl , python3 -, libiconv, zlib, libffi, pcre2, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt +, libiconv, zlib, libffi, pcre2, elfutils, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null , buildPackages @@ -110,11 +110,12 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; buildInputs = [ - libelf finalAttrs.setupHook pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ] ++ lib.optionals stdenv.isLinux [ libselinux util-linuxMinimal # for libmount @@ -158,6 +159,8 @@ stdenv.mkDerivation (finalAttrs: { "-Dgtk_doc=${lib.boolToString buildDocs}" "-Dnls=enabled" "-Ddevbindir=${placeholder "dev"}/bin" + ] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [ + "-Dlibelf=disabled" ] ++ lib.optionals (!stdenv.isDarwin) [ "-Dman=true" # broken on Darwin ] ++ lib.optionals stdenv.isFreeBSD [ diff --git a/nixpkgs/pkgs/development/libraries/glibc/mtrace.nix b/nixpkgs/pkgs/development/libraries/glibc/mtrace.nix index 4dbcb19af2a4..926c0d91cdf0 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/mtrace.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/mtrace.nix @@ -36,5 +36,6 @@ glibc.overrideAttrs (oldAttrs: { 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)."; + mainProgram = "mtrace"; }; }) diff --git a/nixpkgs/pkgs/development/libraries/gloox/default.nix b/nixpkgs/pkgs/development/libraries/gloox/default.nix index b4cd3ca75ee1..7bf1bfb4bd16 100644 --- a/nixpkgs/pkgs/development/libraries/gloox/default.nix +++ b/nixpkgs/pkgs/development/libraries/gloox/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec{ meta = with lib; { description = "A portable high-level Jabber/XMPP library for C++"; + mainProgram = "gloox-config"; homepage = "http://camaya.net/gloox"; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix index 6cdc54acd290..aee2056a8563 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitLab +, fetchurl , pkg-config , vala , glib @@ -30,18 +30,15 @@ , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.48.0"; + version = "3.48.1"; outputs = [ "out" "dev" ] ++ lib.optionals enableBackend [ "man" "devdoc" ]; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "gnome-online-accounts"; - rev = version; - sha256 = "sha256-USl0Qay9pSgbbp3n/L8eBaRQwaBYledht5j+afmo++o="; + src = fetchurl { + url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; + hash = "sha256-PqDHEIS/WVzOXKo3zv8uhT0OyWRLsB/UZDMArblRf4o="; }; mesonFlags = [ @@ -91,7 +88,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { versionPolicy = "odd-unstable"; - packageName = pname; + packageName = "gnome-online-accounts"; }; }; @@ -102,4 +99,4 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = teams.gnome.members; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 85ec3352f705..48df439a1efb 100644 --- a/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/GrapheneOS/hardened_malloc"; description = "Hardened allocator designed for modern systems"; + mainProgram = "preload-hardened-malloc"; longDescription = '' This is a security-focused general purpose memory allocator providing the malloc API along with various extensions. It provides substantial hardening against heap diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index ba1a4a8c123e..1e8804237b99 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.62.0"; # N.B: if you change this, please update: + version = "1.62.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-iqoxgo/oocO9gBq0o5bmZvre/EwRguMrWnmwvyLGLr8="; + hash = "sha256-L0bn6Bg36UKIRxznH9o4T7WXUqMwFjr8ybeQfbUi8xM="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/gsasl/default.nix b/nixpkgs/pkgs/development/libraries/gsasl/default.nix index 3dc5c128fc37..787c096fea4f 100644 --- a/nixpkgs/pkgs/development/libraries/gsasl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsasl/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GNU SASL, Simple Authentication and Security Layer library"; + mainProgram = "gsasl"; longDescription = '' GNU SASL is a library that implements the IETF Simple diff --git a/nixpkgs/pkgs/development/libraries/gsignond/default.nix b/nixpkgs/pkgs/development/libraries/gsignond/default.nix index 912054eb85c3..863ac7ba4bb2 100644 --- a/nixpkgs/pkgs/development/libraries/gsignond/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsignond/default.nix @@ -52,6 +52,7 @@ unwrapped = stdenv.mkDerivation rec { meta = with lib; { description = "D-Bus service which performs user authentication on behalf of its clients"; + mainProgram = "gsignond"; homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/gsound/default.nix b/nixpkgs/pkgs/development/libraries/gsound/default.nix index 6c5c98b77d7f..3c7049e92efe 100644 --- a/nixpkgs/pkgs/development/libraries/gsound/default.nix +++ b/nixpkgs/pkgs/development/libraries/gsound/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GSound"; description = "Small library for playing system sounds"; + mainProgram = "gsound-play"; maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/gspell/default.nix b/nixpkgs/pkgs/development/libraries/gspell/default.nix index c4d15352020a..f1b8733cf84b 100644 --- a/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A spell-checking library for GTK applications"; + mainProgram = "gspell-app1"; homepage = "https://wiki.gnome.org/Projects/gspell"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/gss/default.nix b/nixpkgs/pkgs/development/libraries/gss/default.nix index 3eacad32f813..883d68d42c6a 100644 --- a/nixpkgs/pkgs/development/libraries/gss/default.nix +++ b/nixpkgs/pkgs/development/libraries/gss/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnu.org/software/gss/"; description = "Generic Security Service"; + mainProgram = "gss"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/gssdp/tools.nix b/nixpkgs/pkgs/development/libraries/gssdp/tools.nix index 5fcd0219a945..1d5d25e6ef4f 100644 --- a/nixpkgs/pkgs/development/libraries/gssdp/tools.nix +++ b/nixpkgs/pkgs/development/libraries/gssdp/tools.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Device Sniffer tool based on GSSDP framework"; + mainProgram = "gssdp-device-sniffer"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; maintainers = gssdp_1_6.meta.maintainers; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index bee80e03289c..bec1cb762ce4 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -354,6 +354,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GStreamer Bad Plugins"; + mainProgram = "gst-transcoder-1.0"; homepage = "https://gstreamer.freedesktop.org"; longDescription = '' a set of plug-ins that aren't up to par compared to the diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index bf5dddf5a732..adb737bb1be7 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for creation of audio/video non-linear editors"; + mainProgram = "ges-launch-1.0"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index 708a735939af..eeef11e9a464 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -248,6 +248,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GStreamer plugins written in Rust"; + mainProgram = "gst-webrtc-signalling-server"; homepage = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"; license = with licenses; [ mpl20 asl20 mit lgpl21Plus ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/gtdialog/default.nix b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix index d7e60659a5ea..6a09d8cbe9e2 100644 --- a/nixpkgs/pkgs/development/libraries/gtdialog/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtdialog/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform helper for creating interactive dialogs"; + mainProgram = "gtdialog"; license = licenses.mit; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index 5ecfc299edd4..c137eb608132 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A 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; maintainers = with maintainers; [ eonpatapon donovanglover ]; diff --git a/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix b/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix index d69970193080..e41735fb7129 100644 --- a/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -58,6 +58,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"; + mainProgram = "gtk4-layer-demo"; license = licenses.mit; maintainers = with maintainers; [ donovanglover ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix b/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix index eb33748c4589..44ae478e42f5 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp/1.6.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.gupnp.org/"; description = "An implementation of the UPnP specification"; + mainProgram = "gupnp-binding-tool-1.6"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/gupnp/default.nix b/nixpkgs/pkgs/development/libraries/gupnp/default.nix index 4a8b250d2644..d9e9f483a63b 100644 --- a/nixpkgs/pkgs/development/libraries/gupnp/default.nix +++ b/nixpkgs/pkgs/development/libraries/gupnp/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.gupnp.org/"; description = "An implementation of the UPnP specification"; + mainProgram = "gupnp-binding-tool-1.2"; license = licenses.lgpl2Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/gusb/default.nix b/nixpkgs/pkgs/development/libraries/gusb/default.nix index d6fe70440132..515eeb7de975 100644 --- a/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GLib libusb wrapper"; + mainProgram = "gusbcmd"; homepage = "https://github.com/hughsie/libgusb"; license = licenses.lgpl21; maintainers = [ maintainers.marcweber ]; diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 814b6042544c..72ec69bc177b 100644 --- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "An OpenType text shaping engine"; homepage = "https://harfbuzz.github.io/"; - changelog = "https://github.com/harfbuzz/harfbuzz/raw/${version}/NEWS"; + changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS"; maintainers = [ maintainers.eelco ]; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; diff --git a/nixpkgs/pkgs/development/libraries/hotpatch/default.nix b/nixpkgs/pkgs/development/libraries/hotpatch/default.nix index 66be524a86ca..7dcf09c5c5b2 100644 --- a/nixpkgs/pkgs/development/libraries/hotpatch/default.nix +++ b/nixpkgs/pkgs/development/libraries/hotpatch/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Hot patching executables on Linux using .so file injection"; + mainProgram = "hotpatcher"; homepage = src.meta.homepage; license = licenses.bsd3; maintainers = [ ]; diff --git a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix index 41e86b275fe4..f42674e902f0 100644 --- a/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; + mainProgram = "htmlcxx"; license = licenses.lgpl2; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/hyphen/default.nix b/nixpkgs/pkgs/development/libraries/hyphen/default.nix index ed3980f7a90d..122834570cfa 100644 --- a/nixpkgs/pkgs/development/libraries/hyphen/default.nix +++ b/nixpkgs/pkgs/development/libraries/hyphen/default.nix @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A text hyphenation library"; + mainProgram = "substrings.pl"; homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/"; platforms = platforms.all; license = with licenses; [ gpl2 lgpl21 mpl11 ]; diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 58eba3ddc6d9..6d21c7bc6e1a 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.17"; + version = "22.3.18"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-9utlENByIQSayKTdSJapLBWMI2gFpOReNZe7bpbEoj8="; + sha256 = "sha256-woEYEgvwf12aWCeYqSiosQAUJErGaEP3q8JER971lys="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index b20b6782d9b0..506281a7e6e9 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Intel Media SDK"; + mainProgram = "mfx-tracer-config"; license = licenses.mit; maintainers = with maintainers; [ midchildan ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix index 43db1ac56b09..0e74478982f3 100644 --- a/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to look up locations of host names and IP addresses"; + mainProgram = "ip2location"; longDescription = '' A C library to find the country, region, city,coordinates, zip code, time zone, ISP, domain name, connection type, area code, diff --git a/nixpkgs/pkgs/development/libraries/isa-l/default.nix b/nixpkgs/pkgs/development/libraries/isa-l/default.nix index d81f1120742a..88fcbc04d586 100644 --- a/nixpkgs/pkgs/development/libraries/isa-l/default.nix +++ b/nixpkgs/pkgs/development/libraries/isa-l/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A collection of optimised low-level functions targeting storage applications"; + mainProgram = "igzip"; license = licenses.bsd3; homepage = "https://github.com/intel/isa-l"; maintainers = with maintainers; [ jbedo ]; diff --git a/nixpkgs/pkgs/development/libraries/itk/generic.nix b/nixpkgs/pkgs/development/libraries/itk/generic.nix index 652fce4a6797..be59969aaecb 100644 --- a/nixpkgs/pkgs/development/libraries/itk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/itk/generic.nix @@ -109,6 +109,7 @@ stdenv.mkDerivation { meta = { description = "Insight Segmentation and Registration Toolkit"; + mainProgram = "itkTestDriver"; homepage = "https://www.itk.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [viric]; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix index 7827c1788dca..4a226a22c4de 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.26.0"; + version = "1.26.1"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-AXdkqMrzTtURpPXKOmXxo0RnfFtflcDf6mmVmqVFz5k="; + sha256 = "sha256-PVZ4hltIprOeT3UEH3+xJ+TcZLekHV7cuw16rMmx/Rk="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix index 71832498c34a..085efc6e52b5 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "commons-logging"; - version = "1.2"; + version = "1.3.0"; src = fetchurl { url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz"; - sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z"; + sha256 = "sha256-ij6jOi1Y/iQ/9Ht41nKtmOdZCvf0NmNseFGxBpyq1fg="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/cup/default.nix b/nixpkgs/pkgs/development/libraries/java/cup/default.nix index 2f673a8e5a67..65df9d6cfa22 100644 --- a/nixpkgs/pkgs/development/libraries/java/cup/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/cup/default.nix @@ -4,7 +4,7 @@ , ant , jdk , makeWrapper -, canonicalize-jars-hook +, stripJavaArchivesHook }: stdenv.mkDerivation (finalAttrs: { @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk makeWrapper - canonicalize-jars-hook + stripJavaArchivesHook ]; buildPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 96b6cd05ed1a..8f7282df0bb2 100644 --- a/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , ant , jdk -, canonicalize-jars-hook +, stripJavaArchivesHook }: stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ant jdk - canonicalize-jars-hook + stripJavaArchivesHook ]; buildPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/jflex/default.nix b/nixpkgs/pkgs/development/libraries/java/jflex/default.nix index 90e4d4329d5e..3a55febff294 100644 --- a/nixpkgs/pkgs/development/libraries/java/jflex/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/jflex/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jflex.de/"; description = "Lexical analyzer generator for Java, written in Java"; + mainProgram = "jflex"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index 017f0581dc93..f08c860f57f6 100644 --- a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.30"; + version = "1.18.32"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-1+4SLu4erutFGCqJ/zb8LdCGhY0bL1S2Fcb+97odYBI="; + sha256 = "sha256-l1dGdOKiX1Z6MTc2rOAN+Hh9RD3jFkB9V/yHfZ8Zpl0="; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A library that can write a lot of boilerplate for your Java project"; + mainProgram = "lombok"; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/java/swt/default.nix b/nixpkgs/pkgs/development/libraries/java/swt/default.nix index 4c900ed21ac6..2d3f4eeb6575 100644 --- a/nixpkgs/pkgs/development/libraries/java/swt/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/swt/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, canonicalize-jars-hook +, stripJavaArchivesHook , fetchzip , pkg-config , atk @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - canonicalize-jars-hook + stripJavaArchivesHook pkg-config ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix index af99944dae72..f0938df820bf 100644 --- a/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix +++ b/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.jbig2dec.com/"; description = "Decoder implementation of the JBIG2 image compression format"; - license = lib.licenses.agpl3; + mainProgram = "jbig2dec"; + license = lib.licenses.agpl3Only; platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index fdce5118e6b3..750a5aa8d002 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -3,16 +3,20 @@ , lib }: -ffmpeg_6-full.overrideAttrs (old: rec { - pname = "jellyfin-ffmpeg"; +let version = "6.0.1-3"; +in - src = fetchFromGitHub { +(ffmpeg_6-full.override { + inherit version; # Important! This sets the ABI. + source = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; hash = "sha256-UINiXO61nB/AL0HJJy7G7emujakk/mQv81aUioyJz0Y="; }; +}).overrideAttrs (old: { + pname = "jellyfin-ffmpeg"; # Clobber upstream patches as they don't apply to the Jellyfin fork patches = []; diff --git a/nixpkgs/pkgs/development/libraries/jemalloc/default.nix b/nixpkgs/pkgs/development/libraries/jemalloc/default.nix index 8a3b8658fbb8..902c0d77739c 100644 --- a/nixpkgs/pkgs/development/libraries/jemalloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/jemalloc/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { ; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; - env.NIX_LDFLAGS = lib.optionalString (stdenv.cc.libcxx != null) "-l${stdenv.cc.libcxx.cxxabi.libName}"; # Tries to link test binaries binaries dynamically and fails doCheck = !stdenv.hostPlatform.isStatic; diff --git a/nixpkgs/pkgs/development/libraries/jose/default.nix b/nixpkgs/pkgs/development/libraries/jose/default.nix index 795fb8244c85..656b014b733d 100644 --- a/nixpkgs/pkgs/development/libraries/jose/default.nix +++ b/nixpkgs/pkgs/development/libraries/jose/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "C-language implementation of Javascript Object Signing and Encryption"; + mainProgram = "jose"; homepage = "https://github.com/latchset/jose"; maintainers = with lib.maintainers; [ ]; license = lib.licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/json-fortran/default.nix b/nixpkgs/pkgs/development/libraries/json-fortran/default.nix index 422248520fc4..410a767f9991 100644 --- a/nixpkgs/pkgs/development/libraries/json-fortran/default.nix +++ b/nixpkgs/pkgs/development/libraries/json-fortran/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "json-fortran"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "jacobwilliams"; repo = pname; rev = version; - hash = "sha256-96W9bzWEZ3EN4wtnDT3G3pvLdcI4SIhGJWBVPU3rNZ4="; + hash = "sha256-qy3CK8Op3YVNpXjq60UYq9V9qWBEXpX/li/lYxXW9Fk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/kdb/default.nix b/nixpkgs/pkgs/development/libraries/kdb/default.nix index f9aa5dc369c6..d3688442f898 100644 --- a/nixpkgs/pkgs/development/libraries/kdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdb/default.nix @@ -42,6 +42,7 @@ mkDerivation rec { meta = with lib; { description = "A database connectivity and creation framework for various database vendors"; + mainProgram = "kdb3_sqlite3_dump"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; diff --git a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 57fe21a27c7b..330657f41fd0 100644 --- a/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Official Khronos OpenCL ICD Loader"; + mainProgram = "cllayerinfo"; homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; maintainers = with maintainers; [ davidtwco ]; diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix b/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix index 6cc5bcade205..ec7129396540 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/libfolia.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; + mainProgram = "folialint"; homepage = "https://proycon.github.io/folia/"; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix b/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix index 1585798170b3..e1884e56132d 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/timbl.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "TiMBL implements several memory-based learning algorithms"; + mainProgram = "timbl"; homepage = "https://github.com/LanguageMachines/timbl/"; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix b/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix index f707d9fb8b6e..6a3e31bcd553 100644 --- a/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix +++ b/nixpkgs/pkgs/development/libraries/languagemachines/ucto.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A rule-based tokenizer for natural language"; + mainProgram = "ucto"; homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/lasem/default.nix b/nixpkgs/pkgs/development/libraries/lasem/default.nix index 9c49429ece45..80a5fc0e24d0 100644 --- a/nixpkgs/pkgs/development/libraries/lasem/default.nix +++ b/nixpkgs/pkgs/development/libraries/lasem/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "SVG and MathML rendering library"; + mainProgram = "lasem-render-0.4"; homepage = "https://wiki.gnome.org/Projects/Lasem"; license = lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/libaacs/default.nix b/nixpkgs/pkgs/development/libraries/libaacs/default.nix index a270051f48ab..c0d3b91885e6 100644 --- a/nixpkgs/pkgs/development/libraries/libaacs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaacs/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; + mainProgram = "aacs_info"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux; diff --git a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index c46d69efbdc8..bb520e7c2274 100644 --- a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.4.3"; + version = "1.4.4"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-ctHAN0SY6k68jaBpmIpMm8DngC9DPiL1vAmGhECpNic="; + hash = "sha256-AZP5OH/LIroBeKioe7AIVx0FvFdTpWJ1INdRPZcjmHQ="; }; depsBuildBuild = [ @@ -78,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { # not ok /Adwaita/ButtonContent/style_class_button - Gdk-FATAL-CRITICAL: # gdk_macos_monitor_get_workarea: assertion 'GDK_IS_MACOS_MONITOR (self)' failed doCheck = !stdenv.isDarwin; + separateDebugInfo = true; checkPhase = '' runHook preCheck @@ -117,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { changelog = "https://gitlab.gnome.org/GNOME/libadwaita/-/blob/${finalAttrs.src.rev}/NEWS"; description = "Library to help with developing UI for mobile devices using GTK/GNOME"; + mainProgram = "adwaita-1-demo"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]); diff --git a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix index c54a7957f436..e365479f90a5 100644 --- a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix +++ b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Tests for libagar"; + mainProgram = "agartest"; homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; maintainers = with maintainers; [ ramkromberg ]; diff --git a/nixpkgs/pkgs/development/libraries/libajantv2/default.nix b/nixpkgs/pkgs/development/libraries/libajantv2/default.nix index d0d94c2d125a..89d609b327ab 100644 --- a/nixpkgs/pkgs/development/libraries/libajantv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libajantv2/default.nix @@ -6,6 +6,9 @@ , pkg-config }: +# Warning: We are aware that the upstream changed and there are new releases, +# this got initally packaged for obs-studio which appears to fail to build even upstream with the new version. +# https://github.com/NixOS/nixpkgs/pull/296191 / https://github.com/obsproject/obs-studio/pull/10037 stdenv.mkDerivation rec { pname = "libajantv2"; version = "16.2-bugfix5"; @@ -29,7 +32,7 @@ stdenv.mkDerivation rec { description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against"; homepage = "https://github.com/aja-video/ntv2"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ sebtm ]; + maintainers = with maintainers; []; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/libarchive-qt/default.nix b/nixpkgs/pkgs/development/libraries/libarchive-qt/default.nix index 14608b9f970d..77f498967ecc 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive-qt/default.nix @@ -26,6 +26,7 @@ mkDerivation rec { meta = with lib; { description = "A Qt based archiving solution with libarchive backend"; + mainProgram = "archiver"; homepage = "https://gitlab.com/marcusbritanicus/libarchive-qt"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ dan4ik605743 ]; diff --git a/nixpkgs/pkgs/development/libraries/libassuan/default.nix b/nixpkgs/pkgs/development/libraries/libassuan/default.nix index 60c13040ae5e..9998bfdceb7b 100644 --- a/nixpkgs/pkgs/development/libraries/libassuan/default.nix +++ b/nixpkgs/pkgs/development/libraries/libassuan/default.nix @@ -1,12 +1,12 @@ -{ fetchurl, lib, stdenv, gettext, npth, libgpg-error, buildPackages }: +{ fetchurl, lib, stdenv, gettext, npth, libgpg-error, buildPackages, gitUpdater }: stdenv.mkDerivation rec { pname = "libassuan"; - version = "2.5.6"; + version = "2.5.7"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-6f0nIY1TlJBOTjl4j5sXQnEcPmtBaJoxqjOAvVqk9CY="; + sha256 = "sha256-AQMIH/wng4ouUEeRU8oQXoc9PWXYqVkygunJTH5q+3Y="; }; outputs = [ "out" "dev" "info" ]; @@ -27,15 +27,23 @@ stdenv.mkDerivation rec { sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' $dev/include/assuan.h ''; + passthru.updateScript = gitUpdater { + url = "https://dev.gnupg.org/source/libassuan.git"; + rev-prefix = "libassuan-"; + ignoredVersions = ".*-base"; + }; + meta = with lib; { description = "IPC library used by GnuPG and related software"; + mainProgram = "libassuan-config"; longDescription = '' Libassuan is a small library implementing the so-called Assuan protocol. This protocol is used for IPC between most newer GnuPG components. Both, server and client side functions are provided. ''; - homepage = "http://gnupg.org"; + homepage = "https://gnupg.org/software/libassuan/"; + changelog = "https://dev.gnupg.org/source/libassuan/browse/master/NEWS;libassuan-${version}"; license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libast/default.nix b/nixpkgs/pkgs/development/libraries/libast/default.nix index f4dae188f31c..49db79aaf978 100644 --- a/nixpkgs/pkgs/development/libraries/libast/default.nix +++ b/nixpkgs/pkgs/development/libraries/libast/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; description = "Library of Assorted Spiffy Things"; + mainProgram = "libast-config"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libbson/default.nix b/nixpkgs/pkgs/development/libraries/libbson/default.nix deleted file mode 100644 index e03d7c194847..000000000000 --- a/nixpkgs/pkgs/development/libraries/libbson/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchFromGitHub, perl, lib, stdenv, cmake }: - -stdenv.mkDerivation rec { - pname = "libbson"; - version = "1.9.5"; - - src = fetchFromGitHub { - owner = "mongodb"; - repo = "libbson"; - rev = version; - sha256 = "16rmzxhhmbvhp4q6qac5j9c74z2pcg5raag5w16mynzikdd2l05b"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ perl ]; - - meta = with lib; { - description = "A C Library for parsing, editing, and creating BSON documents"; - homepage = "https://github.com/mongodb/libbson"; - license = licenses.asl20; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix index 6604bb322294..08fc56931250 100644 --- a/nixpkgs/pkgs/development/libraries/libbytesize/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbytesize/default.nix @@ -49,6 +49,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"; + mainProgram = "bscalc"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libcanberra/default.nix b/nixpkgs/pkgs/development/libraries/libcanberra/default.nix index cda60e4d215f..684c6d9d242e 100644 --- a/nixpkgs/pkgs/development/libraries/libcanberra/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcanberra/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An 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 Specifications, for generating event sounds on free desktops diff --git a/nixpkgs/pkgs/development/libraries/libcdada/default.nix b/nixpkgs/pkgs/development/libraries/libcdada/default.nix index e78d845cf5be..5d1d295f74a8 100644 --- a/nixpkgs/pkgs/development/libraries/libcdada/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.4.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - hash = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; + hash = "sha256-rrBmsXBatvaf/u/UVHpTm9YUo+gsQv1rtuprpRF/3kU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix b/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix index 134f9d7f8f33..fa873672dbcf 100644 --- a/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcdaudio/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A portable library for controlling audio CDs"; + mainProgram = "libcdaudio-config"; homepage = "https://libcdaudio.sourceforge.net"; platforms = lib.platforms.linux; license = lib.licenses.lgpl2; diff --git a/nixpkgs/pkgs/development/libraries/libchardet/default.nix b/nixpkgs/pkgs/development/libraries/libchardet/default.nix index 47ce911a6951..a362e8ab2bb7 100644 --- a/nixpkgs/pkgs/development/libraries/libchardet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libchardet/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; + mainProgram = "chardet-config"; homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html"; license = licenses.mpl11; maintainers = [ maintainers.abbradar ]; diff --git a/nixpkgs/pkgs/development/libraries/libcifpp/default.nix b/nixpkgs/pkgs/development/libraries/libcifpp/default.nix index 782844453a12..a41736004ecb 100644 --- a/nixpkgs/pkgs/development/libraries/libcifpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcifpp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "7.0.1"; + version = "7.0.3"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-13jJH7YFlnb9hltCo/3kygPkXoE3ZZwZkG/ezbOxE2w="; + hash = "sha256-YRK648gJ2UlgeG5GHMjTid1At0lYt7Zqu4/+O5WG/OM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libcork/default.nix b/nixpkgs/pkgs/development/libraries/libcork/default.nix index 305ba24e280e..87a068c24d1a 100644 --- a/nixpkgs/pkgs/development/libraries/libcork/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcork/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/dcreager/libcork"; description = "A simple, easily embeddable cross-platform C library"; + mainProgram = "cork-hash"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ lovesegfault ]; diff --git a/nixpkgs/pkgs/development/libraries/libcredis/default.nix b/nixpkgs/pkgs/development/libraries/libcredis/default.nix index e0224d865d55..3515bce2da20 100644 --- a/nixpkgs/pkgs/development/libraries/libcredis/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcredis/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C client library for Redis (key-value database)"; + mainProgram = "credis-test"; homepage = "https://code.google.com/archive/p/credis/"; license = licenses.bsd3; # from homepage platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libcryptui/default.nix b/nixpkgs/pkgs/development/libraries/libcryptui/default.nix index 89b7dfa66444..c0537e7e367b 100644 --- a/nixpkgs/pkgs/development/libraries/libcryptui/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcryptui/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Interface components for OpenPGP"; + mainProgram = "seahorse-daemon"; homepage = "https://gitlab.gnome.org/GNOME/libcryptui"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libctl/default.nix b/nixpkgs/pkgs/development/libraries/libctl/default.nix index d7fed2415df0..6969f6166beb 100644 --- a/nixpkgs/pkgs/development/libraries/libctl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libctl/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Guile-based library for supporting flexible control files in scientific simulations"; + mainProgram = "gen-ctl-io"; homepage = "https://github.com/NanoComp/libctl"; license = licenses.gpl2Only; maintainers = with maintainers; [ carpinchomug ]; diff --git a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix index 64351a85a9ae..9c090399dbc5 100644 --- a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.5"; + version = "0.20.2"; src = fetchFromGitHub { owner = "paullouisageneau"; - repo = pname; + repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-XTfe0NqDQWx4ISgEiUbzACH9csaG+IrUvwss07dnz80="; + hash = "sha256-bBSsD845iwCMA7TdMBxzezjNbMaGwvRq6rvY/8NLYRU="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index ec616b4a5fab..38ba2e3b3615 100644 --- a/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A 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 provides various features that we wish were in the underlying library but diff --git a/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix b/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix index 461a3c0b7bbd..f1352cd47b92 100644 --- a/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ libdbi sqlite postgresql ] ++ lib.optional (libmysqlclient != null) libmysqlclient; + patches = [ + # https://sourceforge.net/p/libdbi-drivers/libdbi-drivers/ci/24f48b86c8988ee3aaebc5f303d71e9d789f77b6 + ./libdbi-drivers-0.9.0-buffer_overflow.patch + ]; + postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; ''; @@ -41,6 +46,11 @@ stdenv.mkDerivation rec { "--with-pgsql_libdir=${postgresql.lib}/lib" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-function-pointer-types" + "-Wno-error=int-conversion" + ]); + installFlags = [ "DESTDIR=\${out}" ]; postInstall = '' diff --git a/nixpkgs/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch b/nixpkgs/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch new file mode 100644 index 000000000000..1891c1a143ba --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch @@ -0,0 +1,11 @@ +--- a/drivers/sqlite3/dbd_sqlite3.c ++++ b/drivers/sqlite3/dbd_sqlite3.c +@@ -1451,7 +1451,7 @@ static int getTables(char** tables, int + break; + } + +- word_lower[item-start+1]; ++ char word_lower[item-start+1]; + strncpy(word_lower,start,item-start); + word_lower[item-start] = '\0'; + int i = 0; diff --git a/nixpkgs/pkgs/development/libraries/libde265/default.nix b/nixpkgs/pkgs/development/libraries/libde265/default.nix index 6259fa5b4839..e4dfba60fe99 100644 --- a/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = { homepage = "https://github.com/strukturag/libde265"; description = "Open h.265 video codec implementation"; + mainProgram = "dec265"; license = lib.licenses.lgpl3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ gebner ]; diff --git a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix index 7aa0cef5a81d..52bf3a272bab 100644 --- a/nixpkgs/pkgs/development/libraries/libdeflate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeflate/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; homepage = "https://github.com/ebiggers/libdeflate"; changelog = "https://github.com/ebiggers/libdeflate/blob/v${finalAttrs.version}/NEWS.md"; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ orivej kaction ]; pkgConfigModules = [ "libdeflate" ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock index 551b2d30e951..ae5294d3104f 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -32,9 +32,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -115,15 +115,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" dependencies = [ "backtrace", ] @@ -159,7 +159,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.30", + "time 0.3.34", ] [[package]] @@ -198,12 +198,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", + "event-listener 5.2.0", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -224,12 +224,12 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.4" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d736a74edf6c327b53dd9c932eae834253470ac5f0c55770e7e133bcbf986362" +checksum = "98892ebee4c05fc66757e600a7466f0d9bfcde338f645d64add323789f26cb36" dependencies = [ - "async-channel 2.1.1", - "base64 0.21.5", + "async-channel 2.2.0", + "base64 0.21.7", "bytes", "chrono", "futures", @@ -284,13 +284,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -315,19 +315,20 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" dependencies = [ "async-trait", "axum-core", - "base64 0.21.5", - "bitflags 1.3.2", + "base64 0.21.7", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-util", "itoa", "matchit", "memchr", @@ -346,23 +347,28 @@ dependencies = [ "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -412,9 +418,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -445,9 +451,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "blake3" @@ -522,9 +528,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -532,25 +538,24 @@ dependencies = [ [[package]] name = "buffer-redux" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2886ea01509598caac116942abd33ab5a88fa32acdf7e4abfa0fc489ca520c9" +checksum = "4c9f8ddd22e0a12391d1e7ada69ec3b0da1914f1cec39c5cf977143c5b2854f5" dependencies = [ "memchr", - "safemem", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -585,9 +590,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -656,23 +661,23 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets", + "windows-targets 0.52.4", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -681,15 +686,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -707,18 +712,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.10" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.9" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstyle", "clap_lex", @@ -732,13 +737,11 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] @@ -755,18 +758,18 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" @@ -824,9 +827,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -839,9 +842,9 @@ checksum = "fd121741cf3eb82c08dd3023eb55bf2665e5f60ec20f89760cf836ae4562e6a0" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -886,36 +889,34 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" @@ -966,9 +967,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -989,7 +990,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -1087,20 +1088,21 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.131.9" +version = "1.136.3" dependencies = [ "ansi_term", "anyhow", - "async-channel 2.1.1", + "async-channel 2.2.0", "async-imap", "async-native-tls", "async-smtp", "async_zip", "backtrace", - "base64 0.21.5", + "base64 0.21.7", "brotli", "chrono", "criterion", + "deltachat-time", "deltachat_derive", "email", "encoded-words", @@ -1125,6 +1127,7 @@ dependencies = [ "num-traits", "num_cpus", "once_cell", + "openssl-src", "parking_lot", "percent-encoding", "pgp", @@ -1134,6 +1137,7 @@ dependencies = [ "proptest", "qrcodegen", "quick-xml", + "quoted_printable", "rand 0.8.5", "ratelimit", "regex", @@ -1165,12 +1169,12 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.131.9" +version = "1.136.3" dependencies = [ "anyhow", - "async-channel 2.1.1", + "async-channel 2.2.0", "axum", - "base64 0.21.5", + "base64 0.21.7", "deltachat", "env_logger", "futures", @@ -1189,7 +1193,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.131.9" +version = "1.136.3" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1208,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.131.9" +version = "1.136.3" dependencies = [ "anyhow", "deltachat", @@ -1220,16 +1224,20 @@ dependencies = [ ] [[package]] +name = "deltachat-time" +version = "1.0.0" + +[[package]] name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "deltachat_ffi" -version = "1.131.9" +version = "1.136.3" dependencies = [ "anyhow", "deltachat", @@ -1296,9 +1304,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -1411,7 +1419,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1433,7 +1441,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -1460,10 +1468,26 @@ dependencies = [ ] [[package]] +name = "dsa" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" +dependencies = [ + "digest 0.10.7", + "num-bigint-dig", + "num-traits", + "pkcs8 0.10.2", + "rfc6979 0.4.0", + "sha2 0.10.8", + "signature 2.2.0", + "zeroize", +] + +[[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -1488,7 +1512,7 @@ dependencies = [ "elliptic-curve 0.13.8", "rfc6979 0.4.0", "signature 2.2.0", - "spki 0.7.2", + "spki 0.7.3", ] [[package]] @@ -1528,11 +1552,11 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "ed25519 2.2.3", "serde", "sha2 0.10.8", @@ -1554,9 +1578,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -1600,8 +1624,8 @@ dependencies = [ [[package]] name = "email" -version = "0.0.21" -source = "git+https://github.com/deltachat/rust-email?branch=master#37778c89d5eb5a94b7983f3f37ff67769bde3cf9" +version = "0.0.20" +source = "git+https://github.com/deltachat/rust-email?branch=master#5179cd68db44101ee3d3df7bfef96f014507352b" dependencies = [ "base64 0.11.0", "chrono", @@ -1609,7 +1633,6 @@ dependencies = [ "encoding", "lazy_static", "rand 0.7.3", - "time 0.1.45", "version_check", ] @@ -1727,7 +1750,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -1740,14 +1763,14 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1764,23 +1787,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "error-code" -version = "2.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "escaper" @@ -1799,9 +1818,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -1810,11 +1829,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" dependencies = [ - "event-listener 4.0.0", + "event-listener 5.2.0", "pin-project-lite", ] @@ -1832,11 +1851,12 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fast-socks5" -version = "0.8.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ce1761191c157145a8c9f0c3ceabecd3a729d65c9a8d443674eaee3420f7e" +checksum = "cbcc731f3c17a5053e07e6a2290918da75cd8b9b1217b419721f715674ac520c" dependencies = [ "anyhow", + "async-trait", "log", "thiserror", "tokio", @@ -1860,20 +1880,20 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" -version = "3.0.13" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" dependencies = [ "cfg-if", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1900,20 +1920,20 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -1928,14 +1948,13 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", "spin 0.9.8", ] @@ -1962,9 +1981,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1975,9 +1994,9 @@ version = "1.0.0" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1990,9 +2009,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2000,15 +2019,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2017,52 +2036,51 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2100,9 +2118,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -2113,9 +2131,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -2151,16 +2169,35 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", + "http 1.1.0", "indexmap", "slab", "tokio", @@ -2170,9 +2207,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" @@ -2186,9 +2227,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" dependencies = [ "hashbrown", ] @@ -2201,9 +2242,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2224,7 +2265,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna", + "idna 0.4.0", "ipnet", "once_cell", "rand 0.8.5", @@ -2258,9 +2299,9 @@ dependencies = [ [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -2276,11 +2317,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2296,9 +2337,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2307,12 +2359,35 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes", - "http", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -2330,9 +2405,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a79a67745be0cb8dd2771f03b24c2f25df98d5471fe7a595d668cfa2e6f843d" +checksum = "c4f016c89920bbb30951a8405ecacbb4540db5524313b9445736e7e1855cf370" dependencies = [ "backtrace", "os_info", @@ -2359,22 +2434,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.24", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -2382,23 +2457,59 @@ dependencies = [ ] [[package]] +name = "hyper" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.2", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + +[[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.28", "native-tls", "tokio", "tokio-native-tls", ] [[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.2.0", + "pin-project-lite", + "socket2", + "tokio", +] + +[[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2443,34 +2554,44 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", "gif", "jpeg-decoder", - "num-rational", "num-traits", "png", ] [[package]] name = "imap-proto" -version = "0.16.3" -source = "git+https://github.com/djc/tokio-imap.git?rev=01ff256a7e42a9f7d2732706f8b71a16ce93427e#01ff256a7e42a9f7d2732706f8b71a16ce93427e" +version = "0.16.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e70cd66882c8cb1c9802096ba75212822153c51478dc61621e1a22f6c92361" dependencies = [ "nom", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown", @@ -2491,9 +2612,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", + "socket2", "widestring", - "windows-sys", + "windows-sys 0.48.0", "winreg", ] @@ -2506,11 +2627,12 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "iroh" version = "0.4.2" -source = "git+https://github.com/n0-computer/iroh?branch=maint-0.4#9881b7886235035a1124e4371f7a4cd59379e51b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85075391dcb8491a4939266334b28601052d418b37d20b33c58ffb5776adc912" dependencies = [ "abao", "anyhow", - "base64 0.21.5", + "base64 0.21.7", "blake3", "bytes", "default-net", @@ -2548,16 +2670,22 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys", + "libc", + "windows-sys 0.52.0", ] [[package]] +name = "iter-read" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a598c1abae8e3456ebda517868b254b6bc2a9bb6501ffd5b9d0875bf332e048b" + +[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2568,26 +2696,40 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] +name = "k256" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +dependencies = [ + "cfg-if", + "ecdsa 0.16.9", + "elliptic-curve 0.13.8", + "once_cell", + "sha2 0.10.8", + "signature 2.2.0", +] + +[[package]] name = "kamadak-exif" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2598,9 +2740,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -2640,9 +2782,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libm" @@ -2656,16 +2798,16 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall 0.4.1", ] [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "openssl-sys", @@ -2681,9 +2823,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -2697,9 +2839,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru-cache" @@ -2712,9 +2854,9 @@ dependencies = [ [[package]] name = "mailparse" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b56570f5f8c0047260d1c8b5b331f62eb9c660b9dd4071a8c46f8c7d3f280aa" +checksum = "2d096594926cab442e054e047eb8c1402f7d5b2272573b97ba68aa40629f9757" dependencies = [ "charset", "data-encoding", @@ -2760,18 +2902,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "mime" @@ -2787,9 +2920,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -2797,13 +2930,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2818,7 +2951,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -2899,11 +3032,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "cfg-if", "libc", ] @@ -2967,42 +3100,36 @@ dependencies = [ ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -3011,9 +3138,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3030,10 +3157,31 @@ dependencies = [ ] [[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -3049,9 +3197,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -3061,17 +3209,17 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -3088,7 +3236,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -3108,9 +3256,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" dependencies = [ "cc", "libc", @@ -3214,7 +3362,7 @@ dependencies = [ "libc", "redox_syscall 0.4.1", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -3258,12 +3406,12 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pgp" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132" +checksum = "031fa1e28c4cb54c90502ef0642a44ef10ec8349349ebe6372089f1b1ef4f297" dependencies = [ "aes", - "base64 0.21.5", + "base64 0.21.7", "bitfield", "block-padding", "blowfish", @@ -3275,28 +3423,32 @@ dependencies = [ "cfb-mode", "chrono", "cipher", + "const-oid", "crc24", - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "derive_builder", "des", "digest 0.10.7", - "ed25519-dalek 2.1.0", + "dsa", + "ed25519-dalek 2.1.1", "elliptic-curve 0.13.8", "flate2", "generic-array", "hex", "idea", + "iter-read", + "k256", "log", "md-5", "nom", "num-bigint-dig", - "num-derive", "num-traits", + "num_enum", "p256 0.13.2", "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.5", + "rsa 0.9.6", "sha1", "sha2 0.10.8", "sha3", @@ -3310,22 +3462,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -3360,7 +3512,7 @@ checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" dependencies = [ "der 0.7.8", "pkcs8 0.10.2", - "spki 0.7.2", + "spki 0.7.3", ] [[package]] @@ -3380,20 +3532,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der 0.7.8", - "spki 0.7.2", + "spki 0.7.3", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "plotters" @@ -3425,9 +3577,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3438,9 +3590,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "postcard" @@ -3508,6 +3660,15 @@ dependencies = [ ] [[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3533,9 +3694,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -3546,7 +3707,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "lazy_static", "num-traits", "rand 0.8.5", @@ -3564,9 +3725,9 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quic-rpc" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d60c2fc2390baad4b9d41ae9957ae88c3095496f88e252ef50722df8b5b78d7" +checksum = "1428fcf30c17a159ff10c1f3c69fca92fd7cfa11e9fef7d573f3c6f0da3b5920" dependencies = [ "bincode", "educe", @@ -3639,25 +3800,25 @@ checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ "bytes", "libc", - "socket2 0.5.5", + "socket2", "tracing", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "quoted_printable" -version = "0.4.8" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" [[package]] name = "radix_trie" @@ -3728,7 +3889,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -3755,9 +3916,9 @@ version = "1.0.0" [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -3765,9 +3926,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3781,7 +3942,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring 0.16.20", - "time 0.3.30", + "time 0.3.34", "yasna", ] @@ -3809,20 +3970,20 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -3837,9 +3998,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -3860,19 +4021,19 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-tls", "ipnet", "js-sys", @@ -3882,9 +4043,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -3944,16 +4107,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.11", + "cfg-if", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -3988,9 +4152,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ "const-oid", "digest 0.10.7", @@ -4001,18 +4165,18 @@ dependencies = [ "pkcs8 0.10.2", "rand_core 0.6.4", "signature 2.2.0", - "spki 0.7.2", + "spki 0.7.3", "subtle", "zeroize", ] [[package]] name = "rusqlite" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4058,24 +4222,24 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ - "ring 0.17.5", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -4098,7 +4262,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -4107,7 +4271,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -4119,11 +4283,11 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", "clipboard-win", "fd-lock", @@ -4133,7 +4297,6 @@ dependencies = [ "memchr", "nix", "radix_trie", - "scopeguard", "unicode-segmentation", "unicode-width", "utf8parse", @@ -4142,15 +4305,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "safemem" -version = "0.3.3" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -4173,11 +4330,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -4216,7 +4373,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -4273,24 +4430,24 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -4306,22 +4463,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -4337,9 +4494,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -4348,9 +4505,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" dependencies = [ "itoa", "serde", @@ -4358,9 +4515,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -4488,9 +4645,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smawk" @@ -4500,22 +4657,12 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -4545,9 +4692,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der 0.7.8", @@ -4595,12 +4742,6 @@ dependencies = [ ] [[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4608,21 +4749,21 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -4644,9 +4785,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -4714,31 +4855,30 @@ checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "testdir" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480060a2e7e1d3c779d3dea588a81c0df78b6a6322b7ce25c0d2ec14a0d5d869" +checksum = "ee79e927b64d193f5abb60d20a0eb56be0ee5a242fdeb8ce3bf054177006de52" dependencies = [ "anyhow", "backtrace", @@ -4750,9 +4890,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", @@ -4761,29 +4901,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -4802,12 +4942,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -4822,10 +4963,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -4856,9 +4998,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -4868,9 +5010,9 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4891,7 +5033,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -4947,9 +5089,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", @@ -4973,14 +5115,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.6", ] [[package]] @@ -4994,15 +5136,26 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] @@ -5053,7 +5206,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -5107,20 +5260,20 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.1.0", "httparse", "log", "rand 0.8.5", @@ -5147,9 +5300,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typescript-type-def" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a548b68faefac1ef83c3682cece0046b4f3efc943a067aacb4dfb99be299f60" +checksum = "19d9560109be8840693dcb09ed745851f3713bee7b23534b8cab65b7ff9383f1" dependencies = [ "serde_json", "typescript-type-def-derive", @@ -5157,9 +5310,9 @@ dependencies = [ [[package]] name = "typescript-type-def-derive" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f205a929a19c5dd74f80c9f795c33b4416f7efef7d7b2772f0eff96bdd71c35" +checksum = "2835fe6badda3e20a012d19d6593ded0fc11f659d5d5152394061ffbb03b4b04" dependencies = [ "darling 0.13.4", "ident_case", @@ -5177,9 +5330,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -5195,18 +5348,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -5234,12 +5387,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna", + "idna 0.5.0", "percent-encoding", ] @@ -5257,11 +5410,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "serde", ] @@ -5285,9 +5438,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5321,10 +5474,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5332,24 +5491,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -5359,9 +5518,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5369,28 +5528,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -5398,17 +5557,18 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] @@ -5464,11 +5624,11 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] @@ -5477,7 +5637,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", ] [[package]] @@ -5486,22 +5655,43 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.48.5", "windows_aarch64_msvc 0.48.5", "windows_i686_gnu 0.48.5", "windows_i686_msvc 0.48.5", "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.48.5", "windows_x86_64_msvc 0.48.5", ] [[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +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", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] name = "windows_aarch64_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5514,6 +5704,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] name = "windows_i686_gnu" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5526,6 +5722,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] name = "windows_i686_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5538,6 +5740,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] name = "windows_x86_64_gnu" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5550,12 +5758,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] name = "windows_x86_64_msvc" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5568,10 +5788,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] name = "winnow" -version = "0.5.19" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -5583,16 +5818,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "rand_core 0.6.4", "serde", "zeroize", @@ -5613,16 +5848,18 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.30", + "time 0.3.34", ] [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -5637,14 +5874,14 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.30", + "time 0.3.34", ] [[package]] name = "yerpc" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b5547af776328f66a5476ea3b7c0789e6fed164eb32d1a2122cfb39ffa505d" +checksum = "31978be1300d9d078f34ebb05660fbf3b5114611316a4777bb9ce269a7a33f38" dependencies = [ "anyhow", "async-channel 1.9.0", @@ -5665,9 +5902,9 @@ dependencies = [ [[package]] name = "yerpc_derive" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f321bb5f728fb066af06c5a994e4375f1f8b054ee6d650766f0bd68dfa4faefe" +checksum = "0e510aa045bc7be964b982c68f001933fce4fbe609bb98de60068fa8cefe6308" dependencies = [ "convert_case 0.5.0", "darling 0.14.4", @@ -5678,22 +5915,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.27" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43de342578a3a14a9314a2dab1942cbfcbe5686e1f91acdc513058063eafe18" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.27" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1012d89e3acb79fad7a799ce96866cfb8098b74638465ea1b1533d35900ca90" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -5713,5 +5950,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 0d7b96562104..75ba9ab621b2 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -23,22 +23,20 @@ let cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; + "email-0.0.20" = "sha256-rV4Uzqt2Qdrfi5Ti1r+Si1c2iW1kKyWLwOgLkQ5JGGw="; "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "imap-proto-0.16.3" = "sha256-okIHA8MQ1K/tcKHZYGh83zom1ULGHZ/KGxgcwiE1+sE="; - "iroh-0.4.2" = "sha256-VXNMmj+AvlY/W2JRWMICoNOqpFEahsUDxypHRg185Ao="; "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; }; }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.131.9"; + version = "1.136.3"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-xZai5RsrfT6bYzMpNdKncmDzBzcAcEtZZmh7f+3g5Hs="; + hash = "sha256-/ZWpPpxnOCLGswrfbEPvfUn1LpdBQeR5LecRAB0PEhI="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libdevil/default.nix b/nixpkgs/pkgs/development/libraries/libdevil/default.nix index 0cba50c3a924..36bd2f9ef12f 100644 --- a/nixpkgs/pkgs/development/libraries/libdevil/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdevil/default.nix @@ -69,6 +69,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"; + mainProgram = "ilur"; license = licenses.lgpl2; pkgConfigModules = [ "IL" ]; platforms = platforms.mesaPlatforms; diff --git a/nixpkgs/pkgs/development/libraries/libdicom/default.nix b/nixpkgs/pkgs/development/libraries/libdicom/default.nix index cb4d68121ef5..94dfaf81298d 100644 --- a/nixpkgs/pkgs/development/libraries/libdicom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdicom/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , uthash , meson , ninja @@ -19,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-9n0Gp9+fmTM/shgWC8zpwt1pic9BrvDubOt7f+ZDMeE="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-24793.CVE-2024-24794.patch"; + url = "https://github.com/ImagingDataCommons/libdicom/commit/3661aa4cdbe9c39f67d38ae87520f9e3ed50ab16.patch"; + excludes = [ "CHANGELOG.md" ]; + hash = "sha256-/KTp0nKYk6jX4phNHY+nzjEptUBHKM2JkOftS5vHsEw="; + }) + ]; + buildInputs = [ uthash ]; nativeBuildInputs = [ meson ninja pkg-config ] diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 49c3713bbe0e..90a169df7734 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for creating DigiDoc signature files"; + mainProgram = "digidoc-tool"; homepage = "https://www.id.ee/"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix b/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix index 783ee4ad483d..20376ba6a4b3 100644 --- a/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdisplay-info/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "EDID and DisplayID library"; + mainProgram = "di-edid-decode"; homepage = "https://gitlab.freedesktop.org/emersion/libdisplay-info"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix index 8e37bd773cb3..f79e3dc717a5 100644 --- a/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdivecomputer/default.nix @@ -14,6 +14,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"; + mainProgram = "dctool"; maintainers = [ maintainers.mguentner ]; license = licenses.lgpl21; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix index 0285ff22fe2f..5567d7c39c28 100644 --- a/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/nixpkgs/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library that implements DVD navigation features such as DVD menus"; + mainProgram = "dvdnav-config"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.wmertens ]; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libei/default.nix b/nixpkgs/pkgs/development/libraries/libei/default.nix index 688d0448861c..5ce873879064 100644 --- a/nixpkgs/pkgs/development/libraries/libei/default.nix +++ b/nixpkgs/pkgs/development/libraries/libei/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , fetchFromGitLab -, attr , libevdev , libxkbcommon , meson @@ -10,8 +9,8 @@ , pkg-config , protobuf , protobufc -, python3 , systemd +, buildPackages }: let munit = fetchFromGitHub { @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - (python3.withPackages(ps: with ps; [ + (buildPackages.python3.withPackages (ps: with ps; [ attrs jinja2 pytest @@ -61,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for Emulated Input"; + mainProgram = "ei-debug-events"; homepage = "https://gitlab.freedesktop.org/libinput/libei"; license = licenses.mit; maintainers = [ maintainers.pedrohlc ]; diff --git a/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix b/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix index 4bb7caa02615..351d9345f3f7 100644 --- a/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libemf2svg/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Microsoft EMF to SVG conversion library"; + mainProgram = "emf2svg-conv"; homepage = "https://github.com/kakwa/libemf2svg"; maintainers = with maintainers; [ erdnaxe ]; license = licenses.gpl2Only; diff --git a/nixpkgs/pkgs/development/libraries/liberfa/default.nix b/nixpkgs/pkgs/development/libraries/liberfa/default.nix index b59d3aab4a33..612d5ec34b78 100644 --- a/nixpkgs/pkgs/development/libraries/liberfa/default.nix +++ b/nixpkgs/pkgs/development/libraries/liberfa/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "erfa"; - version = "2.0.0"; + version = "2.0.1"; nativeBuildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "liberfa"; repo = "erfa"; rev = "v${version}"; - sha256 = "sha256-xBE8mWwmvlu0v3Up5y6J8jMhToMSACdKeQzPJoG8LWk="; + sha256 = "sha256-NtHYgiN5mo3kWC2H+5TUDbU1nFrwuhNyOIhg2jZbssM="; }; configureFlags = [ "--enable-shared" ]; diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix index 782d86f1f581..ff9784064432 100644 --- a/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Event notification library"; + mainProgram = "event_rpcgen.py"; longDescription = '' The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout diff --git a/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/nixpkgs/pkgs/development/libraries/libextractor/default.nix index 272cd3d9aa3e..d8e8d6101c13 100644 --- a/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple library for keyword extraction"; + mainProgram = "extract"; longDescription = '' GNU libextractor is a library used to extract meta-data from files diff --git a/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/nixpkgs/pkgs/development/libraries/libgbinder/default.nix index c0f4577078e2..3f30a443e094 100644 --- a/nixpkgs/pkgs/development/libraries/libgbinder/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.37"; + version = "1.1.38"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-/XxWOaT2f6+0apv0NzMsPoYBf3GLuaXyPkmTMTDtOes="; + sha256 = "sha256-k5oCwi1KvyRVawH0d4Kp+MCxkymAtl6zVk7DVRXFVMg="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libgit2/default.nix b/nixpkgs/pkgs/development/libraries/libgit2/default.nix index a554f0dd45b7..7e70b65423a9 100644 --- a/nixpkgs/pkgs/development/libraries/libgit2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgit2/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linkable library implementation of Git that you can use in your application"; + mainProgram = "git2"; homepage = "https://libgit2.org/"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix b/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix index 251f86b05789..fc9924b50834 100644 --- a/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgnomekbd/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Keyboard management library"; + mainProgram = "gkbd-keyboard-display"; maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix index fa3dc1b95b09..1d262a0a4402 100644 --- a/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.47"; + version = "1.48"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-njxnCWa5bsx0bCjCxBlUHjvLeH0ac5MPXl9eG8u7m9s="; + sha256 = "sha256-ic4a6JPhIpJLhY3oTcT2eq4p/6YQ6/Zo1apTkEVmPW8="; }; postPatch = '' @@ -64,6 +64,7 @@ in stdenv.mkDerivation (rec { 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"; + mainProgram = "gen-posix-lock-obj"; longDescription = '' Libgpg-error is a small library that defines common error values diff --git a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index a5f914b39a95..519448b72e3d 100644 --- a/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "2.1"; + version = "2.1.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - hash = "sha256-/W7UssZ0/mzDtIGID2zeHup54pbpWhObhUAequpt4/w="; + hash = "sha256-CvQ6YInWn50HXPZ8oq5ZcrkIHjjms9Rs6jfWfi32+5s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libgpod/default.nix b/nixpkgs/pkgs/development/libraries/libgpod/default.nix index a34b108a0a5a..2de6d8dd4d2c 100644 --- a/nixpkgs/pkgs/development/libraries/libgpod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgpod/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sourceforge.net/projects/gtkpod/"; description = "Library used by gtkpod to access the contents of an ipod"; + mainProgram = "ipod-read-sysinfo-extended"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix b/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix index a6945508e593..1ae6c72afc3e 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library full of GTK widgets for mobile phones"; + mainProgram = "handy-0.0-demo"; homepage = "https://source.puri.sm/Librem5/libhandy"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 7507f40b604f..28e698e2a83f 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -132,6 +132,7 @@ stdenv.mkDerivation rec { meta = with lib; { changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; description = "Building blocks for modern adaptive GNOME apps"; + mainProgram = "handy-1-demo"; homepage = "https://gitlab.gnome.org/GNOME/libhandy"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/libhangul/default.nix b/nixpkgs/pkgs/development/libraries/libhangul/default.nix index 295ed9bf3054..2ff18376a461 100644 --- a/nixpkgs/pkgs/development/libraries/libhangul/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhangul/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Core algorithm library for Korean input routines"; + mainProgram = "hangul"; homepage = "https://github.com/choehwanjin/libhangul"; license = licenses.lgpl21; maintainers = [ maintainers.ianwookim ]; diff --git a/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix index 558e6d6fa894..427ad20eca32 100644 --- a/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhdhomerun/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; + mainProgram = "hdhomerun_config"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.lgpl21Only; maintainers = with maintainers; [ sielicki titanous ]; diff --git a/nixpkgs/pkgs/development/libraries/libhsts/default.nix b/nixpkgs/pkgs/development/libraries/libhsts/default.nix index 2150bbd24bfb..967ffe563172 100644 --- a/nixpkgs/pkgs/development/libraries/libhsts/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhsts/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to easily check a domain against the Chromium HSTS Preload list"; + mainProgram = "hsts"; homepage = "https://gitlab.com/rockdaboot/libhsts"; license = with licenses; [ mit bsd3 ]; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libieee1284/default.nix b/nixpkgs/pkgs/development/libraries/libieee1284/default.nix index a2cbd6e4096f..4b5bef5c32a6 100644 --- a/nixpkgs/pkgs/development/libraries/libieee1284/default.nix +++ b/nixpkgs/pkgs/development/libraries/libieee1284/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Parallel port communication library"; + mainProgram = "libieee1284_test"; homepage = "http://cyberelk.net/tim/software/libieee1284/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libinfinity/default.nix b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix index f9963ce3e636..c4285220af3d 100644 --- a/nixpkgs/pkgs/development/libraries/libinfinity/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinfinity/default.nix @@ -43,6 +43,7 @@ let meta = { homepage = "https://gobby.github.io/"; description = "An implementation of the Infinote protocol written in GObject-based C"; + mainProgram = "infinoted-0.7"; license = lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix index 2a1c2f8b45a9..f0005969bbcf 100644 --- a/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; + mainProgram = "libinput"; homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libipfix/default.nix b/nixpkgs/pkgs/development/libraries/libipfix/default.nix index e62c456dd4ab..96fd190e15bb 100644 --- a/nixpkgs/pkgs/development/libraries/libipfix/default.nix +++ b/nixpkgs/pkgs/development/libraries/libipfix/default.nix @@ -18,6 +18,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"; + mainProgram = "ipfix_collector"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ lewo ]; diff --git a/nixpkgs/pkgs/development/libraries/libipt/default.nix b/nixpkgs/pkgs/development/libraries/libipt/default.nix index 6a05aec46854..ed88ed8f2828 100644 --- a/nixpkgs/pkgs/development/libraries/libipt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "sha256-SLCuNTFRGFh0mTv1xLCIDg7b6DbWCxgHhrCoPu9xpmw="; + sha256 = "sha256-tyOheitSlccf/n3mklGL2oAKLBKYT60LSLre9/G/b9Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix index 6bf670a40382..f6f918c1d522 100644 --- a/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for reading and writing the IPTC metadata in images and other files"; + mainProgram = "iptc"; homepage = "https://github.com/ianw/libiptcdata"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libixp/default.nix b/nixpkgs/pkgs/development/libraries/libixp/default.nix index f6ad6d01b08f..7d235d7a7649 100644 --- a/nixpkgs/pkgs/development/libraries/libixp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libixp/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/0intro/libixp"; description = "Portable, simple C-language 9P client and server library"; + mainProgram = "ixpc"; maintainers = with lib.maintainers; [ kovirobi ]; license = lib.licenses.mit; platforms = with lib.platforms; unix; diff --git a/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/nixpkgs/pkgs/development/libraries/libjcat/default.nix index 6d9481d1da2d..33fb21237e41 100644 --- a/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for reading and writing Jcat files"; + mainProgram = "jcat-tool"; homepage = "https://github.com/hughsie/libjcat"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 8e80b9bd8405..4e97ff2f4d5d 100644 --- a/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ framework for json-rpc (json remote procedure call)"; + mainProgram = "jsonrpcstub"; homepage = "https://github.com/cinemast/libjson-rpc-cpp"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 833b58e59428..10dcc29785bd 100644 --- a/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -32,9 +32,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + strictDeps = true; + nativeBuildInputs = [ cmake - gtest pkg-config asciidoc doxygen @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { buildInputs = [ giflib gperftools # provides `libtcmalloc` + gtest libjpeg libpng libwebp diff --git a/nixpkgs/pkgs/development/libraries/libksba/default.nix b/nixpkgs/pkgs/development/libraries/libksba/default.nix index 8f22ede81669..d33de73e4091 100644 --- a/nixpkgs/pkgs/development/libraries/libksba/default.nix +++ b/nixpkgs/pkgs/development/libraries/libksba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libksba"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - hash = "sha256-pWRijFdMmSh5mHU/mNdQur2RpOnbRR9GrRQEZu8qbRY="; + hash = "sha256-XewDPSEVWTOIOMDElXxz39w+6G9zl31ieWQMnNCM5qQ="; }; outputs = [ "out" "dev" "info" ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnupg.org"; description = "CMS and X.509 access library"; + mainProgram = "ksba-config"; platforms = platforms.all; maintainers = with maintainers; [ ]; license = licenses.lgpl3; diff --git a/nixpkgs/pkgs/development/libraries/liblockfile/default.nix b/nixpkgs/pkgs/development/libraries/liblockfile/default.nix index 003991c80dde..17fc086704ec 100644 --- a/nixpkgs/pkgs/development/libraries/liblockfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblockfile/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; + mainProgram = "dotlockfile"; homepage = "http://packages.debian.org/unstable/libs/liblockfile1"; license = lib.licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/liblogging/default.nix b/nixpkgs/pkgs/development/libraries/liblogging/default.nix index 2623e65f68b0..50b850b886a5 100644 --- a/nixpkgs/pkgs/development/libraries/liblogging/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblogging/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.liblogging.org/"; description = "Lightweight signal-safe logging library"; + mainProgram = "stdlogctl"; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/liblouis/default.nix b/nixpkgs/pkgs/development/libraries/liblouis/default.nix index 6f22edae4f3d..a5c0bf92751f 100644 --- a/nixpkgs/pkgs/development/libraries/liblouis/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblouis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblouis"; - version = "3.28.0"; + version = "3.29.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-PvGlhsnAxQctcODiK628BDdzYaWUIF/F3dN2g//Gywg="; + hash = "sha256-TaMPl53FlUSZIsjhoTYcv3Y+j86fDHuBTjiyr/uP1tM="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/nixpkgs/pkgs/development/libraries/libmanette/default.nix index e5bbf9a39cb9..ee8891d051f0 100644 --- a/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple GObject game controller library"; + mainProgram = "manette-test"; homepage = "https://gnome.pages.gitlab.gnome.org/libmanette/"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix index 668389091c01..672ba730be12 100644 --- a/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; + mainProgram = "libmcrypt-config"; homepage = "https://mcrypt.sourceforge.net"; license = "GPL"; platforms = lib.platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libmikmod/default.nix b/nixpkgs/pkgs/development/libraries/libmikmod/default.nix index 29f64116b7a8..90b548bef73a 100644 --- a/nixpkgs/pkgs/development/libraries/libmikmod/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmikmod/default.nix @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A library for playing tracker music module files"; + mainProgram = "libmikmod-config"; homepage = "https://mikmod.shlomifish.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ astsmtl lovek323 ]; diff --git a/nixpkgs/pkgs/development/libraries/libmng/default.nix b/nixpkgs/pkgs/development/libraries/libmng/default.nix index 15a68bdce589..19896b13998d 100644 --- a/nixpkgs/pkgs/development/libraries/libmng/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmng/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://www.libmng.com"; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix index 7f21e52a037c..ce16753cf540 100644 --- a/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C Library for manipulating module metadata files"; + mainProgram = "modulemd-validator"; homepage = "https://github.com/fedora-modularity/libmodulemd"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libmx/default.nix b/nixpkgs/pkgs/development/libraries/libmx/default.nix index 52d92840a346..c6bbde6940b1 100644 --- a/nixpkgs/pkgs/development/libraries/libmx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmx/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.clutter-project.org/"; description = "A Clutter-based toolkit"; + mainProgram = "mx-create-image-cache"; longDescription = ''Mx is a widget toolkit using Clutter that provides a set of standard interface elements, including buttons, progress bars, scroll bars and diff --git a/nixpkgs/pkgs/development/libraries/libnatspec/default.nix b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix index 360aba08e709..4124422c85bd 100644 --- a/nixpkgs/pkgs/development/libraries/libnatspec/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnatspec/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; + mainProgram = "natspec"; platforms = platforms.unix; license = licenses.lgpl21; }; diff --git a/nixpkgs/pkgs/development/libraries/libndp/default.nix b/nixpkgs/pkgs/development/libraries/libndp/default.nix index 6109c48b036e..b04b22da1236 100644 --- a/nixpkgs/pkgs/development/libraries/libndp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndp/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://libndp.org/"; description = "Library for Neighbor Discovery Protocol"; + mainProgram = "ndptool"; platforms = platforms.linux; maintainers = [ ]; license = licenses.lgpl21; diff --git a/nixpkgs/pkgs/development/libraries/libnet/default.nix b/nixpkgs/pkgs/development/libraries/libnet/default.nix index b835844491fb..c8f38387111f 100644 --- a/nixpkgs/pkgs/development/libraries/libnet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnet/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sam-github/libnet"; description = "Portable framework for low-level network packet construction"; + mainProgram = "libnet-config"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/libngspice/default.nix b/nixpkgs/pkgs/development/libraries/libngspice/default.nix index 840ff2177d85..6da456b26ed6 100644 --- a/nixpkgs/pkgs/development/libraries/libngspice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libngspice/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The 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 maintainers = with maintainers; [ bgamari rongcuid ]; diff --git a/nixpkgs/pkgs/development/libraries/liboil/default.nix b/nixpkgs/pkgs/development/libraries/liboil/default.nix index 4291b3668039..7a28ac119c34 100644 --- a/nixpkgs/pkgs/development/libraries/liboil/default.nix +++ b/nixpkgs/pkgs/development/libraries/liboil/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library of simple functions that are optimized for various CPUs"; + mainProgram = "oil-bugreport"; homepage = "https://liboil.freedesktop.org"; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; diff --git a/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix index 4f129dc13781..027c0b8f499d 100644 --- a/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -40,6 +40,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"; + mainProgram = "omxregister-bellagio"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix b/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix index e546dc7a5786..bbec90a4055a 100644 --- a/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopenshot-audio/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://openshot.org/"; description = "High-quality sound editing library"; + mainProgram = "openshot-audio-demo"; longDescription = '' OpenShot Audio Library (libopenshot-audio) is a program that allows the high-quality editing and playback of audio, and is based on the amazing diff --git a/nixpkgs/pkgs/development/libraries/libopus/default.nix b/nixpkgs/pkgs/development/libraries/libopus/default.nix index b2b095f5607e..3592c537ac44 100644 --- a/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchpatch , fetchurl +, gitUpdater , meson , python3 , ninja @@ -12,27 +13,22 @@ # tests , ffmpeg-headless +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopus"; - version = "1.4"; + version = "1.5.1"; src = fetchurl { - url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "sha256-ybMrQlO+WuY9H/Fu6ga5S18PKVG3oCrO71jjo85JxR8="; + url = "https://downloads.xiph.org/releases/opus/opus-${finalAttrs.version}.tar.gz"; + hash = "sha256-uEYQlZuNQXthGqEqIlZeCjcyCXxjidGQmNhEVD40D4U="; }; patches = [ ./fix-pkg-config-paths.patch # Some tests time out easily on slower machines ./test-timeout.patch - # Fix meson build for arm64. Remove with next release - # https://gitlab.xiph.org/xiph/opus/-/merge_requests/59 - (fetchpatch { - url = "https://gitlab.xiph.org/xiph/opus/-/commit/20c032d27c59d65b19b8ffbb2608e5282fe817eb.patch"; - hash = "sha256-2pX+0ay5PTyHL2plameBX2L1Q4aTx7V7RGiTdhNIuE4="; - }) ]; postPatch = '' @@ -58,16 +54,28 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails - passthru.tests = { - inherit ffmpeg-headless; + 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${version}"; + changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch b/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch index e20f12cc1d54..76025e648d8f 100644 --- a/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch +++ b/nixpkgs/pkgs/development/libraries/libopus/test-timeout.patch @@ -1,16 +1,9 @@ -diff --git a/tests/meson.build b/tests/meson.build -index 5f3ac9d..74b2de7 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -1,8 +1,8 @@ +@@ -1,6 +1,5 @@ # Tests that link to libopus opus_tests = [ - ['test_opus_api'], -- ['test_opus_decode', [], 60], -- ['test_opus_encode', 'opus_encode_regressions.c', 120], -+ ['test_opus_api', [], 60], -+ ['test_opus_decode', [], 120], -+ ['test_opus_encode', 'opus_encode_regressions.c', 240], - ['test_opus_padding'], - ['test_opus_projection'], - ] + ['test_opus_decode', [], 120], + ['test_opus_encode', 'opus_encode_regressions.c', 240], + ['test_opus_extensions', [], 120], diff --git a/nixpkgs/pkgs/development/libraries/libpanel/default.nix b/nixpkgs/pkgs/development/libraries/libpanel/default.nix index a4f8e71eba2e..05b863ad2011 100644 --- a/nixpkgs/pkgs/development/libraries/libpanel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpanel/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dock/panel library for GTK 4"; + mainProgram = "libpanel-example"; homepage = "https://gitlab.gnome.org/GNOME/libpanel"; license = licenses.lgpl3Plus; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/nixpkgs/pkgs/development/libraries/libpcap/default.nix index d1ea44b6ac2f..7256e4922605 100644 --- a/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; + mainProgram = "pcap-config"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/libpeas/default.nix b/nixpkgs/pkgs/development/libraries/libpeas/default.nix index f0b6023117d9..f9d8be93c66c 100644 --- a/nixpkgs/pkgs/development/libraries/libpeas/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpeas/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GObject-based plugins engine"; + mainProgram = "peas-demo"; homepage = "https://wiki.gnome.org/Projects/Libpeas"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libpng/default.nix b/nixpkgs/pkgs/development/libraries/libpng/default.nix index e1d412b5006e..34d7a3e580b7 100644 --- a/nixpkgs/pkgs/development/libraries/libpng/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpng/default.nix @@ -5,20 +5,20 @@ assert zlib != null; let - patchVersion = "1.6.40"; + patchVersion = "1.6.43"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-CjykZIKTjY1sciZivtLH7gxlobViRESzztIa2NNW2y8="; + hash = "sha256-0QdXnpDVU4bQDmCG6nUJQvIqBLmrR2u6DGYHcM76/iI="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.40"; + version = "1.6.43"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-U1tHmyRn/yMaPsbZKlJZBvuO8nl4vk9m2+BdPzoBs6E="; + hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -38,7 +38,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; - changelog = "https://github.com/glennrp/libpng/blob/v1.6.40/CHANGES"; + changelog = "https://github.com/pnggroup/libpng/blob/v${finalAttrs.version}/CHANGES"; license = licenses.libpng2; pkgConfigModules = [ "libpng" "libpng16" ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/nixpkgs/pkgs/development/libraries/libproxy/default.nix index 5c7a31625023..076e4c33b964 100644 --- a/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; homepage = "https://libproxy.github.io/libproxy/"; description = "A library that provides automatic proxy configuration management"; + mainProgram = "proxy"; }; } diff --git a/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/nixpkgs/pkgs/development/libraries/libpsl/default.nix index f4f6375cb419..a8fcd2581caa 100644 --- a/nixpkgs/pkgs/development/libraries/libpsl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpsl/default.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation rec { hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; }; + # bin/psl-make-dafsa brings a large runtime closure through python3 + outputs = [ "bin" "out" "dev" ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 84623e7459fc..34e34a7eeebf 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "4.9.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${finalAttrs.version}"; - hash = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E="; + hash = "sha256-VhaGgtSU6+7eMY7ksQMpybmt2JBI80Nwgu7PCKrTorA="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix index 4503a0cc43ed..b9d5252215cc 100644 --- a/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix +++ b/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; + mainProgram = "rapper"; homepage = "https://librdf.org/raptor"; license = with lib.licenses; [ lgpl21 asl20 ]; maintainers = with lib.maintainers; [ marcweber ]; diff --git a/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/nixpkgs/pkgs/development/libraries/libredwg/default.nix index 7759917d9750..6eb06a1ebe67 100644 --- a/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , writeShellScript , pkg-config @@ -18,24 +17,16 @@ let in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12.5.6313"; + version = "0.13.3"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - hash = "sha256-TM+cZ7N5PD6UG9cvy0XFa0sNYc3apbAJvEMh3husjRk="; + hash = "sha256-FlBHwNsqVSBE8dTDewoKkCbs8Jd/4d69MPpEFzg6Ruc="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "CVE-2023-26157.patch"; - url = "https://github.com/LibreDWG/libredwg/commit/c8cf03ce4c2315b146caf582ea061c0460193bcc.patch"; - hash = "sha256-EEF3YYPW+6SvXRiAw3zz6tWU9w/qmGtc09Tf8wn7hVc="; - }) - ]; - postPatch = let printVersion = writeShellScript "print-version" '' echo -n ${lib.escapeShellArg version} @@ -43,8 +34,6 @@ stdenv.mkDerivation rec { in '' # avoid git dependency cp ${printVersion} build-aux/git-version-gen - # failing to build otherwise since glibc-2.38 - sed '1i#include <string.h>' -i programs/dwg2SVG.c ''; preConfigure = lib.optionalString (stdenv.isDarwin && enablePython) '' @@ -64,8 +53,8 @@ stdenv.mkDerivation rec { # prevent python tests from running when not building with python configureFlags = lib.optional (!enablePython) "--disable-python"; - # example_r13.dxf roundtrip fail: expect 5286, got 5285 entities - doCheck = !(stdenv.isLinux && stdenv.isAarch64); + # FAIL: alive.test + doCheck = !stdenv.isLinux; # the "xmlsuite" test requires the libxml2 c library as well as the python module nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; diff --git a/nixpkgs/pkgs/development/libraries/libs3/default.nix b/nixpkgs/pkgs/development/libraries/libs3/default.nix index b9f9278fad8c..4bea630c1b27 100644 --- a/nixpkgs/pkgs/development/libraries/libs3/default.nix +++ b/nixpkgs/pkgs/development/libraries/libs3/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/bji/libs3"; description = "A library for interfacing with amazon s3"; + mainProgram = "s3"; license = licenses.lgpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix b/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix index 5f0863bc49c8..198bc7362826 100644 --- a/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsamplerate/default.nix @@ -30,6 +30,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Sample Rate Converter for audio"; + mainProgram = "sndfile-resample"; homepage = "http://www.mega-nerd.com/SRC/index.html"; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; diff --git a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix index 9ae8d87f8872..6d4675717f0d 100644 --- a/nixpkgs/pkgs/development/libraries/libsearpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsearpc/default.nix @@ -34,6 +34,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"; + mainProgram = "searpc-codegen.py"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ greizgh ]; diff --git a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index e5a8f42940e0..19ba1f2b8911 100644 --- a/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "High level library for the Linux Kernel seccomp filter"; + mainProgram = "scmp_sys_resolver"; homepage = "https://github.com/seccomp/libseccomp"; license = licenses.lgpl21Only; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libserdes/default.nix b/nixpkgs/pkgs/development/libraries/libserdes/default.nix index 2a48c9a89770..ac776c4e4231 100644 --- a/nixpkgs/pkgs/development/libraries/libserdes/default.nix +++ b/nixpkgs/pkgs/development/libraries/libserdes/default.nix @@ -32,11 +32,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs configure lds-gen.pl - '' + lib.optionalString (stdenv.cc.libcxx != null) '' - # fix for https://github.com/NixOS/nixpkgs/issues/166205 - # llvm12+ isn't adding libc++abi - substituteInPlace src-cpp/Makefile \ - --replace "LIBS += -lstdc++" "LIBS += -lc++ -l${stdenv.cc.libcxx.cxxabi.libName}" ''; # Has a configure script but it’s not Autoconf so steal some bits from multiple-outputs.sh: diff --git a/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/nixpkgs/pkgs/development/libraries/libshumate/default.nix index 9639ac34a01b..6306fd2a5548 100644 --- a/nixpkgs/pkgs/development/libraries/libshumate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK toolkit providing widgets for embedded maps"; + mainProgram = "shumate-demo"; homepage = "https://gitlab.gnome.org/GNOME/libshumate"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/development/libraries/libskk/default.nix b/nixpkgs/pkgs/development/libraries/libskk/default.nix index c4b36704cb97..2f6e98e7dd0a 100644 --- a/nixpkgs/pkgs/development/libraries/libskk/default.nix +++ b/nixpkgs/pkgs/development/libraries/libskk/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A library to deal with Japanese kana-to-kanji conversion method"; + mainProgram = "skk"; longDescription = '' Libskk is a library that implements basic features of SKK including: new word registration, completion, numeric conversion, abbrev mode, kuten input, diff --git a/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix b/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix index 077055cbb9a4..5b4fcf875f6f 100644 --- a/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsmartcols/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libsmartcols"; - version = "2.36.1"; + version = "2.39.3"; nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "karelzak"; repo = "util-linux"; rev = "v${version}"; - sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs"; + sha256 = "sha256-X39os2iHqSrrYP6HVHPOkuTfc6vNB3pmsOP3VjW50fI="; }; configureFlags = [ "--disable-all-programs" "--enable-libsmartcols" ]; diff --git a/nixpkgs/pkgs/development/libraries/libspelling/default.nix b/nixpkgs/pkgs/development/libraries/libspelling/default.nix index 812dddcc4a17..874e9eff22c4 100644 --- a/nixpkgs/pkgs/development/libraries/libspelling/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspelling/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "libspelling"; - version = "0.2.0"; + version = "0.2.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "chergert"; repo = "libspelling"; rev = version; - hash = "sha256-OOSQgdtnEx6/5yKwavCGdY/5L0Mr3XW0Srmd42ZTdUk="; + hash = "sha256-0OGcwPGWtYYf0XmvzXEaQgebBOW/6JWcDuF4MlQjCZQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsrs2/default.nix b/nixpkgs/pkgs/development/libraries/libsrs2/default.nix index 3da48f772545..5cb0974af9f1 100644 --- a/nixpkgs/pkgs/development/libraries/libsrs2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsrs2/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "The next generation SRS library from the original designer of SRS"; + mainProgram = "srs"; license = with lib.licenses; [ gpl2 bsd3 ]; homepage = "https://www.libsrs2.org/"; platforms = lib.platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libtar/default.nix b/nixpkgs/pkgs/development/libraries/libtar/default.nix index c6c89ecb4f08..83bb0708110b 100644 --- a/nixpkgs/pkgs/development/libraries/libtar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtar/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C library for manipulating POSIX tar files"; + mainProgram = "libtar"; homepage = "https://repo.or.cz/libtar"; license = licenses.bsd3; platforms = with platforms; linux ++ darwin; diff --git a/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/nixpkgs/pkgs/development/libraries/libtiff/default.nix index af9e10a6b8f5..80b5f411e663 100644 --- a/nixpkgs/pkgs/development/libraries/libtiff/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtiff/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libtiff.gitlab.io/libtiff"; changelog = "https://libtiff.gitlab.io/libtiff/v${finalAttrs.version}.html"; license = licenses.libtiff; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "libtiff-4" ]; }; }) diff --git a/nixpkgs/pkgs/development/libraries/libtins/0001-force-cpp-14.patch b/nixpkgs/pkgs/development/libraries/libtins/0001-force-cpp-14.patch new file mode 100644 index 000000000000..3426713a07e3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libtins/0001-force-cpp-14.patch @@ -0,0 +1,26 @@ +This change bypasses all the code that attempts to see which C++11 features are enabled in your specific C++11 compiler. C++14 is required for gtest 1.13+. +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 902233e676ee..49ac8a1010a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,17 +103,9 @@ ENDIF() + # C++11 support + OPTION(LIBTINS_ENABLE_CXX11 "Compile libtins with c++11 features" ON) + IF(LIBTINS_ENABLE_CXX11) +- # We only use declval and decltype on gcc/clang as VC fails to build that code, +- # at least on VC2013 +- IF(HAS_CXX11_RVALUE_REFERENCES AND HAS_CXX11_FUNCTIONAL AND HAS_CXX11_CHRONO AND +- HAS_CXX11_NOEXCEPT AND ((HAS_CXX11_DECLVAL AND HAS_CXX11_DECLTYPE) OR MSVC)) +- SET(TINS_HAVE_CXX11 ON) +- MESSAGE(STATUS "Enabling C++11 features") +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}") +- ELSE() +- MESSAGE(WARNING "The compiler doesn't support the necessary C++11 features. " +- "Disabling C++11 on this build") +- ENDIF() ++ SET(TINS_HAVE_CXX11 ON) ++ MESSAGE(STATUS "Using C++11 features") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") + ELSE(LIBTINS_ENABLE_CXX11) + MESSAGE( + WARNING diff --git a/nixpkgs/pkgs/development/libraries/libtins/default.nix b/nixpkgs/pkgs/development/libraries/libtins/default.nix index b27ad6634797..6f195615551f 100644 --- a/nixpkgs/pkgs/development/libraries/libtins/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtins/default.nix @@ -1,25 +1,20 @@ -{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }: +{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }: stdenv.mkDerivation rec { pname = "libtins"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "mfontanini"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw="; + sha256 = "sha256-zL4C2Cgs9Y3NebL8MPQBO5j8Bm6xhl8ZggQBPJLRn0o="; }; patches = [ - # Pull gcc-13 fixes: - # https://github.com/mfontanini/libtins/pull/496 - # TODO: remove when upgrade to the next version. - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch"; - hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M="; - }) + # Required for gtest 1.13+, see also upstream report at: + # https://github.com/mfontanini/libtins/issues/529 + ./0001-force-cpp-14.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix b/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix index aac71bda3698..96506dfb85c9 100644 --- a/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix +++ b/nixpkgs/pkgs/development/libraries/libu2f-server/default.nix @@ -23,6 +23,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"; + mainProgram = "u2f-server"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ philandstuff ]; diff --git a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 14bf7f7c09c7..642c39e5974a 100644 --- a/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; + mainProgram = "uchardet"; homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libunicode/default.nix b/nixpkgs/pkgs/development/libraries/libunicode/default.nix index 725dacebcc25..3fd47a9fc699 100644 --- a/nixpkgs/pkgs/development/libraries/libunicode/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunicode/default.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation (final: { meta = with lib; { description = "Modern C++17 Unicode library"; + mainProgram = "unicode-query"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ moni ]; diff --git a/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/nixpkgs/pkgs/development/libraries/libunwind/default.nix index 90054b8ff7b9..66f9f076dab4 100644 --- a/nixpkgs/pkgs/development/libraries/libunwind/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunwind/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libunwind"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "libunwind"; repo = "libunwind"; rev = "v${version}"; - hash = "sha256-u33JAgxNy45yhIFL5QDsfa7EtLLKWmCv1kO4BxYYuwM="; + hash = "sha256-rCFBHs6rCSnp5FEwbUR5veNNTqSQpFblAv8ebSPX0qE="; }; postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then '' @@ -21,9 +21,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devman" ]; - # Without latex2man, no man pages are installed despite being - # prebuilt in the source tarball. - configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ] + configureFlags = [ + # Starting from 1.8.1 libunwind installs testsuite by default. + # As we don't run the tests we disable it (this also fixes circular + # reference install failure). + "--disable-tests" + # Without latex2man, no man pages are installed despite being + # prebuilt in the source tarball. + "LATEX2MAN=${buildPackages.coreutils}/bin/true" + ] # See https://github.com/libunwind/libunwind/issues/693 ++ lib.optionals (with stdenv.hostPlatform; isAarch64 && isMusl && !isStatic) [ "CFLAGS=-mno-outline-atomics" diff --git a/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix b/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix index db80cfd81d06..841e781dfd5f 100644 --- a/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/nixpkgs/pkgs/development/libraries/libusb-compat/0.1.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libusb.info/"; description = "cross-platform user-mode USB device library"; + mainProgram = "libusb-config"; longDescription = '' libusb is a cross-platform user-mode library that provides access to USB devices. The current API is of 1.0 version (libusb-1.0 API), this library is a wrapper exposing the legacy API. diff --git a/nixpkgs/pkgs/development/libraries/libva/utils.nix b/nixpkgs/pkgs/development/libraries/libva/utils.nix index 777119378d34..25db3a1149ac 100644 --- a/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.20.1"; + version = "2.21.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-ZX6ahKnOB5ZEg36iIWskq3q26GVg/trsCAKKttEKZ1s="; + sha256 = "sha256-+Ayx5Csgeip2qj1ywE7cBxupXiYJTNXhRo17009vG4I="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libvarlink/default.nix b/nixpkgs/pkgs/development/libraries/libvarlink/default.nix index 941ee900edb2..0efca00a3e10 100644 --- a/nixpkgs/pkgs/development/libraries/libvarlink/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvarlink/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C implementation of the Varlink protocol and command line tool"; + mainProgram = "varlink"; homepage = "https://github.com/varlink/libvarlink"; license = licenses.asl20; maintainers = with maintainers; [ artturin ]; diff --git a/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix b/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix index bdfe404c547c..4da8873ca775 100644 --- a/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Simplistic SDL2 GUI framework in early developement"; + mainProgram = "libwtk-sdl2-test"; homepage = "https://github.com/muesli4/libwtk-sdl2"; # See: https://github.com/muesli4/mpd-touch-screen-gui/tree/master/LICENSES license = licenses.lgpl3Plus; diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index b3f20d02c533..d5e543a1b5f3 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library of exchange-correlation functionals for density-functional theory"; + mainProgram = "xc-info"; homepage = "https://www.tddft.org/programs/Libxc/"; license = licenses.mpl20; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix index 522d3546b8e0..d3f6f311df94 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library to help create and query binary XML blobs"; + mainProgram = "xb-tool"; homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix index 6530ee7f67ae..178e524fd1b7 100644 --- a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; + mainProgram = "libxsmm_gemm_generator"; license = licenses.bsd3; homepage = "https://github.com/hfp/libxsmm"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libyang/default.nix b/nixpkgs/pkgs/development/libraries/libyang/default.nix deleted file mode 100644 index d220bcee1e6e..000000000000 --- a/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub - -# build time -, cmake -, pkg-config - -# run time -, pcre2 - -# update script -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "libyang"; - version = "2.1.128"; - - src = fetchFromGitHub { - owner = "CESNET"; - repo = "libyang"; - rev = "v${version}"; - sha256 = "sha256-qwEHGUizjsWQZSwQkh7Clevd1OQfj1mse7Q8YiRCMyQ="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - pcre2 - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "YANG data modelling language parser and toolkit"; - longDescription = '' - libyang is a YANG data modelling language parser and toolkit written (and - providing API) in C. The library is used e.g. in libnetconf2, Netopeer2, - sysrepo or FRRouting projects. - ''; - homepage = "https://github.com/CESNET/libyang"; - license = with licenses; [ bsd3 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ woffs ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libykclient/default.nix b/nixpkgs/pkgs/development/libraries/libykclient/default.nix index 6aacfc5ea2fa..240f771e49f1 100644 --- a/nixpkgs/pkgs/development/libraries/libykclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libykclient/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Yubikey C client library"; + mainProgram = "ykclient"; homepage = "https://developers.yubico.com/yubico-c-client"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; diff --git a/nixpkgs/pkgs/development/libraries/libyuv/default.nix b/nixpkgs/pkgs/development/libraries/libyuv/default.nix index cc9f78ccae6f..77e32c09de8f 100644 --- a/nixpkgs/pkgs/development/libraries/libyuv/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyuv/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://chromium.googlesource.com/libyuv/libyuv"; description = "Open source project that includes YUV scaling and conversion functionality"; + mainProgram = "yuvconvert"; platforms = platforms.unix; maintainers = with maintainers; [ leixb ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/lightgbm/default.nix b/nixpkgs/pkgs/development/libraries/lightgbm/default.nix index 09ac8b8fa863..5f8e6ceaecd0 100644 --- a/nixpkgs/pkgs/development/libraries/lightgbm/default.nix +++ b/nixpkgs/pkgs/development/libraries/lightgbm/default.nix @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LightGBM is a gradient boosting framework that uses tree based learning algorithms."; + mainProgram = "lightgbm"; homepage = "https://github.com/microsoft/LightGBM"; license = licenses.mit; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix index 6367b93b1a21..0997513f5a51 100644 --- a/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lblas" - "--disable-optimization" + "--without-archnative" ] ++ lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ library for exact, high-performance linear algebra"; + mainProgram = "linbox-config"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/log4cpp/default.nix b/nixpkgs/pkgs/development/libraries/log4cpp/default.nix index c4255babca56..1a024a80cca0 100644 --- a/nixpkgs/pkgs/development/libraries/log4cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4cpp/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://log4cpp.sourceforge.net/"; description = "A logging framework for C++ patterned after Apache log4j"; + mainProgram = "log4cpp-config"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/log4shib/default.nix b/nixpkgs/pkgs/development/libraries/log4shib/default.nix index 42a428b35c7e..26313ddae580 100644 --- a/nixpkgs/pkgs/development/libraries/log4shib/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4shib/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; + mainProgram = "log4shib-config"; maintainers = [ ]; license = licenses.lgpl21; homepage = "http://log4cpp.sf.net"; diff --git a/nixpkgs/pkgs/development/libraries/luksmeta/default.nix b/nixpkgs/pkgs/development/libraries/luksmeta/default.nix index afefcfed82c7..976f6f188269 100644 --- a/nixpkgs/pkgs/development/libraries/luksmeta/default.nix +++ b/nixpkgs/pkgs/development/libraries/luksmeta/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple library for storing metadata in the LUKSv1 header"; + mainProgram = "luksmeta"; homepage = "https://github.com/latchset/luksmeta/"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/magic-enum/default.nix b/nixpkgs/pkgs/development/libraries/magic-enum/default.nix index ccf439ca9190..ac8afa938ea8 100644 --- a/nixpkgs/pkgs/development/libraries/magic-enum/default.nix +++ b/nixpkgs/pkgs/development/libraries/magic-enum/default.nix @@ -5,26 +5,29 @@ }: stdenv.mkDerivation rec{ pname = "magic-enum"; - version = "0.8.2"; + version = "0.9.5"; + src = fetchFromGitHub { owner = "Neargye"; repo = "magic_enum"; - rev = "v${version}"; - sha256 = "sha256-k4zCEQxO0N/o1hDYxw5p9u0BMwP/5oIoe/4yw7oqEo0="; + rev = "refs/tags/v${version}"; + hash = "sha256-Q82HdlEMXpiGISnqdjFd0rxiLgsobsoWiqqGLawu2pM="; }; nativeBuildInputs = [ cmake ]; - # disable tests until upstream fixes build issues with gcc 12 - # see https://github.com/Neargye/magic_enum/issues/235 - doCheck = false; cmakeFlags = [ - "-DMAGIC_ENUM_OPT_BUILD_TESTS=OFF" + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib;{ description = "Static reflection for enums (to string, from string, iteration) for modern C++"; homepage = "https://github.com/Neargye/magic_enum"; + changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Alper-Celik ]; }; diff --git a/nixpkgs/pkgs/development/libraries/malcontent/default.nix b/nixpkgs/pkgs/development/libraries/malcontent/default.nix index d897230f8f37..34d1731e8a09 100644 --- a/nixpkgs/pkgs/development/libraries/malcontent/default.nix +++ b/nixpkgs/pkgs/development/libraries/malcontent/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { outputsToInstall = [ "bin" "out" "man" ]; description = "Parental controls library"; + mainProgram = "malcontent-client"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; diff --git a/nixpkgs/pkgs/development/libraries/malcontent/ui.nix b/nixpkgs/pkgs/development/libraries/malcontent/ui.nix index 59950a75c745..cf421bd11c19 100644 --- a/nixpkgs/pkgs/development/libraries/malcontent/ui.nix +++ b/nixpkgs/pkgs/development/libraries/malcontent/ui.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "UI components for parental controls library"; + mainProgram = "malcontent-control"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index a40f5c6b15e4..7920b4405b2e 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -81,8 +81,8 @@ # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "24.0.2"; - hash = "sha256-lOKKjtrQbY7SuD61PyU7nrWqYsMID5OXAuGzA5tWyeg="; + version = "24.0.3"; + hash = "sha256-d67JoqN7fTWW6hZAs8xT0LXZs7Uqvtid4H43F+kb/b4="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule diff --git a/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix b/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix index 9ae718de4db5..bc30b6de9f4a 100644 --- a/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix +++ b/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { (like Result and Option in Programming Language Rust). ''; license = licenses.mit; - maintainers = with maintainers; [ ken-matsui ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; }) diff --git a/nixpkgs/pkgs/development/libraries/mono-addins/default.nix b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix index 158b39a8186a..9a31fbb69eeb 100644 --- a/nixpkgs/pkgs/development/libraries/mono-addins/default.nix +++ b/nixpkgs/pkgs/development/libraries/mono-addins/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.mono-project.com/archived/monoaddins/"; description = "A generic framework for creating extensible applications"; + mainProgram = "mautil"; longDescription = '' Mono.Addins is a generic framework for creating extensible applications, and for creating libraries which extend those applications. diff --git a/nixpkgs/pkgs/development/libraries/mpfi/default.nix b/nixpkgs/pkgs/development/libraries/mpfi/default.nix index 4bc568523c9f..54abf134d366 100644 --- a/nixpkgs/pkgs/development/libraries/mpfi/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpfi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-aj/QmJ38ifsW36JFQcbp55aIQRvOpiqLHwEh/aFXsgo="; }; - sourceRoot = "source/mpfi"; + sourceRoot = "${src.name}/mpfi"; nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ mpfr ]; diff --git a/nixpkgs/pkgs/development/libraries/mtdev/default.nix b/nixpkgs/pkgs/development/libraries/mtdev/default.nix index 9e6a45e2975a..e067e0c3d274 100644 --- a/nixpkgs/pkgs/development/libraries/mtdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtdev/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; + mainProgram = "mtdev-test"; longDescription = '' The mtdev is a stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol. The events put into diff --git a/nixpkgs/pkgs/development/libraries/mythes/default.nix b/nixpkgs/pkgs/development/libraries/mythes/default.nix index 4683940b9cc6..960fefc74ac1 100644 --- a/nixpkgs/pkgs/development/libraries/mythes/default.nix +++ b/nixpkgs/pkgs/development/libraries/mythes/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://hunspell.sourceforge.net/"; description = "Thesaurus library from Hunspell project"; + mainProgram = "th_gen_idx.pl"; license = lib.licenses.bsd3; inherit (hunspell.meta) platforms; }; diff --git a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix index b740e83f4c25..24b4a18c7088 100644 --- a/nixpkgs/pkgs/development/libraries/nanoflann/default.nix +++ b/nixpkgs/pkgs/development/libraries/nanoflann/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.4"; + version = "1.5.5"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${finalAttrs.version}"; - hash = "sha256-7Vt/x9jHRqtVTv0MbHxIwd1/cTUB4aIgOiI+7cz0iu0="; + hash = "sha256-a1XX1tvXfrPCar9EGMXzxLg2bXJaK85t2Bd8CworwFk="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index 281689c60b67..2680dbd1ae92 100644 --- a/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S2LMD15MYd/t/Z8B1OQ0hVrZQLR6Gf4LB45mhmDwblg="; + hash = "sha256-BArEaQa+CNGzIoENsZSj9seFx9qdCLWiejh6EvpTch8="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/neon/default.nix b/nixpkgs/pkgs/development/libraries/neon/default.nix index f26dbf5ace45..cbc8d3207e01 100644 --- a/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An HTTP and WebDAV client library"; + mainProgram = "neon-config"; homepage = "https://notroj.github.io/neon/"; changelog = "https://github.com/notroj/${pname}/blob/${version}/NEWS"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix index 945eb219229f..08f812a272a2 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ API to manipulate netcdf files"; + mainProgram = "ncxx4-config"; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = lib.licenses.free; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix index d64d631f94ce..978f906b7adc 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fortran API to manipulate netcdf files"; + mainProgram = "nf-config"; homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = licenses.free; maintainers = [ maintainers.bzizou ]; diff --git a/nixpkgs/pkgs/development/libraries/newt/default.nix b/nixpkgs/pkgs/development/libraries/newt/default.nix index e5dbb563cfb5..1e6f8de2d589 100644 --- a/nixpkgs/pkgs/development/libraries/newt/default.nix +++ b/nixpkgs/pkgs/development/libraries/newt/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for color text mode, widget based user interfaces"; + mainProgram = "whiptail"; homepage = "https://pagure.io/newt"; changelog = "https://pagure.io/newt/blob/master/f/CHANGES"; license = licenses.lgpl2; diff --git a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index f4ae615b6e94..805fe6e3bb20 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.59.0"; + version = "1.60.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-A1P8u6ENKl9304ouSS5eZ3tjexdxI0WkcyXDw1+0d/g="; + sha256 = "sha256-W4wmgdQstLMcs+DaDggb+jAl1cNZKN6PYHAVUgFbAM4="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index 04b220bacee1..b52156977411 100644 --- a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-KKfr5AjaC56yUNdk928H1PyP79GnQJ2pIZcZQTgLhEQ="; + hash = "sha256-C1Rk0KzTvFpwCz8vXvhSqGjYmGyLZxmnzZhPLZiL97M="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/npth/default.nix b/nixpkgs/pkgs/development/libraries/npth/default.nix index 208924bfd7b5..023d9cebb973 100644 --- a/nixpkgs/pkgs/development/libraries/npth/default.nix +++ b/nixpkgs/pkgs/development/libraries/npth/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { pname = "npth"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://gnupg/npth/npth-${version}.tar.bz2"; - sha256 = "1lg2lkdd3z1s3rpyf88786l243adrzyk9p4q8z9n41ygmpcsp4qk"; + sha256 = "sha256-hYn1aTe3XOM7KNMS/MvzArO3HsPzlF/eaqp0AnkUrQU="; }; doCheck = true; meta = with lib; { description = "The New GNU Portable Threads Library"; + mainProgram = "npth-config"; longDescription = '' This is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. diff --git a/nixpkgs/pkgs/development/libraries/nss/latest.nix b/nixpkgs/pkgs/development/libraries/nss/latest.nix index dfc8a21e206c..8ac5a3b23a85 100644 --- a/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/nixpkgs/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.98"; - hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc="; + version = "3.99"; + hash = "sha256-6JocWJpA+VjEPZOxmD74toyEBLOTzCxSWUzrxPi52bU="; } diff --git a/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix index 324c5269dfbc..8faa50f83b72 100644 --- a/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss_wrapper/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A 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; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/ntbtls/default.nix b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix index 888b1fe4b3df..bdc2a919613c 100644 --- a/nixpkgs/pkgs/development/libraries/ntbtls/default.nix +++ b/nixpkgs/pkgs/development/libraries/ntbtls/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiny TLS 1.2 only implementation"; + mainProgram = "ntbtls-config"; homepage = "https://www.gnupg.org/software/ntbtls/"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/nixpkgs/pkgs/development/libraries/nuspell/default.nix index c9e6aeeba363..867843df8068 100644 --- a/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free and open source C++ spell checking library"; + mainProgram = "nuspell"; homepage = "https://nuspell.github.io/"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix index 1b7caf2b9c84..0930b8904bdf 100644 --- a/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix +++ b/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; + mainProgram = "cllayerinfo"; homepage = "https://github.com/OCL-dev/ocl-icd"; license = licenses.bsd2; platforms = platforms.unix ++ platforms.windows; diff --git a/nixpkgs/pkgs/development/libraries/ode/default.nix b/nixpkgs/pkgs/development/libraries/ode/default.nix index 6ae60b7b2d3a..be67a95ebfc5 100644 --- a/nixpkgs/pkgs/development/libraries/ode/default.nix +++ b/nixpkgs/pkgs/development/libraries/ode/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Open Dynamics Engine"; + mainProgram = "ode-config"; homepage = "https://www.ode.org"; license = with licenses; [ bsd3 lgpl21Only lgpl3Only zlib ]; maintainers = with maintainers; [ wegank ]; diff --git a/nixpkgs/pkgs/development/libraries/odpic/default.nix b/nixpkgs/pkgs/development/libraries/odpic/default.nix index 89502e6c3eb7..6ab232ae42e9 100644 --- a/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "5.1.0"; + version = "5.2.0"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-J7v6nNwAXy0j2mXc9RcO/V54WutA9TvTGUubHkpNBWo="; + sha256 = "sha256-2oM78YgP14oyFBWZ8KdHlGsN3hjoWTBcIvOI+93sSyM="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index f6cd2987aa0d..6749be599a40 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -34,7 +34,16 @@ }: let - common = { version, hash }: stdenv.mkDerivation { + common = { version, hash, imguiVersion, imguiHash }: + let + imgui.src = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + rev = "v${imguiVersion}"; + hash = imguiHash; + }; + in + stdenv.mkDerivation { pname = "ogre"; inherit version; @@ -45,6 +54,12 @@ let inherit hash; }; + postPatch = '' + mkdir -p build + cp -R ${imgui.src} build/imgui-${imguiVersion} + chmod -R u+w build/imgui-${imguiVersion} + ''; + nativeBuildInputs = [ cmake pkg-config @@ -80,11 +95,10 @@ let ]; cmakeFlags = [ - "-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=FALSE" - "-DOGRE_BUILD_DEPENDENCIES=OFF" - "-DOGRE_BUILD_SAMPLES=${toString withSamples}" + (lib.cmakeBool "OGRE_BUILD_DEPENDENCIES" false) + (lib.cmakeBool "OGRE_BUILD_SAMPLES" withSamples) ] ++ lib.optionals stdenv.isDarwin [ - "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=FALSE" + (lib.cmakeBool "OGRE_BUILD_LIBS_AS_FRAMEWORKS" false) ]; meta = { @@ -98,12 +112,18 @@ let in { ogre_14 = common { - version = "14.1.2"; - hash = "sha256-qPoC5VXA9IC1xiFLrvE7cqCZFkuiEM0OMowUXDlmhF4="; + version = "14.2.2"; + hash = "sha256-85hpujmlM3N81mkiA80xx2C4GsdzWkP61bwdfmw1zt8="; + # https://github.com/OGRECave/ogre/blob/v14.2.2/Components/Overlay/CMakeLists.txt + imguiVersion = "1.90.4"; + imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; }; ogre_13 = common { version = "13.6.5"; hash = "sha256-8VQqePrvf/fleHijVIqWWfwOusGjVR40IIJ13o+HwaE="; + # https://github.com/OGRECave/ogre/blob/v13.6.5/Components/Overlay/CMakeLists.txt + imguiVersion = "1.87"; + imguiHash = "sha256-H5rqXZFw+2PfVMsYvAK+K+pxxI8HnUC0GlPhooWgEYM="; }; } diff --git a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix index a1a9dc875735..cf00629e3842 100644 --- a/nixpkgs/pkgs/development/libraries/oniguruma/default.nix +++ b/nixpkgs/pkgs/development/libraries/oniguruma/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/kkos/oniguruma"; description = "Regular expressions library"; + mainProgram = "onig-config"; license = licenses.bsd2; maintainers = with maintainers; [ artturin ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/opencomposite/default.nix b/nixpkgs/pkgs/development/libraries/opencomposite/default.nix deleted file mode 100644 index fc1b6e631964..000000000000 --- a/nixpkgs/pkgs/development/libraries/opencomposite/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab - -, cmake - -, glm -, libGL -, openxr-loader -, python3 -, vulkan-headers -, vulkan-loader -, xorg - -, nix-update-script -}: - -stdenv.mkDerivation { - pname = "opencomposite"; - version = "unstable-2024-02-16"; - - src = fetchFromGitLab { - owner = "znixian"; - repo = "OpenOVR"; - rev = "737bbedd29343bc2f808804e2b24302390a07655"; - hash = "sha256-azb7T0d0YMQRc0Slq1tzNj6bOmCzfHW3ciY9lN+RTao="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - glm - libGL - openxr-loader - python3 - vulkan-headers - vulkan-loader - xorg.libX11 - ]; - - cmakeFlags = [ - "-DUSE_SYSTEM_OPENXR=ON" - "-DUSE_SYSTEM_GLM=ON" - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/lib/opencomposite - cp -r bin/ $out/lib/opencomposite - runHook postInstall - ''; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version=branch=openxr" ]; - }; - - meta = with lib; { - description = "Reimplementation of OpenVR, translating calls to OpenXR"; - homepage = "https://gitlab.com/znixian/OpenOVR"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ Scrumplex ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/opencomposite/helper.nix b/nixpkgs/pkgs/development/libraries/opencomposite/helper.nix deleted file mode 100644 index f19f5e868139..000000000000 --- a/nixpkgs/pkgs/development/libraries/opencomposite/helper.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ writeShellApplication - -, monado -, opencomposite -}: -writeShellApplication { - name = "opencomposite-helper"; - text = '' - # Tell Proton to use OpenComposite instead of OpenVR - export VR_OVERRIDE=${opencomposite}/lib/opencomposite - # Help OpenComposite find the OpenXR runtime - export XR_RUNTIME_JSON=${monado}/share/openxr/1/openxr_monado.json - # Tell Steam Pressure Vessel to allow access to Monado - export PRESSURE_VESSEL_FILESYSTEMS_RW=$XDG_RUNTIME_DIR/monado_comp_ipc - exec "$@" - ''; -} - diff --git a/nixpkgs/pkgs/development/libraries/opencsg/default.nix b/nixpkgs/pkgs/development/libraries/opencsg/default.nix index 7625db9a5953..4adebaf72b16 100644 --- a/nixpkgs/pkgs/development/libraries/opencsg/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencsg/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Constructive Solid Geometry library"; + mainProgram = "opencsgexample"; homepage = "http://www.opencsg.org/"; platforms = platforms.unix; maintainers = [ maintainers.raskin ]; diff --git a/nixpkgs/pkgs/development/libraries/opendbx/default.nix b/nixpkgs/pkgs/development/libraries/opendbx/default.nix index b7a4a34390d9..04ffde29daa0 100644 --- a/nixpkgs/pkgs/development/libraries/opendbx/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendbx/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "Extremely lightweight but extensible database access library written in C"; + mainProgram = "odbx-sql"; license = licenses.lgpl21; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix index 9e8ab07b3aa4..7e44f2a50eeb 100644 --- a/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensaml-cpp/default.nix @@ -26,6 +26,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"; + mainProgram = "samlsign"; platforms = platforms.unix; license = licenses.asl20; maintainers = [ ]; diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 7af5085410f7..c0b4fe75b610 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -86,6 +86,7 @@ let aarch64-darwin = "./Configure darwin64-arm64-cc"; x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + powerpc64-linux = "./Configure linux-ppc64"; riscv64-linux = "./Configure linux64-riscv64"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform diff --git a/nixpkgs/pkgs/development/libraries/openvdb/default.nix b/nixpkgs/pkgs/development/libraries/openvdb/default.nix index c5397b259a30..5af5a27f34f5 100644 --- a/nixpkgs/pkgs/development/libraries/openvdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvdb/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec meta = with lib; { description = "An open framework for voxel"; + mainProgram = "vdb_print"; homepage = "https://www.openvdb.org"; maintainers = [ maintainers.guibou ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/orcania/default.nix b/nixpkgs/pkgs/development/libraries/orcania/default.nix index f0334ea4de16..14cc99622755 100644 --- a/nixpkgs/pkgs/development/libraries/orcania/default.nix +++ b/nixpkgs/pkgs/development/libraries/orcania/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Potluck with different functions for different purposes that can be shared among C programs"; + mainProgram = "base64url"; homepage = "https://github.com/babelouest/orcania"; license = licenses.lgpl21; maintainers = with maintainers; [ johnazoidberg ]; diff --git a/nixpkgs/pkgs/development/libraries/ortp/default.nix b/nixpkgs/pkgs/development/libraries/ortp/default.nix index 1c65fa1981f1..3c61e7b5c9d9 100644 --- a/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Real-Time Transport Protocol (RFC3550) stack. Part of the Linphone project."; + mainProgram = "ortp_tester"; homepage = "https://linphone.org/technical-corner/ortp"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix b/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix index 0f345eb5134f..23f0bc99c88a 100644 --- a/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/paho-mqtt-c/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Eclipse Paho MQTT C Client Library"; + mainProgram = "MQTTVersion"; homepage = "https://www.eclipse.org/paho/"; license = licenses.epl20; maintainers = with maintainers; [ sikmir ]; diff --git a/nixpkgs/pkgs/development/libraries/pangolin/default.nix b/nixpkgs/pkgs/development/libraries/pangolin/default.nix index 4618a6d43187..5e8ec502a65f 100644 --- a/nixpkgs/pkgs/development/libraries/pangolin/default.nix +++ b/nixpkgs/pkgs/development/libraries/pangolin/default.nix @@ -1,11 +1,10 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew , xorg, ffmpeg_4, libjpeg, libpng, libtiff, eigen -, Carbon ? null, Cocoa ? null +, Carbon, Cocoa }: stdenv.mkDerivation rec { pname = "pangolin"; - version = "0.9.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix b/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix index a957d517bf7a..d17c806700f4 100644 --- a/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcmsolver/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An API for the Polarizable Continuum Model"; + mainProgram = "run_pcm"; homepage = "https://pcmsolver.readthedocs.io/en/stable/"; license = licenses.lgpl3Only; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/pdal/default.nix b/nixpkgs/pkgs/development/libraries/pdal/default.nix index 83d451080c20..6f362967a2a2 100644 --- a/nixpkgs/pkgs/development/libraries/pdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -2,7 +2,6 @@ , stdenv , callPackage , fetchFromGitHub -, fetchpatch , testers , enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format @@ -28,24 +27,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-wrgEbCYOGW1yrVxyX+UDa5jcUqab3letEGuvWnYvtac="; + sha256 = "sha256-knyDVUZH+X563UzKkvDpi08EcXU5s4+Jvya3Xprpt1A="; }; - patches = [ - # Fix running tests - # https://github.com/PDAL/PDAL/issues/4280 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/PDAL/PDAL/pull/4291.patch"; - sha256 = "sha256-jFS+trwMRBfm+MpT0CcuD/hdYmfyuQj2zyoe06B6G9U="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/nixpkgs/pkgs/development/libraries/phonon/default.nix b/nixpkgs/pkgs/development/libraries/phonon/default.nix index dd20b6dcebe6..58cd0245d052 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://community.kde.org/Phonon"; description = "Multimedia API for Qt"; + mainProgram = "phononsettings"; license = lib.licenses.lgpl2; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ttuegel ]; diff --git a/nixpkgs/pkgs/development/libraries/physfs/default.nix b/nixpkgs/pkgs/development/libraries/physfs/default.nix index 28b81867d203..27f7c019ac77 100644 --- a/nixpkgs/pkgs/development/libraries/physfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/physfs/default.nix @@ -27,6 +27,7 @@ let meta = with lib; { homepage = "https://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; + mainProgram = "test_physfs"; changelog = "https://github.com/icculus/physfs/releases/tag/release-${version}"; license = licenses.zlib; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix index 92b6ae003fca..2c6c9702c249 100644 --- a/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ultra-fast theory predictions for collider observables"; + mainProgram = "apfelgrid-config"; license = licenses.mit; homepage = "https://nhartland.github.io/APFELgrid/"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix index d9cd1661af8a..a4c01dd6ecf3 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; + mainProgram = "fastjet-config"; license = lib.licenses.gpl2Plus; homepage = "http://fastjet.fr/"; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix index f803bea98f60..9d2eab6e7f15 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hepmc3/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The 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/"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix index af90192878d7..af6200b9c578 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Higher Order Perturbative Parton Evolution Toolkit"; + mainProgram = "hoppet-config"; license = licenses.gpl2; homepage = "https://hoppet.hepforge.org"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix index e48a2f4638bc..701fd149e45e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "a Mellin Evolution LibrAry"; + mainProgram = "mela-config"; license = licenses.gpl3; homepage = "https://github.com/vbertone/MELA"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index 917dbf40a37d..a0daa91a1b54 100644 --- a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program for the generation of high-energy physics events"; + mainProgram = "pythia8-config"; license = licenses.gpl2Only; homepage = "https://pythia.org"; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix index e25b98498ddb..fdb79250ed3f 100644 --- a/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/qcdnum/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A very fast QCD evolution program written in FORTRAN77"; + mainProgram = "qcdnum-config"; license = lib.licenses.gpl3; homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 7b470f836756..3459112456fe 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -58,6 +58,7 @@ , avahi , raopSupport ? true , openssl +, opusSupport ? true , rocSupport ? true , roc-toolkit , x11Support ? true @@ -65,7 +66,6 @@ , xorg , mysofaSupport ? true , libmysofa -, tinycompress , ffadoSupport ? x11Support && stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado , libselinux @@ -76,7 +76,7 @@ assert ldacbtSupport -> bluezSupport; stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ "out" @@ -92,7 +92,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-QVw7Q+RNo8BBy/uxoZeSQQn/vQcIl1bOiA9fYMR0+oI="; + sha256 = "sha256-LROI1rGQELlGXkapX3XfDqB7Rc5YAOdCwaMQUG/iU8c="; }; patches = [ @@ -126,20 +126,20 @@ stdenv.mkDerivation(finalAttrs: { ncurses readline udev - tinycompress ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] - ++ lib.optionals libcameraSupport [ libcamera libdrm ] + ++ lib.optionals libcameraSupport [ libcamera ] ++ lib.optional ffmpegSupport ffmpeg ++ lib.optionals bluezSupport [ bluez libfreeaptx liblc3 sbc fdk_aac libopus ] ++ lib.optional ldacbtSupport ldacbt ++ lib.optional nativeModemManagerSupport modemmanager + ++ lib.optional opusSupport libopus ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl ++ lib.optional rocSupport roc-toolkit - ++ lib.optionals vulkanSupport [ vulkan-headers vulkan-loader ] + ++ lib.optionals vulkanSupport [ libdrm vulkan-headers vulkan-loader ] ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ] ++ lib.optional mysofaSupport libmysofa ++ lib.optional ffadoSupport ffado; @@ -162,6 +162,7 @@ stdenv.mkDerivation(finalAttrs: { (lib.mesonEnable "systemd-system-service" enableSystemd) (lib.mesonEnable "udev" (!enableSystemd)) (lib.mesonEnable "ffmpeg" ffmpegSupport) + (lib.mesonEnable "pw-cat-ffmpeg" ffmpegSupport) (lib.mesonEnable "bluez5" bluezSupport) (lib.mesonEnable "bluez5-backend-hsp-native" nativeHspSupport) (lib.mesonEnable "bluez5-backend-hfp-native" nativeHfpSupport) @@ -172,6 +173,7 @@ stdenv.mkDerivation(finalAttrs: { (lib.mesonEnable "bluez5-codec-lc3plus" false) (lib.mesonEnable "bluez5-codec-lc3" bluezSupport) (lib.mesonEnable "bluez5-codec-ldac" ldacbtSupport) + (lib.mesonEnable "opus" opusSupport) (lib.mesonOption "sysconfdir" "/etc") (lib.mesonEnable "raop" raopSupport) (lib.mesonOption "session-managers" "") diff --git a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index a5bdb729a102..c60ac184978a 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.17"; + version = "0.5.0"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; + hash = "sha256-zcYZvyGsGuiwuL9nOD5mW6RFwa9cPB9HvoQqdw2jlmY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix index 0a15876db963..e18bc6450206 100644 --- a/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "pixman"; - version = "0.43.2"; + version = "0.43.4"; src = fetchurl { urls = with finalAttrs; [ "mirror://xorg/individual/lib/${pname}-${version}.tar.gz" "https://cairographics.org/releases/${pname}-${version}.tar.gz" ]; - hash = "sha256-6nkpflQY+1KNBGbotbkdG+iIV/o3BvSXd7KSWnKumSQ="; + hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY="; }; separateDebugInfo = !stdenv.hostPlatform.isStatic; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; postInstall = glib.flattenInclude; diff --git a/nixpkgs/pkgs/development/libraries/pkger/default.nix b/nixpkgs/pkgs/development/libraries/pkger/default.nix index 073c57c013da..f2047c82f051 100644 --- a/nixpkgs/pkgs/development/libraries/pkger/default.nix +++ b/nixpkgs/pkgs/development/libraries/pkger/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + mainProgram = "pkger"; homepage = "https://github.com/markbates/pkger"; changelog = "https://github.com/markbates/pkger/releases/tag/v${version}"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/plplot/default.nix b/nixpkgs/pkgs/development/libraries/plplot/default.nix index 66c498418d98..6e4e47f094ed 100644 --- a/nixpkgs/pkgs/development/libraries/plplot/default.nix +++ b/nixpkgs/pkgs/development/libraries/plplot/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform scientific graphics plotting library"; + mainProgram = "pltek"; homepage = "https://plplot.org"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix b/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix index a0f084606906..0c68c2950eb2 100644 --- a/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/poly2tri-c/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations"; + mainProgram = "p2tc"; homepage = "https://code.google.com/archive/p/poly2tri-c/"; license = licenses.bsd3; maintainers = with lib.maintainers; [ jtojnar ]; diff --git a/nixpkgs/pkgs/development/libraries/pplite/default.nix b/nixpkgs/pkgs/development/libraries/pplite/default.nix index c9c0d1863382..77841a3f5efd 100644 --- a/nixpkgs/pkgs/development/libraries/pplite/default.nix +++ b/nixpkgs/pkgs/development/libraries/pplite/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ezaffanella/PPLite"; description = "Convex polyhedra library for Abstract Interpretation"; + mainProgram = "pplite_lcdd"; license = lib.licenses.gpl3Only; }; } diff --git a/nixpkgs/pkgs/development/libraries/protolock/default.nix b/nixpkgs/pkgs/development/libraries/protolock/default.nix index c1b54306dca8..f8483eb5d68b 100644 --- a/nixpkgs/pkgs/development/libraries/protolock/default.nix +++ b/nixpkgs/pkgs/development/libraries/protolock/default.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Protocol Buffer companion tool. Track your .proto files and prevent changes to messages and services which impact API compatibility. https://protolock.dev"; + mainProgram = "protolock"; homepage = "https://github.com/nilslice/protolock"; license = licenses.bsd3; maintainers = with maintainers; [ groodt ]; diff --git a/nixpkgs/pkgs/development/libraries/ptex/default.nix b/nixpkgs/pkgs/development/libraries/ptex/default.nix index a5827fe188c5..930217dab39c 100644 --- a/nixpkgs/pkgs/development/libraries/ptex/default.nix +++ b/nixpkgs/pkgs/development/libraries/ptex/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec meta = with lib; { description = "Per-Face Texture Mapping for Production Rendering"; + mainProgram = "ptxinfo"; homepage = "http://ptex.us/"; license = licenses.bsd3; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/pth/default.nix b/nixpkgs/pkgs/development/libraries/pth/default.nix index c75b0d1db2d8..7cb9046acf21 100644 --- a/nixpkgs/pkgs/development/libraries/pth/default.nix +++ b/nixpkgs/pkgs/development/libraries/pth/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The GNU Portable Threads library"; + mainProgram = "pth-config"; homepage = "https://www.gnu.org/software/pth"; license = licenses.lgpl21Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/qoi/default.nix b/nixpkgs/pkgs/development/libraries/qoi/default.nix index b218fca11d1f..c5d527aa3ec5 100644 --- a/nixpkgs/pkgs/development/libraries/qoi/default.nix +++ b/nixpkgs/pkgs/development/libraries/qoi/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "'Quite OK Image Format' for fast, lossless image compression"; + mainProgram = "qoiconv"; homepage = "https://qoiformat.org/"; license = licenses.mit; maintainers = with maintainers; [ hzeller ]; diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 872faafdd1ff..33967e39ccfa 100644 --- a/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "11.8.0"; + version = "11.9.0"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-EoFCRAWia8LAaLdoBW0ByndzIAjSvQ7bJFh0SZ/FKtY="; + hash = "sha256-HD7+2TBDLBIt+VaPO5WgnDjNZOj8naltFmYdYzOIn+4="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 3503067aca75..44007bec07b8 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -293,6 +293,7 @@ qtModule ({ meta = with lib; { description = "A web engine based on the Chromium web browser"; + mainProgram = "qwebengine_convert_dict"; maintainers = with maintainers; [ matthewbauer ]; # qtwebengine-5.15.8: "QtWebEngine can only be built for x86, diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index 0a16f725c477..c223a2236353 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -263,6 +263,10 @@ stdenv.mkDerivation rec { moveToOutput "mkspecs/modules" "$dev" fixQtModulePaths "$dev/mkspecs/modules" fixQtBuiltinPaths "$out" '*.pr?' + '' + lib.optionalString stdenv.isLinux '' + + # FIXME: not sure why this isn't added automatically? + patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so ''; dontStrip = debugSymbols; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix index 92d676f7c8e2..e9363f75ebbe 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -10,4 +10,5 @@ qtModule { propagatedBuildInputs = [ qtbase qtquick3d ]; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-faligned-allocation"; + meta.mainProgram = "cooker"; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix index 213814a017e2..085ce493de61 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix @@ -6,4 +6,5 @@ qtModule { pname = "qtquickeffectmaker"; propagatedBuildInputs = [ qtbase qtquick3d ]; + meta.mainProgram = "qqem"; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix index 3a7285d0a8b0..59033f421cc2 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix @@ -3,4 +3,5 @@ qtModule { pname = "qtserialbus"; propagatedBuildInputs = [ qtbase qtserialport ]; + meta.mainProgram = "canbusutil"; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix index 5a4b894b9abd..ce0f381028c5 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix @@ -1,8 +1,15 @@ { qtModule , qtbase +, stdenv +, lib +, pkgsBuildBuild }: qtModule { pname = "qtshadertools"; propagatedBuildInputs = [ qtbase ]; + cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderToolsTools" + ]; + meta.mainProgram = "qsb"; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix index d81634d9ef1b..3d7df288839a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix @@ -5,11 +5,20 @@ , libmng , zlib , pkg-config +, lib +, stdenv }: qtModule { pname = "qtsvg"; propagatedBuildInputs = [ qtbase ]; - buildInputs = [ libwebp jasper libmng zlib ]; + buildInputs = [ + libwebp + ] ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + jasper + ] ++ [ + libmng + zlib + ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/nixpkgs/pkgs/development/libraries/quarto/default.nix b/nixpkgs/pkgs/development/libraries/quarto/default.nix index c61bb41e4484..09a44adbe561 100644 --- a/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation (final: { meta = with lib; { description = "Open-source scientific and technical publishing system built on Pandoc"; + mainProgram = "quarto"; longDescription = '' Quarto is an open-source scientific and technical publishing system built on Pandoc. Quarto documents are authored using markdown, an easy to write plain text format. diff --git a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 1544eff83621..ab0a5edb7d42 100644 --- a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-v/apbqRyv93PZsO397lvyIMtA1JtYrOpbWAVAbMCmP4="; + hash = "sha256-4J2j+/0ZVMNlrgLbEQk3me/EX07TZ/rLsT1/5ufxbic="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix b/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix index 0f4c3d40403e..fd7ffe61ba39 100644 --- a/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix +++ b/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix @@ -6,8 +6,6 @@ , graphviz , gtest , valgrind -# One of "11" or "17"; default in source is CXX 11 -, cxxStandard ? "11" , buildDocs ? true , buildTests ? !stdenv.hostPlatform.isStatic && !stdenv.isDarwin , buildExamples ? true @@ -49,8 +47,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "RAPIDJSON_BUILD_DOC" buildDocs) (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" buildTests) (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" buildExamples) - (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" (cxxStandard == "11")) - (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" (cxxStandard == "17")) + # gtest 1.13+ requires C++14 or later. + (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" false) + (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" true) ] ++ lib.optionals buildTests [ (lib.cmakeFeature "GTEST_INCLUDE_DIR" "${lib.getDev gtest}") ]; @@ -77,6 +76,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ Madouura ]; - broken = (cxxStandard != "11" && cxxStandard != "17"); }; }) diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index feb565076326..d1223811c686 100644 --- a/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2024-02-01"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-a6yo0zLgb193TDL8akselJuZfYqCjPwQ/FJ7+KexuLE="; + hash = "sha256-VuI9OsfGTdVywdyVfBrSzXSjbSfevne+YQ2oOz4R3DM="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix b/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix index 8e0fe7947f44..b4119f1133f5 100644 --- a/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix +++ b/nixpkgs/pkgs/development/libraries/recastnavigation/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/recastnavigation/recastnavigation"; description = "Navigation-mesh Toolset for Games"; + mainProgram = "RecastDemo"; license = licenses.zlib; maintainers = with maintainers; [ marius851000 ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix b/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix index 7711dde497f0..1323bd98a43c 100644 --- a/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/retro-gtk/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The GTK Libretro frontend framework"; + mainProgram = "retro-demo"; longDescription = '' Libretro is a plugin format design to implement video game console emulators, video games and similar multimedia diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index c25a349ba32d..6c2aaaa8815a 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -39,20 +39,9 @@ stdenv.mkDerivation (finalAttrs: { "tools" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - "-Wno-error=deprecated-copy" - "-Wno-error=pessimizing-move" - # Needed with GCC 12 - "-Wno-error=format-truncation" - "-Wno-error=maybe-uninitialized" - ] ++ lib.optionals stdenv.cc.isClang [ - "-Wno-error=unused-private-field" - "-faligned-allocation" - ] ++ lib.optionals (lib.versionOlder finalAttrs.version "8") [ - "-Wno-error=unused-but-set-variable" - ] ++ lib.optionals (lib.versionOlder finalAttrs.version "7") [ - "-Wno-error=deprecated-copy" - ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-faligned-allocation" + ]); cmakeFlags = [ "-DPORTABLE=1" @@ -71,12 +60,25 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_RTTI=1" "-DROCKSDB_INSTALL_ON_WINDOWS=YES" # harmless elsewhere (lib.optional sse42Support "-DFORCE_SSE42=1") - "-DFAIL_ON_WARNINGS=${if stdenv.hostPlatform.isMinGW then "NO" else "YES"}" + "-DFAIL_ON_WARNINGS=NO" ] ++ lib.optional (!enableShared) "-DROCKSDB_BUILD_SHARED=0"; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; + postPatch = lib.optionalString (lib.versionOlder finalAttrs.version "8") '' + # Fix gcc-13 build failures due to missing <cstdint> and + # <system_error> includes, fixed upstyream sice 8.x + sed -e '1i #include <cstdint>' -i db/compaction/compaction_iteration_stats.h + sed -e '1i #include <cstdint>' -i table/block_based/data_block_hash_index.h + sed -e '1i #include <cstdint>' -i util/string_util.h + sed -e '1i #include <cstdint>' -i include/rocksdb/utilities/checkpoint.h + '' + lib.optionalString (lib.versionOlder finalAttrs.version "7") '' + # Fix gcc-13 build failures due to missing <cstdint> and + # <system_error> includes, fixed upstyream sice 7.x + sed -e '1i #include <system_error>' -i third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h + ''; + preInstall = '' mkdir -p $tools/bin cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/ diff --git a/nixpkgs/pkgs/development/libraries/rote/default.nix b/nixpkgs/pkgs/development/libraries/rote/default.nix index 4655d54ab98e..65e2ecd09150 100644 --- a/nixpkgs/pkgs/development/libraries/rote/default.nix +++ b/nixpkgs/pkgs/development/libraries/rote/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Our Own Terminal Emulation Library"; + mainProgram = "rote-config"; longDescription = '' ROTE is a simple C library for VT102 terminal emulation. It allows the programmer to set up virtual 'screens' and send them data. The virtual diff --git a/nixpkgs/pkgs/development/libraries/rtlcss/default.nix b/nixpkgs/pkgs/development/libraries/rtlcss/default.nix index a553e8d33ddf..327e7b2626da 100644 --- a/nixpkgs/pkgs/development/libraries/rtlcss/default.nix +++ b/nixpkgs/pkgs/development/libraries/rtlcss/default.nix @@ -17,6 +17,7 @@ buildNpmPackage rec { meta = with lib; { description = "Framework for converting Left-To-Right (LTR) Cascading Style Sheets(CSS) to Right-To-Left (RTL)"; + mainProgram = "rtlcss"; homepage = "https://rtlcss.com"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/s2geometry/default.nix b/nixpkgs/pkgs/development/libraries/s2geometry/default.nix index afd5ffa0a0a2..a8893b698a48 100644 --- a/nixpkgs/pkgs/development/libraries/s2geometry/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2geometry/default.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl gtest ]; + # Default of C++11 is too low for gtest. + # In newer versions of s2geometry this can be done with cmakeFlags. + postPatch = '' + substituteInPlace CMakeLists.txt --replace "CMAKE_CXX_STANDARD 11" "CMAKE_CXX_STANDARD 14" + ''; + meta = with lib; { description = "Computational geometry and spatial indexing on the sphere"; homepage = "http://s2geometry.io/"; diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 9f68c243cf50..a8c8a22ff1bb 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.4.3"; + version = "1.4.6"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-E3Giiu8xiTCSAPkbxOaVL/LXZWjhAS1M/n//Pe5eOKg="; + hash = "sha256-x4/AkmkmuTKxzlk8AxbydA4GctpShsKiFTTJ8m7B4TY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix index f6a8d01ab845..2f5f6851fd8d 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/libnova/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; + mainProgram = "libnovaconfig"; homepage = "http://libnova.sf.net"; license = licenses.gpl2; maintainers = with maintainers; [ hjones2199 ]; diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix index 4f98874b2595..07d64fbd97ed 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bicgl/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Brain Imaging Centre graphics library"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.hpndUc; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix index 5cf63e342242..c15689aa606a 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Brain Imaging Centre programming library"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = with licenses; [ hpndUc gpl3Plus ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix index 9af6793ef997..ce02474eeb1e 100644 --- a/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/BioMedIA/MIRTK"; description = "Medical image registration library and tools"; + mainProgram = "mirtk"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix index d791a7d4e3d6..087c6e7d01de 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generally Applicable Atomic-Charge Dependent London Dispersion Correction"; + mainProgram = "dftd4"; license = with licenses; [ lgpl3Plus gpl3Plus ]; homepage = "https://github.com/grimme-lab/dftd4"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix index 54c0d03979ab..dc8289e14ce9 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/harminv/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { 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/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix index c3257bad3e26..095e0ee182a3 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/libGDSII/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library and command-line utility for reading GDSII geometry files"; + mainProgram = "GDSIIConvert"; homepage = "https://github.com/HomerReid/libGDSII"; license = [ licenses.gpl2Only ]; maintainers = with maintainers; [ sheepforce markuskowa ]; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix index a3726ea5e5dd..a8c27b3eec56 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Modular computation tool chain library"; + mainProgram = "mctc-convert"; homepage = "https://github.com/grimme-lab/mctc-lib"; license = licenses.asl20; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/molequeue/default.nix index b560ac16c698..5cd8669c5597 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/molequeue/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/molequeue/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop integration of high performance computing resources"; + mainProgram = "molequeue"; maintainers = with maintainers; [ sheepforce ]; homepage = "https://github.com/OpenChemistry/molequeue"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix index b90f073a4f2e..020390737139 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electronegativity equilibration model for atomic partial charges"; + mainProgram = "multicharge"; license = licenses.asl20; homepage = "https://github.com/grimme-lab/multicharge"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix index 9b37f14f1403..d146fa073dc3 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Toolkit for molecular simulation using high performance GPU code"; + mainProgram = "TestReferenceHarmonicBondForce"; homepage = "https://openmm.org/"; license = with licenses; [ gpl3Plus lgpl3Plus mit ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index ae5e30d73608..d4f81e3a24cb 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Reimplementation of the DFT-D3 program"; + mainProgram = "s-dftd3"; license = with licenses; [ lgpl3Only gpl3Only ]; homepage = "https://github.com/dftd3/simple-dftd3"; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix index bea5793addbf..64374972c295 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Light-weight tight-binding framework"; + mainProgram = "tblite"; license = with licenses; [ gpl3Plus lgpl3Plus ]; homepage = "https://github.com/tblite/tblite"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix b/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix index 5a736f976957..2bbd698f7fa7 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/bonmin/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; + mainProgram = "bonmin"; homepage = "https://github.com/coin-or/Bonmin"; license = licenses.epl10; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix index 25ac539e05f2..25d6542f8da1 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix @@ -145,6 +145,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A 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; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index 639497bb1f8c..cb45787e1403 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; + mainProgram = "itpp-config"; homepage = "https://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix index b1896917658c..f6603f7d8fb8 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/lcalc/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.com/sagemath/lcalc"; description = "A program for calculating with L-functions"; + mainProgram = "lcalc"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix index 7ef60e0418ed..757a1b77dafc 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/magma/generic.nix @@ -5,35 +5,48 @@ # supportedGpuTargets: List String # } -{ blas +{ autoPatchelfHook +, blas , cmake +, cudaPackages_11 ? null , cudaPackages , cudaSupport ? config.cudaSupport , fetchurl , gfortran -, cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities , gpuTargets ? [ ] # Non-CUDA targets, that is HIP -, rocmPackages +, rocmPackages_5 , lapack , lib , libpthreadstubs , magmaRelease , ninja +, python3 , config # At least one back-end has to be enabled, # and we can't default to CUDA since it's unfree , rocmSupport ? !cudaSupport , static ? stdenv.hostPlatform.isStatic , stdenv -, symlinkJoin }: let inherit (lib) lists strings trivial; - inherit (cudaPackages) backendStdenv cudaFlags cudaVersion; inherit (magmaRelease) version hash supportedGpuTargets; + # Per https://icl.utk.edu/magma/downloads, support for CUDA 12 wasn't added until 2.7.1. + # If we're building a version prior to that, use the latest release of the 11.x series. + effectiveCudaPackages = + if strings.versionOlder version "2.7.1" + then cudaPackages_11 + else cudaPackages; + + inherit (effectiveCudaPackages) cudaAtLeast cudaFlags cudaOlder; + inherit (cudaFlags) cudaCapabilities; + + # move to newer ROCm version once supported + rocmPackages = rocmPackages_5; + # NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements # of the first list *from* the second list. That means: # lists.subtractLists a b = b - a @@ -95,19 +108,34 @@ stdenv.mkDerivation { inherit hash; }; + # Magma doesn't have anything which could be run under doCheck, but it does build test suite executables. + # These are moved to $test/bin/ and $test/lib/ in postInstall. + outputs = ["out" "test"]; + + # Fixup for the python test runners + postPatch = '' + patchShebangs ./testing/run_{tests,summarize}.py + substituteInPlace ./testing/run_tests.py \ + --replace-fail \ + "print >>sys.stderr, cmdp, \"doesn't exist (original name: \" + cmd + \", precision: \" + precision + \")\"" \ + "print(f\"{cmdp} doesn't exist (original name: {cmd}, precision: {precision})\", file=sys.stderr)" + ''; + nativeBuildInputs = [ + autoPatchelfHook cmake ninja gfortran ] ++ lists.optionals cudaSupport [ - cudaPackages.cuda_nvcc + effectiveCudaPackages.cuda_nvcc ]; buildInputs = [ libpthreadstubs lapack blas - ] ++ lists.optionals cudaSupport (with cudaPackages; [ + python3 + ] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [ cuda_cudart.dev # cuda_runtime.h cuda_cudart.lib # cudart cuda_cudart.static # cudart_static @@ -115,11 +143,11 @@ stdenv.mkDerivation { libcublas.lib # cublas libcusparse.dev # cusparse.h libcusparse.lib # cusparse - ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ + ] ++ lists.optionals (cudaOlder "11.8") [ cuda_nvprof.dev # <cuda_profiler_api.h> - ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + ] ++ lists.optionals (cudaAtLeast "11.8") [ cuda_profiler_api.dev # <cuda_profiler_api.h> - ] ++ lists.optionals (strings.versionAtLeast cudaVersion "12.0") [ + ] ++ lists.optionals (cudaAtLeast "12.0") [ cuda_cccl.dev # <nv/target> ]) ++ lists.optionals rocmSupport [ rocmPackages.clr @@ -129,32 +157,60 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DGPU_TARGET=${gpuTargetString}" - (lib.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport) - (lib.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport) - ] ++ lists.optionals static [ - "-DBUILD_SHARED_LIBS=OFF" + (strings.cmakeFeature "GPU_TARGET" gpuTargetString) + (strings.cmakeBool "MAGMA_ENABLE_CUDA" cudaSupport) + (strings.cmakeBool "MAGMA_ENABLE_HIP" rocmSupport) + (strings.cmakeBool "BUILD_SHARED_LIBS" (!static)) + # Set the Fortran name mangling scheme explicitly. We must set FORTRAN_CONVENTION manually because it will + # otherwise not be set in NVCC_FLAGS or DEVCCFLAGS (which we cannot modify). + # See https://github.com/NixOS/nixpkgs/issues/281656#issuecomment-1902931289 + (strings.cmakeBool "USE_FORTRAN" true) + (strings.cmakeFeature "CMAKE_C_FLAGS" "-DADD_") + (strings.cmakeFeature "CMAKE_CXX_FLAGS" "-DADD_") + (strings.cmakeFeature "FORTRAN_CONVENTION" "-DADD_") ] ++ lists.optionals cudaSupport [ - "-DCMAKE_CUDA_ARCHITECTURES=${cudaArchitecturesString}" - "-DMIN_ARCH=${minArch}" # Disarms magma's asserts - "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc" - "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" + (strings.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) + (strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts ] ++ lists.optionals rocmSupport [ - "-DCMAKE_C_COMPILER=${rocmPackages.clr}/bin/hipcc" - "-DCMAKE_CXX_COMPILER=${rocmPackages.clr}/bin/hipcc" - ] ++ lists.optionals (cudaPackages.cudaAtLeast "12.0.0") [ - (lib.cmakeBool "USE_FORTRAN" false) - ]; - - buildFlags = [ - "magma" - "magma_sparse" + (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clr}/bin/hipcc") + (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clr}/bin/hipcc") ]; + # Magma doesn't have a test suite we can easily run, just loose executables, all of which require a GPU. doCheck = false; + # Copy the files to the test output and fix the RPATHs. + postInstall = + # NOTE: The python scripts aren't copied by CMake into the build directory, so we must copy them from the source. + # TODO(@connorbaker): This should be handled by having CMakeLists.txt install them, but such a patch is + # out of the scope of the PR which introduces the `test` output: https://github.com/NixOS/nixpkgs/pull/283777. + # See https://github.com/NixOS/nixpkgs/pull/283777#discussion_r1482125034 for more information. + # Such work is tracked by https://github.com/NixOS/nixpkgs/issues/296286. + '' + install -Dm755 ../testing/run_{tests,summarize}.py -t "$test/bin/" + '' + # Copy core test executables and libraries over to the test output. + # NOTE: Magma doesn't provide tests for sparse solvers for ROCm, but it does for CUDA -- we put them both in the same + # install command to avoid the case where a glob would fail to find any files and cause the install command to fail + # because it has no files to install. + + '' + install -Dm755 ./testing/testing_* ./sparse/testing/testing_* -t "$test/bin/" + install -Dm755 ./lib/lib*test*.* -t "$test/lib/" + '' + # All of the test executables and libraries will have a reference to the build directory in their RPATH, which we + # must remove. We do this by shrinking the RPATH to only include the Nix store. The autoPatchelfHook will take care + # of supplying the correct RPATH for needed libraries (like `libtester.so`). + + '' + find "$test" -type f -exec \ + patchelf \ + --shrink-rpath \ + --allowed-rpath-prefixes "$NIX_STORE" \ + {} \; + ''; + passthru = { - inherit cudaPackages cudaSupport rocmSupport gpuTargets; + inherit cudaSupport rocmSupport gpuTargets; + cudaPackages = effectiveCudaPackages; }; meta = with lib; { @@ -168,6 +224,7 @@ stdenv.mkDerivation { broken = !(cudaSupport || rocmSupport) # At least one back-end enabled || (cudaSupport && rocmSupport) # Mutually exclusive - || (cudaSupport && strings.versionOlder cudaVersion "9"); + || (cudaSupport && cudaOlder "9.0") + || (cudaSupport && strings.versionOlder version "2.7.1" && cudaPackages_11 == null); }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix index 29b901277f61..c1eed9bf432a 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Graph Coarsening and Partitioning Library"; + mainProgram = "suitesparse_mongoose"; homepage = "https://github.com/DrTimothyAldenDavis/SuiteSparse/tree/dev/Mongoose"; license = licenses.gpl3Only; maintainers = with maintainers; [ wegank ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 5cbc23589895..1b17f9576175 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation rec { description = '' Google's software suite for combinatorial optimization. ''; + mainProgram = "fzn-ortools"; maintainers = with maintainers; [ andersk ]; platforms = with platforms; linux ++ darwin; }; diff --git a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix index 3b072fecde34..196ee5de576b 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/planarity/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; description = "A library for implementing graph algorithms"; + mainProgram = "planarity"; license = licenses.bsd3; maintainers = teams.sage.members; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix index 09ca356ccdc5..1033f26f4360 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compute special values of symmetric power elliptic curve L-functions"; + mainProgram = "sympow"; license = { shortName = "sympow"; fullName = "Custom, BSD-like. See COPYING file."; diff --git a/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix b/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix index 1939b0a5307b..8e461f1caf24 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/trilinos/default.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Engineering and scientific problems algorithms"; + mainProgram = "nvcc_wrapper"; longDescription = '' The Trilinos Project is an effort to develop algorithms and enabling technologies within an object-oriented software framework for the diff --git a/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix b/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix index 5e02398d1b4e..07d978641663 100644 --- a/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A 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 ]; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index 95ba1dc68e51..c08e0f2112c9 100644 --- a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.6.7"; + version = "0.7.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-pEFfs8xjc+6r+60aJF4Sjjy/oSU/+ADWgOBpS3t9rWI="; + hash = "sha256-e2VjQ3U72X+bwRAi/6StLDWT8tf/MjatnmC/+jCgzTo="; }; nativeBuildInputs = [ @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSENTRY_BREAKPAD_SYSTEM=On" + "-DSENTRY_BACKEND=breakpad" ]; meta = with lib; { @@ -40,6 +41,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/getsentry/sentry-native/blob/${version}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wheelsandmetal ]; + maintainers = with maintainers; [ wheelsandmetal daniel-fahey ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/serialdv/default.nix b/nixpkgs/pkgs/development/libraries/serialdv/default.nix index bff7a107eebe..549d03693375 100644 --- a/nixpkgs/pkgs/development/libraries/serialdv/default.nix +++ b/nixpkgs/pkgs/development/libraries/serialdv/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ Minimal interface to encode and decode audio with AMBE3000 based devices in packet mode over a serial link"; + mainProgram = "dvtest"; homepage = "https://github.com/f4exb/serialdv"; platforms = platforms.unix; maintainers = with maintainers; [ alkeryn ]; diff --git a/nixpkgs/pkgs/development/libraries/sexpp/default.nix b/nixpkgs/pkgs/development/libraries/sexpp/default.nix index dd41d520d28c..21b661338b64 100644 --- a/nixpkgs/pkgs/development/libraries/sexpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/sexpp/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/rnpgp/sexp"; description = "S-expressions parser and generator C++ library, fully compliant to [https://people.csail.mit.edu/rivest/Sexp.txt]"; + mainProgram = "sexpp"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ ribose-jeffreylau ]; diff --git a/nixpkgs/pkgs/development/libraries/shine/default.nix b/nixpkgs/pkgs/development/libraries/shine/default.nix index 8e5d02e632d2..433e4dcc6179 100644 --- a/nixpkgs/pkgs/development/libraries/shine/default.nix +++ b/nixpkgs/pkgs/development/libraries/shine/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast fixed-point mp3 encoding library"; + mainProgram = "shineenc"; homepage = "https://github.com/toots/shine"; license = licenses.lgpl2Only; maintainers = with maintainers; [ dandellion ]; diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index cf56180551fd..9e28ea4eed38 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-0fizP+j06NAp4CJynjzHG25OBmTa7wjkLZ2MBs1NxG4="; + sha256 = "sha256-1WxQU9WAIZKVoNTYJRnwxLAloBfW1g5XSPH4b29x9rE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/slib/default.nix b/nixpkgs/pkgs/development/libraries/slib/default.nix index 54aa046bd676..c3c5965816f4 100644 --- a/nixpkgs/pkgs/development/libraries/slib/default.nix +++ b/nixpkgs/pkgs/development/libraries/slib/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "The SLIB Portable Scheme Library"; + mainProgram = "slib"; longDescription = '' SLIB is a portable library for the programming language Scheme. It diff --git a/nixpkgs/pkgs/development/libraries/smooth/default.nix b/nixpkgs/pkgs/development/libraries/smooth/default.nix index bc4a5601dc45..402500dc9528 100644 --- a/nixpkgs/pkgs/development/libraries/smooth/default.nix +++ b/nixpkgs/pkgs/development/libraries/smooth/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The smooth Class Library"; + mainProgram = "smooth-translator"; license = licenses.artistic2; homepage = "http://www.smooth-project.org/"; maintainers = with maintainers; [ shamilton ]; diff --git a/nixpkgs/pkgs/development/libraries/sonic/default.nix b/nixpkgs/pkgs/development/libraries/sonic/default.nix index ba3164db11aa..4ab71b36a012 100644 --- a/nixpkgs/pkgs/development/libraries/sonic/default.nix +++ b/nixpkgs/pkgs/development/libraries/sonic/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Simple library to speed up or slow down speech"; + mainProgram = "sonic"; homepage = "https://github.com/waywardgeek/sonic"; license = licenses.asl20; maintainers = with maintainers; [ aske ]; diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix index ff42a5ba3b5c..f9255e3df595 100644 --- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -1,35 +1,27 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , fmt , catch2_3 , staticBuild ? stdenv.hostPlatform.isStatic # tests -, bear, tiledb +, bear +, tiledb }: stdenv.mkDerivation rec { pname = "spdlog"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; rev = "v${version}"; - hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns="; + hash = "sha256-3n8BnjZ7uMH8quoiT60yTU7poyOtoEmzNMOLa1+r7X0="; }; - patches = [ - # Fix a broken test, remove with the next release. - (fetchpatch { - url = "https://github.com/gabime/spdlog/commit/2ee8bac78e6525a8ad9a9196e65d502ce390d83a.patch"; - hash = "sha256-L79yOkm3VY01jmxNctfneTLmOA5DEQeNNGC8LbpJiOc="; - }) - ]; - nativeBuildInputs = [ cmake ]; # Required to build tests, even if they aren't executed buildInputs = [ catch2_3 ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index d35f654650ee..0a22d4177892 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { changelog = "https://github.com/sqlcipher/sqlcipher/blob/v${version}/CHANGELOG.md"; description = "SQLite extension that provides 256 bit AES encryption of database files"; + mainProgram = "sqlcipher"; homepage = "https://www.zetetic.net/sqlcipher/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/development/libraries/sregex/default.nix b/nixpkgs/pkgs/development/libraries/sregex/default.nix index 48a1b9c3930e..a4d2ef526db9 100644 --- a/nixpkgs/pkgs/development/libraries/sregex/default.nix +++ b/nixpkgs/pkgs/development/libraries/sregex/default.nix @@ -16,6 +16,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"; + mainProgram = "sregex-cli"; license = licenses.bsd3; maintainers = with maintainers; []; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/srtp/default.nix b/nixpkgs/pkgs/development/libraries/srtp/default.nix index 8bcd854f3681..a124a3d600ca 100644 --- a/nixpkgs/pkgs/development/libraries/srtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/srtp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libsrtp"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "sha256-OvCw7oF1OuamP3qO2BsimeBSHq1rcXFLfK8KnbbgkMU="; + sha256 = "sha256-vWL5bksKT5NUoNkIRiJ2FeGODQthD8SgXjCaA7SeTe4="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/subunit/default.nix b/nixpkgs/pkgs/development/libraries/subunit/default.nix index 61c30ebcf033..ed0c5a2d8720 100644 --- a/nixpkgs/pkgs/development/libraries/subunit/default.nix +++ b/nixpkgs/pkgs/development/libraries/subunit/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A streaming protocol for test results"; + mainProgram = "subunit-diff"; homepage = "https://launchpad.net/subunit"; license = licenses.asl20; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/swiften/default.nix b/nixpkgs/pkgs/development/libraries/swiften/default.nix index f839021c949e..05b1b996ea3f 100644 --- a/nixpkgs/pkgs/development/libraries/swiften/default.nix +++ b/nixpkgs/pkgs/development/libraries/swiften/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An XMPP library for C++, used by the Swift client"; + mainProgram = "swiften-config"; homepage = "http://swift.im/swiften.html"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/sycl-info/default.nix b/nixpkgs/pkgs/development/libraries/sycl-info/default.nix index 9d86017e084e..5d70bed4dd0f 100644 --- a/nixpkgs/pkgs/development/libraries/sycl-info/default.nix +++ b/nixpkgs/pkgs/development/libraries/sycl-info/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { { homepage = "https://github.com/codeplaysoftware/sycl-info"; description = "Tool to show information about available SYCL implementations"; + mainProgram = "sycl-info"; platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ davidtwco ]; diff --git a/nixpkgs/pkgs/development/libraries/ta-lib/default.nix b/nixpkgs/pkgs/development/libraries/ta-lib/default.nix index ea5ec66cf169..c3f77a9a247a 100644 --- a/nixpkgs/pkgs/development/libraries/ta-lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/ta-lib/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TA-Lib is a library that provides common functions for the technical analysis of financial market data."; + mainProgram = "ta-lib-config"; homepage = "https://ta-lib.org/"; license = lib.licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/nixpkgs/pkgs/development/libraries/tachyon/default.nix index 64746d84572a..02fb1fbc1324 100644 --- a/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "A Parallel / Multiprocessor Ray Tracing System"; + mainProgram = "tachyon"; license = lib.licenses.bsd3; maintainers = [lib.maintainers.raskin]; platforms = with lib.platforms; linux ++ cygwin ++ darwin; diff --git a/nixpkgs/pkgs/development/libraries/taco/default.nix b/nixpkgs/pkgs/development/libraries/taco/default.nix index 1bd404806f10..693b5f25f990 100644 --- a/nixpkgs/pkgs/development/libraries/taco/default.nix +++ b/nixpkgs/pkgs/development/libraries/taco/default.nix @@ -47,6 +47,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Computes sparse tensor expressions on CPUs and GPUs"; + mainProgram = "taco"; license = licenses.mit; homepage = "https://github.com/tensor-compiler/taco"; maintainers = [ maintainers.sheepforce ]; diff --git a/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix b/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix index acb52cc53dbf..5ba1a5e20182 100644 --- a/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix +++ b/nixpkgs/pkgs/development/libraries/taglib-extras/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Additional taglib plugins"; + mainProgram = "taglib-extras-config"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/nixpkgs/pkgs/development/libraries/taglib/default.nix b/nixpkgs/pkgs/development/libraries/taglib/default.nix index aa759ddbbb02..fc3914b26d29 100644 --- a/nixpkgs/pkgs/development/libraries/taglib/default.nix +++ b/nixpkgs/pkgs/development/libraries/taglib/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://taglib.org/"; description = "A 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 popular audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 diff --git a/nixpkgs/pkgs/development/libraries/termbench-pro/default.nix b/nixpkgs/pkgs/development/libraries/termbench-pro/default.nix index 11edecf31cc7..5291536f695f 100644 --- a/nixpkgs/pkgs/development/libraries/termbench-pro/default.nix +++ b/nixpkgs/pkgs/development/libraries/termbench-pro/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Terminal Benchmarking as CLI and library"; + mainProgram = "tbp"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ moni ]; diff --git a/nixpkgs/pkgs/development/libraries/text-engine/default.nix b/nixpkgs/pkgs/development/libraries/text-engine/default.nix index 0a9004d01a58..120076a7e0d7 100644 --- a/nixpkgs/pkgs/development/libraries/text-engine/default.nix +++ b/nixpkgs/pkgs/development/libraries/text-engine/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Rich text framework for GTK"; + mainProgram = "text-engine-demo"; homepage = "https://github.com/mjakeman/text-engine"; license = with licenses; [ mpl20 lgpl21Plus ]; maintainers = with maintainers; [ foo-dogsquared ]; diff --git a/nixpkgs/pkgs/development/libraries/thrift/0.10.nix b/nixpkgs/pkgs/development/libraries/thrift/0.10.nix deleted file mode 100644 index 3cfe56e3f7a9..000000000000 --- a/nixpkgs/pkgs/development/libraries/thrift/0.10.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison -, flex -}: - -stdenv.mkDerivation rec { - pname = "thrift"; - version = "0.10.0"; - - src = fetchurl { - url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292"; - }; - - #enableParallelBuilding = true; problems on hydra - - # Workaround to make the python wrapper not drop this package: - # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } - pythonPath = []; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted])) - ]; - - preConfigure = "export PY_PREFIX=$out"; - - # TODO: package boost-test, so we can run the test suite. (Currently it fails - # to find libboost_unit_test_framework.a.) - configureFlags = [ "--enable-tests=no" ]; - doCheck = false; - - meta = with lib; { - description = "Library for scalable cross-language services"; - homepage = "https://thrift.apache.org/"; - license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; - knownVulnerabilities = [ - "CVE-2018-1320" - "CVE-2018-11798" - "CVE-2019-0205" - "CVE-2019-0210" - "CVE-2020-13949" - ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix index acb3a2404870..3d0a9d8a7874 100644 --- a/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -131,6 +131,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for scalable cross-language services"; + mainProgram = "thrift"; homepage = "https://thrift.apache.org/"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/tidyp/default.nix b/nixpkgs/pkgs/development/libraries/tidyp/default.nix index c2a8ae0337ac..aa54616cf42a 100644 --- a/nixpkgs/pkgs/development/libraries/tidyp/default.nix +++ b/nixpkgs/pkgs/development/libraries/tidyp/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A 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; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/development/libraries/tinycbor/default.nix b/nixpkgs/pkgs/development/libraries/tinycbor/default.nix index 4826c2b49c1f..9f9a060d74d8 100644 --- a/nixpkgs/pkgs/development/libraries/tinycbor/default.nix +++ b/nixpkgs/pkgs/development/libraries/tinycbor/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Concise Binary Object Representation (CBOR) Library"; + mainProgram = "cbordump"; homepage = "https://github.com/intel/tinycbor"; license = licenses.mit; maintainers = with maintainers; [ oxzi ]; diff --git a/nixpkgs/pkgs/development/libraries/tinycdb/default.nix b/nixpkgs/pkgs/development/libraries/tinycdb/default.nix index 2d9cb53e7949..c13e97e968bf 100644 --- a/nixpkgs/pkgs/development/libraries/tinycdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tinycdb/default.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "utility to manipulate constant databases (cdb)"; + mainProgram = "cdb"; longDescription = '' tinycdb is a small, fast and reliable utility and subroutine diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index db9f7f1cfbf5..45c5eb10152c 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -173,6 +173,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; + mainProgram = "tracker3"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/tsocks/default.nix b/nixpkgs/pkgs/development/libraries/tsocks/default.nix index a489f679c6ce..c12f9a44ac6d 100644 --- a/nixpkgs/pkgs/development/libraries/tsocks/default.nix +++ b/nixpkgs/pkgs/development/libraries/tsocks/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Transparent SOCKS v4 proxying library"; + mainProgram = "tsocks"; homepage = "https://tsocks.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/nixpkgs/pkgs/development/libraries/twolame/default.nix b/nixpkgs/pkgs/development/libraries/twolame/default.nix index 3537dd3029b6..e81e47e094aa 100644 --- a/nixpkgs/pkgs/development/libraries/twolame/default.nix +++ b/nixpkgs/pkgs/development/libraries/twolame/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { meta = with lib;{ description = "A MP2 encoder"; + mainProgram = "twolame"; longDescription = '' TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 diff --git a/nixpkgs/pkgs/development/libraries/ucc/default.nix b/nixpkgs/pkgs/development/libraries/ucc/default.nix index 68f358b3d3de..09e10565bb2e 100644 --- a/nixpkgs/pkgs/development/libraries/ucc/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucc/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collective communication operations API"; + mainProgram = "ucc_info"; license = licenses.bsd3; maintainers = [ maintainers.markuskowa ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/uci/default.nix b/nixpkgs/pkgs/development/libraries/uci/default.nix index 43e6cb9d697d..55281e78ac74 100644 --- a/nixpkgs/pkgs/development/libraries/uci/default.nix +++ b/nixpkgs/pkgs/development/libraries/uci/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation { meta = with lib; { description = "OpenWrt Unified Configuration Interface"; + mainProgram = "uci"; homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary"; license = licenses.lgpl21Only; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/ucx/default.nix b/nixpkgs/pkgs/development/libraries/ucx/default.nix index 3b923d8efdd2..8e0772479ccb 100644 --- a/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc - cudaPackages.autoAddOpenGLRunpathHook + cudaPackages.autoAddDriverRunpath ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/udns/default.nix b/nixpkgs/pkgs/development/libraries/udns/default.nix index 518ed432b723..27b60937752c 100644 --- a/nixpkgs/pkgs/development/libraries/udns/default.nix +++ b/nixpkgs/pkgs/development/libraries/udns/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: # this expression is mostly based on debian's packaging -# https://tracker.debian.org/media/packages/u/udns/rules-0.4-1 +# https://tracker.debian.org/media/packages/u/udns/rules-0.5-1 stdenv.mkDerivation rec { pname = "udns"; - version = "0.4"; + version = "0.5"; configurePhase = "./configure --enable-ipv6"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.corpit.ru/mjt/udns/${pname}-${version}.tar.gz"; - sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i"; + sha256 = "sha256-A1v8EuOBnQq6j0DugiCpdLfpspwyWdMQlwzEstHCA8A="; }; # udns uses a very custom build and hardcodes a .so name in a few places. diff --git a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index 4d4d837e2e92..7e4a8b4f6cce 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -64,14 +64,6 @@ buildInputs = [ unixODBC openssl libiconv zlib ] ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; - # TODO: remove preConfigure on staging - preConfigure = if !stdenv.isDarwin then '' - # we don't want to build a .pkg - substituteInPlace CMakeLists.txt \ - --replace "IF(APPLE)" "IF(0)" \ - --replace "CMAKE_SYSTEM_NAME MATCHES AIX" "APPLE" - '' else null; - cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" "-DODBC_LIB_DIR=${lib.getLib unixODBC}/lib" diff --git a/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/nixpkgs/pkgs/development/libraries/usbredir/default.nix index c7e8a361ee16..e4a8c7628bc8 100644 --- a/nixpkgs/pkgs/development/libraries/usbredir/default.nix +++ b/nixpkgs/pkgs/development/libraries/usbredir/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "USB traffic redirection protocol"; + mainProgram = "usbredirect"; homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ offline ]; diff --git a/nixpkgs/pkgs/development/libraries/ustr/default.nix b/nixpkgs/pkgs/development/libraries/ustr/default.nix index b0e4ab6c064e..598e5e7c76a1 100644 --- a/nixpkgs/pkgs/development/libraries/ustr/default.nix +++ b/nixpkgs/pkgs/development/libraries/ustr/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.and.org/ustr/"; description = "Micro String API for C language"; + mainProgram = "ustr-import"; license = licenses.bsd2; maintainers = [ ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/v8/default.nix b/nixpkgs/pkgs/development/libraries/v8/default.nix index 7edf2cdf7c46..37cc66834462 100644 --- a/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -79,6 +79,14 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + + # gcc-13 build fix for mixxign <cstdint> includes + (fetchpatch { + name = "gcc-13.patch"; + url = "https://chromium.googlesource.com/v8/v8/+/c2792e58035fcbaa16d0cb70998852fbeb5df4cc^!?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-hoPAkSaCmzXflPFXaKUwVPLECMpt6N6/8m8mBSTAHbU="; + }) ]; src = v8Src; @@ -174,6 +182,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; + mainProgram = "d8"; maintainers = with maintainers; [ proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/libraries/vigra/default.nix b/nixpkgs/pkgs/development/libraries/vigra/default.nix index 677406d275a8..4e3aab9a5532 100644 --- a/nixpkgs/pkgs/development/libraries/vigra/default.nix +++ b/nixpkgs/pkgs/development/libraries/vigra/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; + mainProgram = "vigra-config"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; license = licenses.mit; maintainers = [ maintainers.viric ]; diff --git a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix index fa67cbb7edd7..a20f26157ffc 100644 --- a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix +++ b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix @@ -26,6 +26,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"; + mainProgram = "virgl_test_server"; homepage = "https://virgil3d.github.io/"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/nixpkgs/pkgs/development/libraries/volume-key/default.nix index 2c2774521762..e6aa378d01e5 100644 --- a/nixpkgs/pkgs/development/libraries/volume-key/default.nix +++ b/nixpkgs/pkgs/development/libraries/volume-key/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { 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"; + mainProgram = "volume_key"; homepage = "https://pagure.io/volume_key/"; license = licenses.gpl2; maintainers = with maintainers; []; diff --git a/nixpkgs/pkgs/development/libraries/vrb/default.nix b/nixpkgs/pkgs/development/libraries/vrb/default.nix index 1ebc37cdf2f3..b4a2f9a388f1 100644 --- a/nixpkgs/pkgs/development/libraries/vrb/default.nix +++ b/nixpkgs/pkgs/development/libraries/vrb/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A virtual ring buffer library written in C"; + mainProgram = "vbuf"; license = licenses.lgpl21; homepage = "http://vrb.sourceforge.net/"; maintainers = [ maintainers.bobvanderlinden ]; diff --git a/nixpkgs/pkgs/development/libraries/waffle/default.nix b/nixpkgs/pkgs/development/libraries/waffle/default.nix index b24c8262794f..6867f9da410e 100644 --- a/nixpkgs/pkgs/development/libraries/waffle/default.nix +++ b/nixpkgs/pkgs/development/libraries/waffle/default.nix @@ -63,6 +63,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"; + mainProgram = "wflinfo"; homepage = "https://www.waffle-gl.org/"; license = licenses.bsd2; platforms = platforms.mesaPlatforms; diff --git a/nixpkgs/pkgs/development/libraries/wavpack/default.nix b/nixpkgs/pkgs/development/libraries/wavpack/default.nix index bb0a43d24c0f..4cd3007043cf 100644 --- a/nixpkgs/pkgs/development/libraries/wavpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/wavpack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.6.0"; + version = "5.7.0"; enableParallelBuilding = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "dbry"; repo = "WavPack"; rev = version; - hash = "sha256-fWAGE87JTNTnYoxrkMf3I8C53kZrQiiBy3Zyg0cw8Og="; + hash = "sha256-vFZxg1mVqE7Kp38vEGA5V8m2tjqhssFsUZURixhlfk0="; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix index b4e203f5ed26..8bc53de162f7 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -116,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Core Wayland window system code and protocol"; + mainProgram = "wayland-scanner"; longDescription = '' Wayland is a project to define a protocol for a compositor to talk to its clients as well as a library implementation of the protocol. diff --git a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix index 551712f89f5f..7eeeb2467edd 100644 --- a/nixpkgs/pkgs/development/libraries/waylandpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/waylandpp/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Wayland C++ binding"; + mainProgram = "wayland-scanner++"; homepage = "https://github.com/NilsBrause/waylandpp/"; license = with lib.licenses; [ bsd2 hpnd ]; maintainers = with lib.maintainers; [ minijackson ]; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 58f0f190ae27..7ca5ffc19020 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -235,6 +235,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Web content rendering engine, GTK port"; + mainProgram = "WebKitWebDriver"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; pkgConfigModules = [ diff --git a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix index 1b847528550e..7e9fe3fa4a39 100644 --- a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -44,12 +44,18 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Foundation ]); + env = lib.optionalAttrs stdenv.isx86_32 { + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 + NIX_CFLAGS_COMPILE = "-msse2"; + }; + meta = with lib; { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h - # x86-32 disabled due to https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 - platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86_64); + platforms = platforms.unix; + # BE platforms are unsupported + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/31 + badPlatforms = platforms.bigEndian; }; } diff --git a/nixpkgs/pkgs/development/libraries/wiiuse/default.nix b/nixpkgs/pkgs/development/libraries/wiiuse/default.nix index d5d34fb618d6..b3fe94349453 100644 --- a/nixpkgs/pkgs/development/libraries/wiiuse/default.nix +++ b/nixpkgs/pkgs/development/libraries/wiiuse/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Feature complete cross-platform Wii Remote access library"; + mainProgram = "wiiuseexample"; license = licenses.gpl3Plus; homepage = "https://github.com/wiiuse/wiiuse"; maintainers = with maintainers; [ shamilton ]; diff --git a/nixpkgs/pkgs/development/libraries/wildmidi/default.nix b/nixpkgs/pkgs/development/libraries/wildmidi/default.nix index 23dc8dc3b053..c09ee248d211 100644 --- a/nixpkgs/pkgs/development/libraries/wildmidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/wildmidi/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software MIDI player and library"; + mainProgram = "wildmidi"; longDescription = '' WildMIDI is a simple software midi player which has a core softsynth library that can be use with other applications. diff --git a/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix index 28f66b8d31cf..a87afd7ee09f 100644 --- a/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix +++ b/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://wiredtiger.com/"; description = ""; + mainProgram = "wt"; license = licenses.gpl2; platforms = intersectLists platforms.unix platforms.x86_64; }; diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index e9265de54c61..61027c374c11 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -134,8 +134,8 @@ rec { }; wlroots_0_17 = generic { - version = "0.17.1"; - hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI="; + version = "0.17.2"; + hash = "sha256-Of9qykyVnBURc5A2pvCMm7sLbnuuG7OPWLxodQLN2Xg="; extraBuildInputs = [ ffmpeg hwdata diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 60a6e10c8334..76a07212c785 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wolfssl-${variant}"; - version = "5.6.6"; + version = "5.7.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "refs/tags/v${finalAttrs.version}-stable"; - hash = "sha256-HXl8GgngC1J8Dlt7fXBrVRa+IV7thVr+MIpeuf3Khcg="; + hash = "sha256-4j1GqeZJn5UWx56DjGjge05jlzBbIGn4IXxcaIBxON4="; }; postPatch = '' @@ -97,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A 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"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/wt/default.nix b/nixpkgs/pkgs/development/libraries/wt/default.nix index f9dd1d06ee33..a58a8ca6b3ec 100644 --- a/nixpkgs/pkgs/development/libraries/wt/default.nix +++ b/nixpkgs/pkgs/development/libraries/wt/default.nix @@ -46,7 +46,7 @@ let }; in { wt4 = generic { - version = "4.10.0"; - sha256 = "sha256-05WZnyUIwXwJA24mQi5ATCqRZ6PE/tiw2/MO1qYHRsY="; + version = "4.10.4"; + sha256 = "sha256-O2waUKGTw8kZw+6qBMqG9tNN92aGL+WCrcPOGAG7HO0="; }; } diff --git a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix index 0119a2c03776..8519cbaacc24 100644 --- a/nixpkgs/pkgs/development/libraries/wxSVG/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxSVG/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wxsvg.sourceforge.net/"; description = "A SVG manipulation library built with wxWidgets"; + mainProgram = "svgview"; longDescription = '' wxSVG is C++ library to create, manipulate and render Scalable Vector Graphics (SVG) files with the wxWidgets toolkit. diff --git a/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix index 7ae728d90552..3bb7729f7db0 100644 --- a/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/nixpkgs/pkgs/development/libraries/wxsqliteplus/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple SQLite database browser built with wxWidgets"; + mainProgram = "wxsqliteplus"; homepage = "https://github.com/guanlisheng/wxsqliteplus"; license = licenses.gpl3Plus; maintainers = [ maintainers.vrthra ]; diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix index a011cf9c2000..f857b2a0b89e 100644 --- a/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for encoding H264/AVC video streams"; + mainProgram = "x264"; homepage = "http://www.videolan.org/developers/x264.html"; license = licenses.gpl2Plus; platforms = platforms.unix ++ platforms.windows; diff --git a/nixpkgs/pkgs/development/libraries/x265/default.nix b/nixpkgs/pkgs/development/libraries/x265/default.nix index 1fc5f3129c0e..7f44834d4867 100644 --- a/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for encoding H.265/HEVC video streams"; + mainProgram = "x265"; homepage = "https://www.x265.org/"; changelog = "https://x265.readthedocs.io/en/master/releasenotes.html#version-${lib.strings.replaceStrings ["."] ["-"] version}"; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/libraries/xalanc/default.nix b/nixpkgs/pkgs/development/libraries/xalanc/default.nix index 2b5f2379fde7..707f819f1329 100644 --- a/nixpkgs/pkgs/development/libraries/xalanc/default.nix +++ b/nixpkgs/pkgs/development/libraries/xalanc/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://xalan.apache.org/"; description = "A XSLT processor for transforming XML documents"; + mainProgram = "Xalan"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ lib.maintainers.jagajaga ]; diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix index f9fe5bac07fe..7a06951f8422 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -59,5 +59,5 @@ in { # Don't forget to change the hashes in xapian-omega and # python3Packages.xapian. They inherit the version from this package, and # should always be built with the equivalent xapian version. - xapian_1_4 = generic "1.4.24" "sha256-7aWubc9rBVOoZ2r2Sx/TBOmYzSD3eQMcyq96uaNzUxo="; + xapian_1_4 = generic "1.4.25" "sha256-DJnf3YF1cctWibxBKn4CFAeTgxPzjqOnD6O/hkEGCO4="; } diff --git a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix index cba74b977de7..e8c238a24b11 100644 --- a/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - hash = "sha256-0IdW5PM7GJFsyKJJPTEfHL647UNXvUD6XBdErcCA6/8="; + hash = "sha256-L8C1BeYG1eHc3h8iNitvAjfZ6Ef8m2r1OPmbyavR/Ms="; }; buildInputs = [ xapian perl pcre2 zlib libmagic ]; diff --git a/nixpkgs/pkgs/development/libraries/xavs/default.nix b/nixpkgs/pkgs/development/libraries/xavs/default.nix index 25dd7fdad7ef..2d0960e3ff52 100644 --- a/nixpkgs/pkgs/development/libraries/xavs/default.nix +++ b/nixpkgs/pkgs/development/libraries/xavs/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AVS encoder and decoder"; + mainProgram = "xavs"; homepage = "https://xavs.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix index b700dd2581c4..67190d7cac76 100644 --- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] - ++ lib.optionals cudaSupport [ cudaPackages.autoAddOpenGLRunpathHook ] + ++ lib.optionals cudaSupport [ cudaPackages.autoAddDriverRunpath ] ++ lib.optionals rLibrary [ R ]; buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit diff --git a/nixpkgs/pkgs/development/libraries/xsd/default.nix b/nixpkgs/pkgs/development/libraries/xsd/default.nix index 2d614ee0e731..8096b2edd295 100644 --- a/nixpkgs/pkgs/development/libraries/xsd/default.nix +++ b/nixpkgs/pkgs/development/libraries/xsd/default.nix @@ -32,6 +32,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"; + mainProgram = "xsd"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.jagajaga ]; diff --git a/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix index e417de5e1ff0..bcd6a245bb4f 100644 --- a/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix +++ b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix @@ -10,6 +10,8 @@ , yubikey-personalization , libyubikey , libykclient +, CoreServices +, SystemConfiguration }: stdenv.mkDerivation rec { @@ -23,10 +25,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; - buildInputs = [ pam yubikey-personalization libyubikey libykclient ]; + buildInputs = [ pam yubikey-personalization libyubikey libykclient ] + ++ lib.optionals stdenv.isDarwin [ CoreServices SystemConfiguration ]; meta = with lib; { description = "Yubico PAM module"; + mainProgram = "ykpamcfg"; homepage = "https://developers.yubico.com/yubico-pam"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; diff --git a/nixpkgs/pkgs/development/libraries/yyjson/default.nix b/nixpkgs/pkgs/development/libraries/yyjson/default.nix index 7fe163362864..86a286ef2e2d 100644 --- a/nixpkgs/pkgs/development/libraries/yyjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/yyjson/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - meta = with lib; { + meta = { description = "The fastest JSON library in C"; homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ federicoschonborn ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ federicoschonborn ]; }; }) diff --git a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index f62dec911d81..3ccb7c17f9c9 100644 --- a/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.7.7"; + version = "3.7.10"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "sha256-h455isEmnRyoasXhh1UaA5PICcEEM8/C3IJf5yHRl5g="; + hash = "sha256-l3cKsR8HSdtFGw1S12xueQOu/U9ABlOxQQtbHBj2izs="; }; buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl libxcrypt ]; diff --git a/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix b/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix index ce539d9eb1c0..0d95e8f34b71 100644 --- a/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz"; - hash = "sha512-V1SFPtSytFZMyiR/cgwLA9zPUK5xuarP3leQCQiSfelUHnYMB+R6ZQfSHMHD9t+URvLc+KRFSriLTzethspkpA=="; + hash = "sha512-G6Yw9HBF43QCw8FTLnJ7boCjUYwaQVQAT4wXqUowSlzox1cUPH5+8ZYMBxToJCbr0ppmz22t0uKsHRUI/IDAPQ=="; }; sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c"; |