diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-09-22 19:21:26 +0000 |
| commit | ea2acbed493e218f696673a004a95829392c5e33 (patch) | |
| tree | c5716552f205bbf4d4addfa4675ea5073786bd06 /nixpkgs/pkgs/development/libraries | |
| parent | 06ba6c84f858b011fb1132721e5d5e28fcda4a8a (diff) | |
| parent | 8aa8cd68f4745eb92f003666bfd300f3e67cd9c1 (diff) | |
| download | nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.gz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.bz2 nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.lz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.xz nixlib-ea2acbed493e218f696673a004a95829392c5e33.tar.zst nixlib-ea2acbed493e218f696673a004a95829392c5e33.zip | |
Merge branch 'staging' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
183 files changed, 780 insertions, 1313 deletions
diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/202308.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/202308.nix index dbde04e6679f..7ec0ac8a775f 100644 --- a/nixpkgs/pkgs/development/libraries/abseil-cpp/202308.nix +++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/202308.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20230802.0"; + version = "20230802.1"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-yILAsAERUDMbRWh8t4o6W74YiswvGIHSyBAIuLVbzxY="; + hash = "sha256-uNGrTNg5G5xFGtc+BSWE389x0tQ/KxJQLHfebNWas/k="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix index df43976e6cf0..2c76371955cb 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-xwPMuaaKzypxJK9mTKD4tJZjzl19pu60seGtS2QFjgI="; + sha256 = "sha256-4YuOC90FBcuNYGBsqw3wKYNGkg3MssezvR8bu6BNGeM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix index 2c99989bc889..43cb3e95e984 100644 --- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -20,7 +20,7 @@ buildGoModule { nativeBuildInputs = [ cmake ninja perl ]; - vendorSha256 = null; + vendorHash = null; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/nixpkgs/pkgs/development/libraries/comedilib/default.nix b/nixpkgs/pkgs/development/libraries/comedilib/default.nix index d59f4acd8dcc..ab97ac09a57e 100644 --- a/nixpkgs/pkgs/development/libraries/comedilib/default.nix +++ b/nixpkgs/pkgs/development/libraries/comedilib/default.nix @@ -12,14 +12,14 @@ , python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "comedilib"; version = "0.12.0"; src = fetchFromGitHub { owner = "Linux-Comedi"; repo = "comedilib"; - rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; + rev = "r${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw"; }; @@ -53,4 +53,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.doronbehar ]; platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index c3731c0e7a75..debc2b7aebdc 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -6,14 +6,14 @@ , iconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; version = "5.24.0"; src = fetchFromGitHub { owner = "Martchus"; - repo = pname; - rev = "v${version}"; + repo = "cpp-utilities"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-krskfuoCRxYcAIDqrae4+yEABXXZ9Nv0BjBVwSMjC7g="; }; @@ -41,4 +41,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/nixpkgs/pkgs/development/libraries/cracklib/default.nix index 484af3337a09..ba5d96a95182 100644 --- a/nixpkgs/pkgs/development/libraries/cracklib/default.nix +++ b/nixpkgs/pkgs/development/libraries/cracklib/default.nix @@ -1,8 +1,8 @@ -let version = "2.9.8"; in +let version = "2.9.11"; in { stdenv, lib, buildPackages, fetchurl, zlib, gettext , wordlists ? [ (fetchurl { url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"; - hash = "sha256-WLOCTIDdO6kIsMytUdbhZx4woj/u1gf7jmORR2i8T4U="; + hash = "sha256-popxGjE1c517Z+nzYLM/DU7M+b1/rE0XwNXkVqkcUXo="; }) ] }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-H500OF6jqnzXwH+jiNwlgQrqnTwz4mDHE6Olhz1w44Y="; + hash = "sha256-yosEmjwtOyIloejRXWE3mOvHSOOVA4jtomlN5Qe6YCA="; }; nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 6bd9a8b8f1ae..8dc42dea247d 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -7,5 +7,17 @@ import ./generic.nix { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; } + # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks. + # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary. + { + name = "utils-fix_crash_in_ff_seek_frame_binary.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d"; + hash = "sha256-UxZ4VneZpw+Q/UwkEUDNdb2nOx1QnMrZ40UagspNTxI="; + postFetch = '' + substituteInPlace "$out" \ + --replace libavformat/seek.c libavformat/utils.c \ + --replace 'const AVInputFormat *const ' 'const AVInputFormat *' + ''; + } ]; } diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 6bde5aa776ba..31c93c52fb13 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -80,7 +80,7 @@ , withSvtav1 ? withHeadlessDeps && !stdenv.isAarch64 # AV1 encoder/decoder (focused on speed and correctness) , withTensorflow ? false # Tensorflow dnn backend support , withTheora ? withHeadlessDeps # Theora encoder -, withV4l2 ? withFullDeps && !stdenv.isDarwin # Video 4 Linux support +, withV4l2 ? withHeadlessDeps && !stdenv.isDarwin # Video 4 Linux support , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps # Vdpau hardware acceleration @@ -545,7 +545,10 @@ stdenv.mkDerivation (finalAttrs: { in "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h"; - nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]; + strictDeps = true; + + nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ] + ++ optionals withCudaLLVM [ clang ]; # TODO This was always in buildInputs before, why? buildInputs = optionals withFullDeps [ libdc1394 ] @@ -559,7 +562,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withBzlib [ bzip2 ] ++ optionals withCaca [ libcaca ] ++ optionals withCelt [ celt ] - ++ optionals withCudaLLVM [ clang ] ++ optionals withDav1d [ dav1d ] ++ optionals withDrm [ libdrm ] ++ optionals withFdkAac [ fdk_aac ] diff --git a/nixpkgs/pkgs/development/libraries/flatcc/default.nix b/nixpkgs/pkgs/development/libraries/flatcc/default.nix index a65ad5c6fe37..1f487955b3f3 100644 --- a/nixpkgs/pkgs/development/libraries/flatcc/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatcc/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DFLATCC_INSTALL=on" - "-DCMAKE_BUILD_TYPE=Release" ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index 0796febe4ae1..e2677bdea25d 100644 --- a/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -67,7 +67,7 @@ in }; fmt_10 = generic { - version = "10.1.0"; - sha256 = "sha256-t/Mcl3n2dj8UEnptQh4YgpvWrxSYN3iGPZ3LKwzlPAg="; + version = "10.1.1"; + sha256 = "sha256-H9+1lEaHM12nzXSmo9m8S6527t+97e6necayyjCPm1A="; }; } diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index 36a49ad038f5..e23eb42d33e8 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -76,13 +76,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-RXX21tCq0xJQli3NTertM9IweONrJfGeaFj3utMFjpM="; + hash = "sha256-/7Egbg4Cg5Gqsy+CEMVbs2NCWbdJteDNWelBsrQSUj4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gegl/default.nix b/nixpkgs/pkgs/development/libraries/gegl/default.nix index bd4aea3210f2..914d72a7fe8a 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch2 , pkg-config , vala , gobject-introspection @@ -37,16 +38,25 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.44"; + version = "0.4.46"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "CkzbQWNeQGoISc0NPwPK99l8q4qhPShwfVMtAInVYSY="; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/gegl-${version}.tar.xz"; + hash = "sha256-0LOySBvId0xfPQpIdhGRAWbRju+COoWfuR54Grex6JI="; }; + patches = [ + # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/136 + # Fix missing libm dependency. + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gegl/-/commit/ee970f10f4fe442cbf8a4f5cb94049deab33e786.patch"; + hash = "sha256-0LLKH+Gg+1H83kN7hJGK2u+oLrw7Hxed7R4tTwT3C5s="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext @@ -104,10 +114,6 @@ stdenv.mkDerivation rec { "-Djasper=disabled" ]; - # TODO: Fix missing math symbols in gegl seamless clone. - # It only appears when we use packaged poly2tri-c instead of vendored one. - env.NIX_CFLAGS_COMPILE = "-lm"; - postPatch = '' chmod +x tests/opencl/opencl_test.sh patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix index 5c2369cf4410..1f3ce471dc0e 100644 --- a/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,8 +1,10 @@ { lib -, fetchurl -, fetchpatch , stdenv +, callPackage +, fetchpatch +, fetchurl , testers + , cmake }: @@ -29,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; + }; meta = with lib; { description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; diff --git a/nixpkgs/pkgs/development/libraries/geos/tests.nix b/nixpkgs/pkgs/development/libraries/geos/tests.nix new file mode 100644 index 000000000000..0f11885ab78c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/geos/tests.nix @@ -0,0 +1,15 @@ +{ runCommand, geos }: + +let + inherit (geos) pname; +in +runCommand "${geos}-tests" { meta.timeout = 60; } + '' + ${geos}/bin/geosop \ + --explode \ + --format wkt \ + polygonize \ + -a "MULTILINESTRING ((200 100, 100 100, 200 200), (200 200, 200 100), (200 200, 300 100, 200 100))" \ + | grep 'POLYGON ((200 100, 100 100, 200 200, 200 100))' + touch $out + '' diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index 77bba280df96..0532907ac153 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -94,8 +94,13 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option" - + lib.optionalString stdenv.isAarch64 "-Wno-error=format-security"; + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( + lib.optionals stdenv.cc.isClang [ + "-Wno-error=unknown-warning-option" + ] ++ lib.optionals stdenv.isAarch64 [ + "-Wno-error=format-security" + ] + ); enableParallelBuilds = true; diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index a527faf5a8be..792f305a83ba 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -24,6 +24,7 @@ , gobject-introspection , buildPackages , withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages +, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , fribidi , xorg , libepoxy @@ -110,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc # For xmllint libxml2 - ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + ] ++ lib.optionals ((withIntrospection || compileSchemas) && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ] ++ lib.optionals waylandSupport [ wayland-scanner @@ -183,6 +184,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace meson.build \ --replace "x11_enabled = false" "" + # this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled. + substituteInPlace meson.build \ + --replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}' + files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py diff --git a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index b7e8c13ccca6..0503ac199f90 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -1,5 +1,6 @@ { lib , stdenv +, buildPackages , substituteAll , fetchurl , pkg-config @@ -7,6 +8,7 @@ , graphene , gi-docgen , meson +, mesonEmulatorHook , ninja , python3 , makeWrapper @@ -45,6 +47,7 @@ , wayland-scanner , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux +, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages , cups , AppKit , Cocoa @@ -99,6 +102,8 @@ stdenv.mkDerivation rec { sassc gi-docgen libxml2 # for xmllint + ] ++ lib.optionals (compileSchemas && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ] ++ lib.optionals waylandSupport [ wayland-scanner ] ++ setupHooks; @@ -190,6 +195,10 @@ stdenv.mkDerivation rec { }; postPatch = '' + # this conditional gates the installation of share/gsettings-schemas/.../glib-2.0/schemas/gschemas.compiled. + substituteInPlace meson.build \ + --replace 'if not meson.is_cross_build()' 'if ${lib.boolToString compileSchemas}' + files=( build-aux/meson/gen-demo-header.py demos/gtk-demo/geninclude.py diff --git a/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix b/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix index 01fe1c0a41ca..f24dc8777a73 100644 --- a/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix +++ b/nixpkgs/pkgs/development/libraries/hmat-oss/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hmat-oss"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "jeromerobert"; repo = "hmat-oss"; rev = "refs/tags/${version}"; - sha256 = "sha256-N6VSQeq2BS/PLcMbyIn/OQfd45zyJJHuOD5bho2nue8="; + sha256 = "sha256-JW6zghoYnF7NcAuAACgTQoxANEnmwjUAB8jCpof7Ums="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix index b0c632b69c03..67048167d6bf 100644 --- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-Cof99nf4sAtWfSKbYyC/ayXGk+2qQ+C4UmjZmdawYM8="; + sha256 = "sha256-XEBizlVvbTRR/Bd/+4ZzohIPgd9oNd6mohqQ+9//Dew="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 4f3c956a440d..f85ec4d96b39 100644 --- a/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-9xK2u53K1G2Lj0rVJhDcu667TMgLX9EvkxJNOjgPpr8="; + hash = "sha256-lf9dTMF92fk0wuetFRw2DzCIgKCnhJpspDt8e5pLshY="; }; buildInputs = [ @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://docs.enlightenment.org/api/imlib2/html"; - changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; + changelog = "https://git.enlightenment.org/old/legacy-imlib2/raw/tag/v${finalAttrs.version}/ChangeLog"; license = licenses.imlib2; pkgConfigModules = [ "imlib2" ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix index 053d06f34a6e..6f0961e71630 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "6.6.1"; + version = "6.7.0"; pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; - sha256 = "sha256-bwbERZqnmXD2LzGilDZYsr7BPQoTeZDwDU/8/AjAdP4="; + hash = "sha256-0b7iXp2iTwqcgI3IE3/Px/5mLT06yV6u5HdYboux6i4="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/kpeoplevcard/default.nix b/nixpkgs/pkgs/development/libraries/kpeoplevcard/default.nix index d2244a252347..2ba786800fb3 100644 --- a/nixpkgs/pkgs/development/libraries/kpeoplevcard/default.nix +++ b/nixpkgs/pkgs/development/libraries/kpeoplevcard/default.nix @@ -1,20 +1,21 @@ -{ mkDerivation +{ stdenv , lib , fetchurl , cmake -, extra-cmake-modules , pkg-config +, wrapQtAppsHook +, extra-cmake-modules , kcoreaddons , kpeople , kcontacts }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kpeoplevcard"; version = "0.1"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + url = "https://download.kde.org/stable/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd"; }; @@ -25,8 +26,9 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkg-config cmake + pkg-config + wrapQtAppsHook extra-cmake-modules ]; @@ -36,5 +38,5 @@ mkDerivation rec { license = with licenses; [ lgpl2 ]; maintainers = with maintainers; [ doronbehar ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index 35d5471c9fa9..5ce92c04e3ef 100644 --- a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.3.4"; + version = "1.3.5"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-NBYIDW0sphmBT2cIB2CPsCJrjRsINxWpumJbQK5RjU8="; + hash = "sha256-lxNIysW2uth4Hp6NHjo0vWHupITb9qWkkdG8YEDLrUE="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/libavif/default.nix b/nixpkgs/pkgs/development/libraries/libavif/default.nix index 3042dad31e17..27aaef546433 100644 --- a/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "libavif"; - version = "0.11.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mUi0DU99XV3FzUZ8/9uJZU+W3fc6Bk6+y6Z78IRZ9Qs="; + sha256 = "sha256-3zNhKl8REWsRlblXIFD7zn7qvrc/pa4wHZI0oEc3pKE="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/nixpkgs/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch b/nixpkgs/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch new file mode 100644 index 000000000000..de40da981623 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch @@ -0,0 +1,15 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 9d22b00..c6848fc 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -198,7 +198,9 @@ libbsd_ctor_a_SOURCES = \ + # Generate a simple libtool symbol export list to be used as a fallback if + # there is no version script support. + libbsd.sym: libbsd.map +- $(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map > $@ ++ $(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map \ ++ | grep -Ev '(group_from_gid|user_from_uid|nlist|__fdnlist|bsd_getopt)' \ ++ > $@ + + if NEED_TRANSPARENT_LIBMD + TRANSPARENT_LIBMD_DEPENDS = format.ld diff --git a/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch b/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch deleted file mode 100644 index c52c64f35aee..000000000000 --- a/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch +++ /dev/null @@ -1,309 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5b6d22b..98c449b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -145,7 +145,7 @@ AS_CASE([$host_os], - AM_CONDITIONAL([OS_WINDOWS], [test "x$is_windows" = "xyes"]) - - # Checks for header files. --AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h pwd.h grp.h]) -+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h pwd.h grp.h nlist.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_INLINE -@@ -245,7 +245,9 @@ AC_LINK_IFELSE( - - AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ - getauxval getentropy getexecname getline \ -- pstat_getproc sysconf]) -+ pstat_getproc sysconf \ -+ strlcpy strlcat strnstr strmode fpurge \ -+ user_from_uid group_from_gid]) - AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) - - AC_SUBST([MD5_LIBS]) -diff --git a/include/bsd/grp.h b/include/bsd/grp.h -index b2705e5..c9423a2 100644 ---- a/include/bsd/grp.h -+++ b/include/bsd/grp.h -@@ -44,8 +44,10 @@ - __BEGIN_DECLS - int - gid_from_group(const char *, gid_t *); -+#if !HAVE_GROUP_FROM_GID - const char * - group_from_gid(gid_t, int); -+#endif - __END_DECLS - - #endif -diff --git a/include/bsd/pwd.h b/include/bsd/pwd.h -index 798af4b..6ae5244 100644 ---- a/include/bsd/pwd.h -+++ b/include/bsd/pwd.h -@@ -44,8 +44,10 @@ - __BEGIN_DECLS - int - uid_from_user(const char *, uid_t *); -+#if !HAVE_USER_FROM_UID - const char * - user_from_uid(uid_t, int); -+#endif - __END_DECLS - - #endif -diff --git a/include/bsd/string.h b/include/bsd/string.h -index f987fee..a1e17ed 100644 ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -41,10 +41,21 @@ - #include <sys/types.h> - - __BEGIN_DECLS -+#if !HAVE_STRLCPY - size_t strlcpy(char *dst, const char *src, size_t siz); -+#endif -+ -+#if !HAVE_STRLCAT - size_t strlcat(char *dst, const char *src, size_t siz); -+#endif -+ -+#if !HAVE_STRNSTR - char *strnstr(const char *str, const char *find, size_t str_len); -+#endif -+ -+#if !HAVE_STRMODE - void strmode(mode_t mode, char *str); -+#endif - - #if !defined(__GLIBC__) || \ - (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) -diff --git a/src/fpurge.c b/src/fpurge.c -index 350f364..ff7f01e 100644 ---- a/src/fpurge.c -+++ b/src/fpurge.c -@@ -26,9 +26,10 @@ - - #include <errno.h> - #include <stdio.h> --#include <stdio_ext.h> - - #ifdef HAVE___FPURGE -+#include <stdio_ext.h> -+ - int - fpurge(FILE *fp) - { -@@ -41,6 +42,36 @@ fpurge(FILE *fp) - - return 0; - } -+/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ -+#elif HAVE_FPURGE -+int -+fpurge(FILE *fp) -+{ -+ if (fp == NULL || fileno(fp) < 0) { -+ errno = EBADF; -+ return EOF; -+ } -+ -+ /* Call the system's fpurge function. */ -+#undef fpurge -+#if !HAVE_DECL_FPURGE -+ extern int fpurge (FILE *); -+#endif -+ int result = fpurge (fp); -+/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ -+#if defined(__sferror) || defined(__DragonFly__) -+ if (result == 0) -+ /* Correct the invariants that fpurge broke. -+ <stdio.h> on BSD systems says: -+ "The following always hold: if _flags & __SRD, _w is 0." -+ If this invariant is not fulfilled and the stream is read-write but -+ currently reading, subsequent putc or fputc calls will write directly -+ into the buffer, although they shouldn't be allowed to. */ -+ if ((fp->_flags & __SRD) != 0) -+ fp->_w = 0; -+#endif -+ return result; -+} - #else - #error "Function fpurge() needs to be ported." - #endif -diff --git a/src/funopen.c b/src/funopen.c -index 1e6f43a..3a3af6a 100644 ---- a/src/funopen.c -+++ b/src/funopen.c -@@ -143,6 +143,7 @@ funopen(const void *cookie, - * they will not add the needed support to implement it. Just ignore this - * interface there, as it has never been provided anyway. - */ -+#elif defined(__MACH__) - #else - #error "Function funopen() needs to be ported or disabled." - #endif -diff --git a/src/local-link.h b/src/local-link.h -index 6782d9a..fb76098 100644 ---- a/src/local-link.h -+++ b/src/local-link.h -@@ -29,6 +29,12 @@ - - #include <sys/cdefs.h> - -+#ifdef __MACH__ -+#define libbsd_link_warning(symbol, msg) -+#define libbsd_symver_default(alias, symbol, version) -+#define libbsd_symver_variant(alias, symbol, version) -+#define libbsd_symver_weak(alias, symbol, version) -+#else - #define libbsd_link_warning(symbol, msg) \ - static const char libbsd_emit_link_warning_##symbol[] \ - __attribute__((__used__,__section__(".gnu.warning." #symbol))) = msg -@@ -68,3 +74,4 @@ - #endif - - #endif -+#endif -diff --git a/src/nlist.c b/src/nlist.c -index 1cb9d18..b476f1e 100644 ---- a/src/nlist.c -+++ b/src/nlist.c -@@ -41,6 +41,7 @@ - #include <unistd.h> - #include <nlist.h> - -+#if !HAVE_NLIST_H - #include "local-elf.h" - - /* Note: This function is used by libkvm0, so we need to export it. -@@ -277,3 +278,4 @@ nlist(const char *name, struct nlist *list) - (void)close(fd); - return (n); - } -+#endif -diff --git a/src/pwcache.c b/src/pwcache.c -index d54daa0..74fde9f 100644 ---- a/src/pwcache.c -+++ b/src/pwcache.c -@@ -191,6 +191,7 @@ grptb_start(void) - return 0; - } - -+#if !HAVE_USER_FROM_UID - /* - * user_from_uid() - * caches the name (if any) for the uid. If noname clear, we always -@@ -251,7 +252,9 @@ user_from_uid(uid_t uid, int noname) - } - return ptr->name; - } -+#endif - -+#if !HAVE_USER_FROM_UID - /* - * group_from_gid() - * caches the name (if any) for the gid. If noname clear, we always -@@ -312,6 +315,7 @@ group_from_gid(gid_t gid, int noname) - } - return ptr->name; - } -+#endif - - /* - * uid_from_user() -diff --git a/src/readpassphrase.c b/src/readpassphrase.c -index f9f6195..2bc5fb4 100644 ---- a/src/readpassphrase.c -+++ b/src/readpassphrase.c -@@ -36,6 +36,14 @@ - #define TCSASOFT 0 - #endif - -+#ifndef _SIGMAX -+#define _SIGMAX 64 -+#endif -+ -+#ifndef _NSIG -+#define _NSIG (_SIGMAX + 1) -+#endif -+ - static volatile sig_atomic_t signo[_NSIG]; - - static void handler(int); -diff --git a/src/setproctitle.c b/src/setproctitle.c -index d3e1087..0e5f64c 100644 ---- a/src/setproctitle.c -+++ b/src/setproctitle.c -@@ -33,6 +33,10 @@ - #include <string.h> - #include "local-link.h" - -+#ifdef __MACH__ -+extern char **environ; -+#endif -+ - static struct { - /* Original value. */ - const char *arg0; -@@ -291,7 +295,8 @@ libbsd_symver_default(setproctitle, setproctitle_impl, LIBBSD_0.5); - * in 0.5, make the implementation available in the old version as an alias - * for code linking against that version, and change the default to use the - * new version, so that new code depends on the implemented version. */ --#ifdef HAVE_TYPEOF -+#ifdef __MACH__ -+#elif defined(HAVE_TYPEOF) - extern __typeof__(setproctitle_impl) - setproctitle_stub - __attribute__((__alias__("setproctitle_impl"))); -diff --git a/src/strlcat.c b/src/strlcat.c -index 14c53a1..5961c17 100644 ---- a/src/strlcat.c -+++ b/src/strlcat.c -@@ -26,6 +26,7 @@ - * Returns strlen(src) + MIN(dsize, strlen(initial dst)). - * If retval >= dsize, truncation occurred. - */ -+#if !HAVE_STRLCAT - size_t - strlcat(char *dst, const char *src, size_t dsize) - { -@@ -53,3 +54,4 @@ strlcat(char *dst, const char *src, size_t dsize) - - return(dlen + (src - osrc)); /* count does not include NUL */ - } -+#endif -diff --git a/src/strlcpy.c b/src/strlcpy.c -index e9a7fe4..5137acb 100644 ---- a/src/strlcpy.c -+++ b/src/strlcpy.c -@@ -24,6 +24,7 @@ - * chars will be copied. Always NUL terminates (unless dsize == 0). - * Returns strlen(src); if retval >= dsize, truncation occurred. - */ -+#if !HAVE_STRLCPY - size_t - strlcpy(char *dst, const char *src, size_t dsize) - { -@@ -48,3 +49,4 @@ strlcpy(char *dst, const char *src, size_t dsize) - - return(src - osrc - 1); /* count does not include NUL */ - } -+#endif -diff --git a/src/strmode.c b/src/strmode.c -index e6afde5..da680c9 100644 ---- a/src/strmode.c -+++ b/src/strmode.c -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - #include <string.h> - -+#if !HAVE_STRMODE - void - strmode(mode_t mode, char *p) - { -@@ -141,3 +142,4 @@ strmode(mode_t mode, char *p) - *p++ = ' '; /* will be a '+' if ACL's implemented */ - *p = '\0'; - } -+#endif diff --git a/nixpkgs/pkgs/development/libraries/libbsd/default.nix b/nixpkgs/pkgs/development/libraries/libbsd/default.nix index 0c8040010e72..5943d697f6f1 100644 --- a/nixpkgs/pkgs/development/libraries/libbsd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbsd/default.nix @@ -1,28 +1,53 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, fetchpatch , autoreconfHook , libmd , gitUpdater }: -stdenv.mkDerivation rec { +# Run `./get-version` for the new value when bumping the Git revision. +let gitVersion = "0.11.7-55-g73b2"; in + +stdenv.mkDerivation { pname = "libbsd"; - version = "0.11.7"; + version = "unstable-2023-04-29"; - src = fetchurl { - url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - hash = "sha256-m6oYYFnrvyXAYwjp+ZH9ox9xg8DySTGCbYOqar2KAmE="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libbsd"; + repo = "libbsd"; + rev = "73b25a8f871b3a20f6ff76679358540f95d7dbfd"; + hash = "sha256-LS28taIMjRCl6xqg75eYOIrTDl8PzSa+OvrdiEOP1+U="; }; outputs = [ "out" "dev" "man" ]; - # darwin changes configure.ac which means we need to regenerate - # the configure scripts + enableParallelBuilding = true; + + doCheck = true; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libmd ]; - patches = [ ./darwin.patch ]; + patches = [ + # Fix `{get,set}progname(3bsd)` conditionalization + # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/24 + (fetchpatch { + url = "https://github.com/emilazy/libbsd/commit/0381f8d92873c5a19ced3ff861ee8ffe7825953e.patch"; + hash = "sha256-+RMg5eHLgC4gyX9zXM0ttNf7rd9E3UzJX/7UVCYGXx4="; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Temporary build system hack from upstream maintainer + # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684 + ./darwin-fix-libbsd.sym.patch + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace 'm4_esyscmd([./get-version])' '[${gitVersion}]' + ''; passthru.updateScript = gitUpdater { # No nicer place to find latest release. @@ -33,7 +58,7 @@ stdenv.mkDerivation rec { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; license = with licenses; [ beerware bsd2 bsd3 bsdOriginal isc mit ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libburn/default.nix b/nixpkgs/pkgs/development/libraries/libburn/default.nix deleted file mode 100644 index fe1b789fc42f..000000000000 --- a/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libburn"; - version = "1.5.6"; - - src = fetchurl { - url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-cpVJG0vl7qxeej+yBn4jbilV/9xrvUX1RkZu3uMhZEs="; - }; - - meta = with lib; { - description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; - homepage = "http://libburnia-project.org/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar vrthra ]; - mainProgram = "cdrskin"; - platforms = with platforms; unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libcef/default.nix b/nixpkgs/pkgs/development/libraries/libcef/default.nix index c63ef6d2dc61..63c72b7a8ced 100644 --- a/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "1d3ign2bhv1821k0jgmakzgqlpwy358iggrgxnbxswa42ckk9m6d"; - platforms."x86_64-linux".sha256 = "188hd7b11963f23y9rb0n747ssffdc80cdr1hpgwn55cmwhd8gbj"; + platforms."aarch64-linux".sha256 = "0q7bd44zj8m493pqviw3xhnygls5p7dvwafgvsflkwn1jzxjbjgg"; + platforms."x86_64-linux".sha256 = "1gc7rc8x7lrz05dqgzd3yzhvqh4j63495d7b23cwhpyzq2viwgyg"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.21"; - gitRevision = "9c7dc32"; - chromiumVersion = "116.0.5845.181"; + version = "116.0.24"; + gitRevision = "5332865"; + chromiumVersion = "116.0.5845.190"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix index f2c7b1197810..00fe35202101 100644 --- a/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdatachannel/default.nix @@ -12,28 +12,15 @@ , usrsctp }: -let - # Use usrsctp version specified at https://github.com/paullouisageneau/libdatachannel/tree/master/deps - # Older or newer usrsctp might break libdatachannel, please keep it synced with upstream. - customUsrsctp = usrsctp.overrideAttrs (finalAttrs: previousAttrs: { - version = "unstable-2021-10-08"; - src = fetchFromGitHub { - owner = "sctplab"; - repo = "usrsctp"; - rev = "7c31bd35c79ba67084ce029511193a19ceb97447"; - hash = "sha256-KeOR/0WDtG1rjUndwTUOhE21PoS+ETs1Vk7jQYy/vNs="; - }; - }); -in stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.18.5"; + version = "0.19.1"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-ognjEDw68DpdQ/4JqcTejP5f9K0zLZGnpr99P/dvHK4="; + hash = "sha256-jsJTECSR3ptiByfYQ00laeKMKJCv5IDkZmilY3jpRrU="; }; outputs = [ "out" "dev" ]; @@ -48,22 +35,16 @@ stdenv.mkDerivation rec { libnice openssl srtp + usrsctp + plog ]; cmakeFlags = [ "-DUSE_NICE=ON" - "-DUSE_SYSTEM_SRTP=ON" + "-DPREFER_SYSTEM_LIB=ON" "-DNO_EXAMPLES=ON" ]; - postPatch = '' - # TODO: Remove when updating to 0.19.x, and add - # -DUSE_SYSTEM_USRSCTP=ON and -DUSE_SYSTEM_PLOG=ON to cmakeFlags instead - mkdir -p deps/{usrsctp,plog} - cp -r --no-preserve=mode ${srcOnly customUsrsctp}/. deps/usrsctp - cp -r --no-preserve=mode ${srcOnly plog}/. deps/plog - ''; - postFixup = '' # Fix shared library path that will be incorrect on move to "dev" output substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets-release.cmake" \ diff --git a/nixpkgs/pkgs/development/libraries/libei/default.nix b/nixpkgs/pkgs/development/libraries/libei/default.nix index 4aa512e3eabd..b216cd231c22 100644 --- a/nixpkgs/pkgs/development/libraries/libei/default.nix +++ b/nixpkgs/pkgs/development/libraries/libei/default.nix @@ -24,14 +24,14 @@ let in stdenv.mkDerivation rec { pname = "libei"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libinput"; repo = "libei"; rev = version; - hash = "sha256-Xt4mhZMAohdQWsqfZCaP3+Tsauxv3GhlceiqgxdfNWo="; + hash = "sha256-ebZZ2dGXrPBUDPsuu5GZY5kDv9qndnxepQUGFDe9PUg="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/liberio/default.nix b/nixpkgs/pkgs/development/libraries/liberio/default.nix index 743455b836d5..f7e4fa6e7329 100644 --- a/nixpkgs/pkgs/development/libraries/liberio/default.nix +++ b/nixpkgs/pkgs/development/libraries/liberio/default.nix @@ -6,7 +6,7 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liberio"; version = "unstable-2019-12-11"; @@ -35,4 +35,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.doronbehar ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/nixpkgs/pkgs/development/libraries/libfabric/default.nix index b0d8a3a0081b..66a0b7ddbae6 100644 --- a/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.18.1"; + version = "1.19.0"; enableParallelBuilding = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3iQsFfpXSyMFkBeByGJmKSTUXuLsWA0l8t1cCDkNRos="; + sha256 = "sha256-7VOhdZOPBe1qh8OK8OTNKA5I4A5whl6aOubAzsUDSRw="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/libhwy/default.nix b/nixpkgs/pkgs/development/libraries/libhwy/default.nix index 4373f7474339..b2f32cbe7252 100644 --- a/nixpkgs/pkgs/development/libraries/libhwy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhwy/default.nix @@ -1,23 +1,21 @@ -{ lib, stdenv, cmake, ninja, gtest, fetchFromGitHub, fetchpatch }: +{ lib +, stdenv +, cmake +, ninja +, gtest +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "libhwy"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "google"; repo = "highway"; rev = version; - hash = "sha256-Gym2iHq5ws9kuG4HWSQndD8hVugV4USZt6dUFnEkLwY="; + hash = "sha256-Z+mAR9nSAbCskUvo6oK79Yd85bu0HtI2aR5THS1EozM="; }; - patches = [ - # backport for compilation issue on aarch64 - # https://github.com/google/highway/issues/1613 - (fetchpatch { - url = "https://github.com/google/highway/commit/7ad89efa911cb906ccf3f78fe510db415e921801.diff"; - hash = "sha256-hTSkeCh2QLMqeIKG/CAqJXaPqD/66Z02gjGXk591f+U="; - }) - ]; nativeBuildInputs = [ cmake ninja ]; @@ -53,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Performance-portable, length-agnostic SIMD with runtime dispatch"; homepage = "https://github.com/google/highway"; - license = licenses.asl20; + license = with licenses; [ asl20 bsd3 ]; platforms = platforms.unix; maintainers = with maintainers; [ zhaofengli ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock b/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock index d85dfcde626f..8823a070b81b 100644 --- a/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" @@ -33,15 +33,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "c_test" @@ -53,9 +53,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -95,9 +98,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", @@ -108,33 +111,33 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "fallible_collections" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9acf77205554f3cfeca94a4b910e159ad9824e8c2d164de02b3f12495cc1074d" +checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" dependencies = [ "hashbrown", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -151,16 +154,13 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "imagequant" -version = "4.2.0" +version = "4.2.1" dependencies = [ "arrayvec", "lodepng", @@ -173,7 +173,7 @@ dependencies = [ [[package]] name = "imagequant-sys" -version = "4.0.1" +version = "4.0.2" dependencies = [ "bitflags", "imagequant", @@ -182,9 +182,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.142" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "lodepng" @@ -201,9 +201,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -219,9 +219,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "rayon" @@ -266,9 +266,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "thread_local" diff --git a/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix index 088936115076..9041b373edff 100644 --- a/nixpkgs/pkgs/development/libraries/libimagequant/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimagequant/default.nix @@ -5,13 +5,13 @@ let in rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - hash = "sha256-51xTCymZKLuw1Xeje6EyKqHdbmqBV1Fdhx+OsO3bZ6Q="; + hash = "sha256-a5TztgNFRV9BVERpHI33ZEYwfOR46F9FzmbquzwGq3k="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix b/nixpkgs/pkgs/development/libraries/libisoburn/default.nix deleted file mode 100644 index c3fb4a053864..000000000000 --- a/nixpkgs/pkgs/development/libraries/libisoburn/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: - -stdenv.mkDerivation rec { - pname = "libisoburn"; - version = "1.5.6"; - - src = fetchurl { - url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-K4Cm9z3WM6XSQ/rL6XoV5cmgdkSl4aJCwhm5N1pF9xs="; - }; - - buildInputs = [ attr zlib libburn libisofs ]; - propagatedBuildInputs = [ acl ]; - - meta = with lib; { - homepage = "http://libburnia-project.org/"; - description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ vrthra ]; - platforms = with platforms; linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libisofs/default.nix b/nixpkgs/pkgs/development/libraries/libisofs/default.nix deleted file mode 100644 index a9db714a5bbc..000000000000 --- a/nixpkgs/pkgs/development/libraries/libisofs/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, acl, attr, libiconv, zlib }: - -stdenv.mkDerivation rec { - pname = "libisofs"; - version = "1.5.6.pl01"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-rB/TONZBdEyh+xVnkXGIt5vIwlBoMt1WiF/smGVrnyU="; - }; - - buildInputs = lib.optionals stdenv.isLinux [ - acl - attr - ] ++ lib.optionals stdenv.isDarwin [ - libiconv - ] ++ [ - zlib - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://libburnia-project.org/"; - description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar vrthra ]; - platforms = with platforms; unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix index 27d4fda2ddc6..711f05779e85 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -24,11 +24,12 @@ , opencv , python3 , vips +, testers }: assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjpeg-turbo"; version = "2.1.5.1"; @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-96SBBZp+/4WkXLvHKSPItNi5WuzdVccI/ZcbJOFjYYk="; }; @@ -91,13 +92,15 @@ stdenv.mkDerivation rec { opencv vips; inherit (python3.pkgs) pillow imread pyturbojpeg; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { homepage = "https://libjpeg-turbo.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses + pkgConfigModules = [ "libjpeg" "libturbojpeg" ]; maintainers = with maintainers; [ vcunat colemickens kamadorueda ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix index 6a6009c98e96..aaa481e8fd5d 100644 --- a/nixpkgs/pkgs/development/libraries/libjpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjpeg/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, static ? false }: +{ lib, stdenv, fetchurl +, testers +, static ? false +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjpeg"; version = "9e"; src = fetchurl { - url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz"; + url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; sha256 = "sha256-QHfWpqda6wGIT3CJGdJZNMkzBeSffj8225EpMg5vTz0="; }; @@ -13,11 +16,14 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.ijg.org/"; description = "A library that implements the JPEG image file format"; maintainers = with maintainers; [ ]; license = licenses.free; + pkgConfigModules = [ "libjpeg" ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libksba/default.nix b/nixpkgs/pkgs/development/libraries/libksba/default.nix index d7f5aa24c155..9b1716ecc6df 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.3"; + version = "1.6.4"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - hash = "sha256-P3LGjbMJceu/FDZ1J3GUI/Ck1fgQP8n0ocAan6RA3lw="; + hash = "sha256-u7Q/AyuRZNhseB/+QiE6g79PL+6RRV7fpGVFIbiwO2s="; }; outputs = [ "out" "dev" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/libmd/default.nix b/nixpkgs/pkgs/development/libraries/libmd/default.nix index ad3d8f0cce40..bf156fb1c55d 100644 --- a/nixpkgs/pkgs/development/libraries/libmd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmd/default.nix @@ -1,35 +1,30 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmd"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { urls = [ - "https://archive.hadrons.org/software/libmd/libmd-${version}.tar.xz" - "https://libbsd.freedesktop.org/releases/libmd-${version}.tar.xz" + "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.tar.xz" + "https://libbsd.freedesktop.org/releases/libmd-${finalAttrs.version}.tar.xz" ]; - sha256 = "sha256-9RySEELjS+3e3tS3VVdlZVnPWx8kSAM7TB7sEcB+Uw8="; + sha256 = "sha256-G9aqQidTE68xQcfPLluWTosf1IgCXK8vlx9DsAd2szI="; }; - patches = [ - # Drop aliases for SHA384 functions, because such aliases are not supported on Darwin. - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/8332f5dbcaf05a02bc31fbd4ccf735e7d5c9a5b0/devel/libmd/files/patch-symbol-alias.diff"; - sha256 = "sha256-py5hMpKYKwtBzhWn01lFc2a6+OZN72YCYXyhg1qe6rg="; - extraPrefix = ""; - }) - ]; + enableParallelBuilding = true; + + doCheck = true; nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { - homepage = "https://www.hadrons.org/software/${pname}/"; - changelog = "https://archive.hadrons.org/software/libmd/libmd-${version}.announce"; + homepage = "https://www.hadrons.org/software/libmd/"; + changelog = "https://archive.hadrons.org/software/libmd/libmd-${finalAttrs.version}.announce"; # Git: https://git.hadrons.org/cgit/libmd.git description = "Message Digest functions from BSD systems"; license = with licenses; [ bsd3 bsd2 isc beerware publicDomain ]; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libmodplug/default.nix b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix index 69c36dc718cb..334dfa9d8015 100644 --- a/nixpkgs/pkgs/development/libraries/libmodplug/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmodplug/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"; }; + # Unfortunately, upstream appears inactive and the patches from the fork don’t apply cleanly. + # Modify `src/fastmix.cpp` to remove usage of the register storage class, which is + # not allowed in C++17 and is an error in clang 16. + prePatch = "substituteInPlace src/fastmix.cpp --replace 'register ' ''"; + outputs = [ "out" "dev" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 4adb3958bd32..8c4e32b232c9 100644 --- a/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.33"; + version = "8.1.0"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-Fgz2iB+96b1GzRGq8Skwtna8bidYmsXHuknBlrl+BTs="; + hash = "sha256-LuPH0NAxzlgd7u10fZVh0UAXI3NZK+1dBjCnkOYFPcE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libpng/default.nix b/nixpkgs/pkgs/development/libraries/libpng/default.nix index b757d20b71d5..f8ae5b828c25 100644 --- a/nixpkgs/pkgs/development/libraries/libpng/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpng/default.nix @@ -3,20 +3,20 @@ assert zlib != null; let - patchVersion = "1.6.39"; + patchVersion = "1.6.40"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-SsS26roAzeISxI22XLlCkQc/68oixcef2ocJFQLoDP0="; + hash = "sha256-CjykZIKTjY1sciZivtLH7gxlobViRESzztIa2NNW2y8="; }; whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation rec { pname = "libpng" + whenPatched "-apng"; - version = "1.6.39"; + version = "1.6.40"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - hash = "sha256-H0aWznC07l+F8eFiPcEimyEAKfpLeu5XPfPiunsDaTc="; + hash = "sha256-U1tHmyRn/yMaPsbZKlJZBvuO8nl4vk9m2+BdPzoBs6E="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = "http://www.libpng.org/pub/png/libpng.html"; - changelog = "https://github.com/glennrp/libpng/blob/v1.6.39/CHANGES"; + changelog = "https://github.com/glennrp/libpng/blob/v1.6.40/CHANGES"; license = licenses.libpng2; platforms = platforms.all; maintainers = with maintainers; [ vcunat ]; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index a8826e4381eb..893c7b4e3a1e 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -1,28 +1,55 @@ -{ lib, stdenv, fetchFromGitHub -, mpfr, gnuplot +{ lib +, stdenv +, fetchFromGitHub +, intltool +, pkg-config +, doxygen +, autoreconfHook +, buildPackages +, curl +, gettext +, libiconv , readline -, libxml2, curl -, intltool, libiconv, icu, gettext -, pkg-config, doxygen, autoreconfHook, buildPackages +, libxml2 +, mpfr +, icu +, gnuplot }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ="; }; outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ]; - buildInputs = [ curl gettext libiconv readline ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - propagatedBuildInputs = [ libxml2 mpfr icu ]; + nativeBuildInputs = [ + intltool + pkg-config + autoreconfHook + doxygen + ]; + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + + buildInputs = [ + curl + gettext + libiconv + readline + ]; + propagatedBuildInputs = [ + libxml2 + mpfr + icu + ]; enableParallelBuilding = true; preConfigure = '' @@ -52,4 +79,4 @@ stdenv.mkDerivation rec { mainProgram = "qalc"; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 6300ece17127..2dd4cc6663a9 100644 --- a/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libquotient"; - version = "0.8.1.1"; + version = "0.8.1.2"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - hash = "sha256-WNLwO2w8FYy12BeqPuiS0wg3fUMwTxfrIF1QwcjE9yQ="; + hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8="; }; buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ]; diff --git a/nixpkgs/pkgs/development/libraries/librime/default.nix b/nixpkgs/pkgs/development/libraries/librime/default.nix index a1daa89ef787..3c0fb1fdff08 100644 --- a/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -4,19 +4,20 @@ let copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}"; copyPlugins = '' + mkdir -p plugins ${lib.concatMapStringsSep "\n" copySinglePlugin plugins} chmod +w -R plugins/* ''; in stdenv.mkDerivation rec { pname = "librime"; - version = "1.8.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-FkkZIxSuqlFFOjABBpnE5ax2Vdo9tzP0prM7ATDIIdk="; + sha256 = "sha256-4gEdltdm9A3FxwyZqgSyUWgQ934glinfKwHF8S05f5I="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 607f038b8840..29cb7616a9ac 100644 --- a/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { ]; doCheck = stdenv.isLinux && withIntrospection; + separateDebugInfo = true; postPatch = '' patchShebangs ./tool/test-*.sh diff --git a/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/nixpkgs/pkgs/development/libraries/libsodium/default.nix index 14e730d69e52..7979c137aef9 100644 --- a/nixpkgs/pkgs/development/libraries/libsodium/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsodium/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsodium"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"; + sha256 = "sha256-AY15/goEXMoHMx03vQy1ey6DjFG8SP2DehRy5QBou+o="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libspelling/default.nix b/nixpkgs/pkgs/development/libraries/libspelling/default.nix index 32c1af55a37f..812dddcc4a17 100644 --- a/nixpkgs/pkgs/development/libraries/libspelling/default.nix +++ b/nixpkgs/pkgs/development/libraries/libspelling/default.nix @@ -12,11 +12,12 @@ , gtksourceview5 , enchant , icu +, nix-update-script }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libspelling"; - version = "unstable-2023-07-17"; + version = "0.2.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -24,8 +25,8 @@ stdenv.mkDerivation { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "libspelling"; - rev = "65185023db95ec464970aeaeab766fe3ba26ae7d"; - hash = "sha256-R3nPs16y8XGamQvMSF7wb52h0jxt17H2FZPwauLDI/c="; + rev = version; + hash = "sha256-OOSQgdtnEx6/5yKwavCGdY/5L0Mr3XW0Srmd42ZTdUk="; }; nativeBuildInputs = [ @@ -50,10 +51,13 @@ stdenv.mkDerivation { moveToOutput "share/doc" "$devdoc" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Spellcheck library for GTK 4"; homepage = "https://gitlab.gnome.org/chergert/libspelling"; license = licenses.lgpl21Plus; + changelog = "https://gitlab.gnome.org/chergert/libspelling/-/raw/${version}/NEWS"; maintainers = with maintainers; [ chuangzhu ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libtommath/default.nix b/nixpkgs/pkgs/development/libraries/libtommath/default.nix index b6e129722a23..3ec1ba7b79b3 100644 --- a/nixpkgs/pkgs/development/libraries/libtommath/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtommath/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libtommath"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; - sha256 = "1c8q1qy88cjhdjlk3g24mra94h34c1ldvkjz0n2988c0yvn5xixp"; + sha256 = "sha256-mGAl17N0J2/uLjDpnzZJ5KwNuKAiV6N+4Q6ucqvtDR8="; }; nativeBuildInputs = [ libtool ]; diff --git a/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix b/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix index 7915e7b50f6b..3cbb78d83ce9 100644 --- a/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix +++ b/nixpkgs/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20221022"; + version = "20230916"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-YLlSe2++DpcptuAxLduTYAY2m9D8JSGDcvzijpAv1rU="; + sha256 = "sha256-8mLXTvi4KbU4NiCPaJINTeFbnTAabGDg8ufpSHSqy0Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libwebp/CVE-2023-4863.patch b/nixpkgs/pkgs/development/libraries/libwebp/CVE-2023-4863.patch deleted file mode 100644 index c01b8a486675..000000000000 --- a/nixpkgs/pkgs/development/libraries/libwebp/CVE-2023-4863.patch +++ /dev/null @@ -1,361 +0,0 @@ -From 4de93ac70c3292fc944e4587101a52a29f8b0c9c Mon Sep 17 00:00:00 2001 -From: Vincent Rabaud <vrabaud@google.com> -Date: Thu, 7 Sep 2023 21:16:03 +0200 -Subject: [PATCH] Fix OOB write in BuildHuffmanTable. - -First, BuildHuffmanTable is called to check if the data is valid. -If it is and the table is not big enough, more memory is allocated. - -This will make sure that valid (but unoptimized because of unbalanced -codes) streams are still decodable. - -Bug: chromium:1479274 -Change-Id: I31c36dbf3aa78d35ecf38706b50464fd3d375741 -(cherry picked from commit 902bc9190331343b2017211debcec8d2ab87e17a) ---- - src/dec/vp8l_dec.c | 46 ++++++++++--------- - src/dec/vp8li_dec.h | 2 +- - src/utils/huffman_utils.c | 97 +++++++++++++++++++++++++++++++-------- - src/utils/huffman_utils.h | 27 +++++++++-- - 4 files changed, 129 insertions(+), 43 deletions(-) - -diff --git a/src/dec/vp8l_dec.c b/src/dec/vp8l_dec.c -index c0ea0181..7995313f 100644 ---- a/src/dec/vp8l_dec.c -+++ b/src/dec/vp8l_dec.c -@@ -253,11 +253,11 @@ static int ReadHuffmanCodeLengths( - int symbol; - int max_symbol; - int prev_code_len = DEFAULT_CODE_LENGTH; -- HuffmanCode table[1 << LENGTHS_TABLE_BITS]; -+ HuffmanTables tables; - -- if (!VP8LBuildHuffmanTable(table, LENGTHS_TABLE_BITS, -- code_length_code_lengths, -- NUM_CODE_LENGTH_CODES)) { -+ if (!VP8LHuffmanTablesAllocate(1 << LENGTHS_TABLE_BITS, &tables) || -+ !VP8LBuildHuffmanTable(&tables, LENGTHS_TABLE_BITS, -+ code_length_code_lengths, NUM_CODE_LENGTH_CODES)) { - goto End; - } - -@@ -277,7 +277,7 @@ static int ReadHuffmanCodeLengths( - int code_len; - if (max_symbol-- == 0) break; - VP8LFillBitWindow(br); -- p = &table[VP8LPrefetchBits(br) & LENGTHS_TABLE_MASK]; -+ p = &tables.curr_segment->start[VP8LPrefetchBits(br) & LENGTHS_TABLE_MASK]; - VP8LSetBitPos(br, br->bit_pos_ + p->bits); - code_len = p->value; - if (code_len < kCodeLengthLiterals) { -@@ -300,6 +300,7 @@ static int ReadHuffmanCodeLengths( - ok = 1; - - End: -+ VP8LHuffmanTablesDeallocate(&tables); - if (!ok) dec->status_ = VP8_STATUS_BITSTREAM_ERROR; - return ok; - } -@@ -307,7 +308,8 @@ static int ReadHuffmanCodeLengths( - // 'code_lengths' is pre-allocated temporary buffer, used for creating Huffman - // tree. - static int ReadHuffmanCode(int alphabet_size, VP8LDecoder* const dec, -- int* const code_lengths, HuffmanCode* const table) { -+ int* const code_lengths, -+ HuffmanTables* const table) { - int ok = 0; - int size = 0; - VP8LBitReader* const br = &dec->br_; -@@ -362,8 +364,7 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - VP8LMetadata* const hdr = &dec->hdr_; - uint32_t* huffman_image = NULL; - HTreeGroup* htree_groups = NULL; -- HuffmanCode* huffman_tables = NULL; -- HuffmanCode* huffman_table = NULL; -+ HuffmanTables* huffman_tables = &hdr->huffman_tables_; - int num_htree_groups = 1; - int num_htree_groups_max = 1; - int max_alphabet_size = 0; -@@ -372,6 +373,10 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - int* mapping = NULL; - int ok = 0; - -+ // Check the table has been 0 initialized (through InitMetadata). -+ assert(huffman_tables->root.start == NULL); -+ assert(huffman_tables->curr_segment == NULL); -+ - if (allow_recursion && VP8LReadBits(br, 1)) { - // use meta Huffman codes. - const int huffman_precision = VP8LReadBits(br, 3) + 2; -@@ -434,16 +439,15 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - - code_lengths = (int*)WebPSafeCalloc((uint64_t)max_alphabet_size, - sizeof(*code_lengths)); -- huffman_tables = (HuffmanCode*)WebPSafeMalloc(num_htree_groups * table_size, -- sizeof(*huffman_tables)); - htree_groups = VP8LHtreeGroupsNew(num_htree_groups); - -- if (htree_groups == NULL || code_lengths == NULL || huffman_tables == NULL) { -+ if (htree_groups == NULL || code_lengths == NULL || -+ !VP8LHuffmanTablesAllocate(num_htree_groups * table_size, -+ huffman_tables)) { - dec->status_ = VP8_STATUS_OUT_OF_MEMORY; - goto Error; - } - -- huffman_table = huffman_tables; - for (i = 0; i < num_htree_groups_max; ++i) { - // If the index "i" is unused in the Huffman image, just make sure the - // coefficients are valid but do not store them. -@@ -468,19 +472,20 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - int max_bits = 0; - for (j = 0; j < HUFFMAN_CODES_PER_META_CODE; ++j) { - int alphabet_size = kAlphabetSize[j]; -- htrees[j] = huffman_table; - if (j == 0 && color_cache_bits > 0) { - alphabet_size += (1 << color_cache_bits); - } -- size = ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_table); -+ size = -+ ReadHuffmanCode(alphabet_size, dec, code_lengths, huffman_tables); -+ htrees[j] = huffman_tables->curr_segment->curr_table; - if (size == 0) { - goto Error; - } - if (is_trivial_literal && kLiteralMap[j] == 1) { -- is_trivial_literal = (huffman_table->bits == 0); -+ is_trivial_literal = (htrees[j]->bits == 0); - } -- total_size += huffman_table->bits; -- huffman_table += size; -+ total_size += htrees[j]->bits; -+ huffman_tables->curr_segment->curr_table += size; - if (j <= ALPHA) { - int local_max_bits = code_lengths[0]; - int k; -@@ -515,14 +520,13 @@ static int ReadHuffmanCodes(VP8LDecoder* const dec, int xsize, int ysize, - hdr->huffman_image_ = huffman_image; - hdr->num_htree_groups_ = num_htree_groups; - hdr->htree_groups_ = htree_groups; -- hdr->huffman_tables_ = huffman_tables; - - Error: - WebPSafeFree(code_lengths); - WebPSafeFree(mapping); - if (!ok) { - WebPSafeFree(huffman_image); -- WebPSafeFree(huffman_tables); -+ VP8LHuffmanTablesDeallocate(huffman_tables); - VP8LHtreeGroupsFree(htree_groups); - } - return ok; -@@ -1358,7 +1362,7 @@ static void ClearMetadata(VP8LMetadata* const hdr) { - assert(hdr != NULL); - - WebPSafeFree(hdr->huffman_image_); -- WebPSafeFree(hdr->huffman_tables_); -+ VP8LHuffmanTablesDeallocate(&hdr->huffman_tables_); - VP8LHtreeGroupsFree(hdr->htree_groups_); - VP8LColorCacheClear(&hdr->color_cache_); - VP8LColorCacheClear(&hdr->saved_color_cache_); -@@ -1673,7 +1677,7 @@ int VP8LDecodeImage(VP8LDecoder* const dec) { - - if (dec == NULL) return 0; - -- assert(dec->hdr_.huffman_tables_ != NULL); -+ assert(dec->hdr_.huffman_tables_.root.start != NULL); - assert(dec->hdr_.htree_groups_ != NULL); - assert(dec->hdr_.num_htree_groups_ > 0); - -diff --git a/src/dec/vp8li_dec.h b/src/dec/vp8li_dec.h -index 72b2e861..32540a4b 100644 ---- a/src/dec/vp8li_dec.h -+++ b/src/dec/vp8li_dec.h -@@ -51,7 +51,7 @@ typedef struct { - uint32_t* huffman_image_; - int num_htree_groups_; - HTreeGroup* htree_groups_; -- HuffmanCode* huffman_tables_; -+ HuffmanTables huffman_tables_; - } VP8LMetadata; - - typedef struct VP8LDecoder VP8LDecoder; -diff --git a/src/utils/huffman_utils.c b/src/utils/huffman_utils.c -index 90c2fbf7..cf73abd4 100644 ---- a/src/utils/huffman_utils.c -+++ b/src/utils/huffman_utils.c -@@ -177,21 +177,24 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits, - if (num_open < 0) { - return 0; - } -- if (root_table == NULL) continue; - for (; count[len] > 0; --count[len]) { - HuffmanCode code; - if ((key & mask) != low) { -- table += table_size; -+ if (root_table != NULL) table += table_size; - table_bits = NextTableBitSize(count, len, root_bits); - table_size = 1 << table_bits; - total_size += table_size; - low = key & mask; -- root_table[low].bits = (uint8_t)(table_bits + root_bits); -- root_table[low].value = (uint16_t)((table - root_table) - low); -+ if (root_table != NULL) { -+ root_table[low].bits = (uint8_t)(table_bits + root_bits); -+ root_table[low].value = (uint16_t)((table - root_table) - low); -+ } -+ } -+ if (root_table != NULL) { -+ code.bits = (uint8_t)(len - root_bits); -+ code.value = (uint16_t)sorted[symbol++]; -+ ReplicateValue(&table[key >> root_bits], step, table_size, code); - } -- code.bits = (uint8_t)(len - root_bits); -- code.value = (uint16_t)sorted[symbol++]; -- ReplicateValue(&table[key >> root_bits], step, table_size, code); - key = GetNextKey(key, len); - } - } -@@ -211,25 +214,83 @@ static int BuildHuffmanTable(HuffmanCode* const root_table, int root_bits, - ((1 << MAX_CACHE_BITS) + NUM_LITERAL_CODES + NUM_LENGTH_CODES) - // Cut-off value for switching between heap and stack allocation. - #define SORTED_SIZE_CUTOFF 512 --int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits, -+int VP8LBuildHuffmanTable(HuffmanTables* const root_table, int root_bits, - const int code_lengths[], int code_lengths_size) { -- int total_size; -+ const int total_size = -+ BuildHuffmanTable(NULL, root_bits, code_lengths, code_lengths_size, NULL); - assert(code_lengths_size <= MAX_CODE_LENGTHS_SIZE); -- if (root_table == NULL) { -- total_size = BuildHuffmanTable(NULL, root_bits, -- code_lengths, code_lengths_size, NULL); -- } else if (code_lengths_size <= SORTED_SIZE_CUTOFF) { -+ if (total_size == 0 || root_table == NULL) return total_size; -+ -+ if (root_table->curr_segment->curr_table + total_size >= -+ root_table->curr_segment->start + root_table->curr_segment->size) { -+ // If 'root_table' does not have enough memory, allocate a new segment. -+ // The available part of root_table->curr_segment is left unused because we -+ // need a contiguous buffer. -+ const int segment_size = root_table->curr_segment->size; -+ struct HuffmanTablesSegment* next = -+ (HuffmanTablesSegment*)WebPSafeMalloc(1, sizeof(*next)); -+ if (next == NULL) return 0; -+ // Fill the new segment. -+ // We need at least 'total_size' but if that value is small, it is better to -+ // allocate a big chunk to prevent more allocations later. 'segment_size' is -+ // therefore chosen (any other arbitrary value could be chosen). -+ next->size = total_size > segment_size ? total_size : segment_size; -+ next->start = -+ (HuffmanCode*)WebPSafeMalloc(next->size, sizeof(*next->start)); -+ if (next->start == NULL) { -+ WebPSafeFree(next); -+ return 0; -+ } -+ next->curr_table = next->start; -+ next->next = NULL; -+ // Point to the new segment. -+ root_table->curr_segment->next = next; -+ root_table->curr_segment = next; -+ } -+ if (code_lengths_size <= SORTED_SIZE_CUTOFF) { - // use local stack-allocated array. - uint16_t sorted[SORTED_SIZE_CUTOFF]; -- total_size = BuildHuffmanTable(root_table, root_bits, -- code_lengths, code_lengths_size, sorted); -- } else { // rare case. Use heap allocation. -+ BuildHuffmanTable(root_table->curr_segment->curr_table, root_bits, -+ code_lengths, code_lengths_size, sorted); -+ } else { // rare case. Use heap allocation. - uint16_t* const sorted = - (uint16_t*)WebPSafeMalloc(code_lengths_size, sizeof(*sorted)); - if (sorted == NULL) return 0; -- total_size = BuildHuffmanTable(root_table, root_bits, -- code_lengths, code_lengths_size, sorted); -+ BuildHuffmanTable(root_table->curr_segment->curr_table, root_bits, -+ code_lengths, code_lengths_size, sorted); - WebPSafeFree(sorted); - } - return total_size; - } -+ -+int VP8LHuffmanTablesAllocate(int size, HuffmanTables* huffman_tables) { -+ // Have 'segment' point to the first segment for now, 'root'. -+ HuffmanTablesSegment* const root = &huffman_tables->root; -+ huffman_tables->curr_segment = root; -+ // Allocate root. -+ root->start = (HuffmanCode*)WebPSafeMalloc(size, sizeof(*root->start)); -+ if (root->start == NULL) return 0; -+ root->curr_table = root->start; -+ root->next = NULL; -+ root->size = size; -+ return 1; -+} -+ -+void VP8LHuffmanTablesDeallocate(HuffmanTables* const huffman_tables) { -+ HuffmanTablesSegment *current, *next; -+ if (huffman_tables == NULL) return; -+ // Free the root node. -+ current = &huffman_tables->root; -+ next = current->next; -+ WebPSafeFree(current->start); -+ current->start = NULL; -+ current->next = NULL; -+ current = next; -+ // Free the following nodes. -+ while (current != NULL) { -+ next = current->next; -+ WebPSafeFree(current->start); -+ WebPSafeFree(current); -+ current = next; -+ } -+} -diff --git a/src/utils/huffman_utils.h b/src/utils/huffman_utils.h -index 13b7ad1a..98415c53 100644 ---- a/src/utils/huffman_utils.h -+++ b/src/utils/huffman_utils.h -@@ -43,6 +43,29 @@ typedef struct { - // or non-literal symbol otherwise - } HuffmanCode32; - -+// Contiguous memory segment of HuffmanCodes. -+typedef struct HuffmanTablesSegment { -+ HuffmanCode* start; -+ // Pointer to where we are writing into the segment. Starts at 'start' and -+ // cannot go beyond 'start' + 'size'. -+ HuffmanCode* curr_table; -+ // Pointer to the next segment in the chain. -+ struct HuffmanTablesSegment* next; -+ int size; -+} HuffmanTablesSegment; -+ -+// Chained memory segments of HuffmanCodes. -+typedef struct HuffmanTables { -+ HuffmanTablesSegment root; -+ // Currently processed segment. At first, this is 'root'. -+ HuffmanTablesSegment* curr_segment; -+} HuffmanTables; -+ -+// Allocates a HuffmanTables with 'size' contiguous HuffmanCodes. Returns 0 on -+// memory allocation error, 1 otherwise. -+int VP8LHuffmanTablesAllocate(int size, HuffmanTables* huffman_tables); -+void VP8LHuffmanTablesDeallocate(HuffmanTables* const huffman_tables); -+ - #define HUFFMAN_PACKED_BITS 6 - #define HUFFMAN_PACKED_TABLE_SIZE (1u << HUFFMAN_PACKED_BITS) - -@@ -78,9 +101,7 @@ void VP8LHtreeGroupsFree(HTreeGroup* const htree_groups); - // the huffman table. - // Returns built table size or 0 in case of error (invalid tree or - // memory error). --// If root_table is NULL, it returns 0 if a lookup cannot be built, something --// > 0 otherwise (but not the table size). --int VP8LBuildHuffmanTable(HuffmanCode* const root_table, int root_bits, -+int VP8LBuildHuffmanTable(HuffmanTables* const root_table, int root_bits, - const int code_lengths[], int code_lengths_size); - - #ifdef __cplusplus --- -2.41.0 - diff --git a/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/nixpkgs/pkgs/development/libraries/libwebp/default.nix index 287c0b6b18be..2605dabf125a 100644 --- a/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -27,23 +27,15 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-Q94avvKjPdwdGt5ADo30cf2V4T7MCTubDHJxTtbG4xQ="; + hash = "sha256-UYO2Fmm8nzQR8VBC26wEwWd3qZTD+6MHKcmKBoNcpEE="; }; - patches = [ - # Commit 902bc919 from upstream, mangled slightly to apply onto 1.3.1. - # There is currently (2023-09-12) no confirmation that this is the fix for - # CVE-2023-4863, but it is linked to the right crbug, and matches the - # description of that (critical sev, exploited in the wild) CVE. - ./CVE-2023-4863.patch - ]; - configureFlags = [ (lib.enableFeature threadingSupport "threading") (lib.enableFeature openglSupport "gl") diff --git a/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix b/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix index 00c8ae675e7b..bdfe404c547c 100644 --- a/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwtk-sdl2/default.nix @@ -9,13 +9,13 @@ , SDL2_image }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libwtk-sdl2"; version = "unstable-2023-02-28"; src = fetchFromGitHub { owner = "muesli4"; - repo = pname; + repo = "libwtk-sdl2"; rev = "0504f8342c8c97d0c8b43d33751427c564ad8d44"; sha256 = "sha256-NAjsDQ4/hklYRfa85uleOr50tmc6UJVo2xiDnEbmIxk="; }; @@ -48,4 +48,4 @@ stdenv.mkDerivation rec { */ platforms = platforms.linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libyang/default.nix b/nixpkgs/pkgs/development/libraries/libyang/default.nix index 9102286746b6..88fdfcca03ca 100644 --- a/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_BUILD_TYPE:String=Release" ]; passthru.updateScript = gitUpdater { diff --git a/nixpkgs/pkgs/development/libraries/llhttp/default.nix b/nixpkgs/pkgs/development/libraries/llhttp/default.nix index 8aac286c80ac..39b1e0bf260e 100644 --- a/nixpkgs/pkgs/development/libraries/llhttp/default.nix +++ b/nixpkgs/pkgs/development/libraries/llhttp/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-kW6u9ETZJcJBh150chfE3SEwFpT7evZ0cqz8caM7fbQ="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/nixpkgs/pkgs/development/libraries/lmdb/default.nix index 21f07337fab4..99296b63a727 100644 --- a/nixpkgs/pkgs/development/libraries/lmdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/lmdb/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { patches = [ ./hardcoded-compiler.patch ./bin-ext.patch ]; patchFlags = [ "-p3" ]; + # Don't attempt the .so if static, as it would fail. + postPatch = lib.optionalString stdenv.hostPlatform.isStatic '' + sed 's/^ILIBS\>.*/ILIBS = liblmdb.a/' -i Makefile + ''; + outputs = [ "bin" "out" "dev" ]; buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; diff --git a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix index b583eb93153a..dac12db94b62 100644 --- a/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa-glu/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices +{ lib, stdenv, fetchurl +, meson, ninja +, pkg-config, libGL, ApplicationServices , testers +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "glu"; - version = "9.0.2"; + version = "9.0.3"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bnKA/1hcah2d/N8vykiSUWNLM3e/wzwp5AAkZqONAtQ="; + hash = "sha256-vUP+EvN0sRkusV/iDkX/RWubwmq1fw7ukZ+Wyg+KMw8="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; propagatedBuildInputs = [ libGL ] ++ lib.optional stdenv.isDarwin ApplicationServices; @@ -21,7 +24,16 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru = { + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://gitlab.freedesktop.org/mesa/glu"; + rev-prefix = "glu-"; + }; + }; meta = { description = "OpenGL utility library"; diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index b7bec7e8930c..239be08b4ed5 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -86,8 +86,8 @@ */ let - version = "23.1.7"; - hash = "sha256-QJZB6t8O0cd5R5em9aCwGVtVgLKCFm5exWKca82mrNM="; + version = "23.1.8"; + hash = "sha256-RUNP+RpwmEQTCjF02cDvOca1ByWyuwwT5zbzYTTbFK0="; # 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/muparserx/default.nix b/nixpkgs/pkgs/development/libraries/muparserx/default.nix index 2b3d2853d132..8a7d2c8f3646 100644 --- a/nixpkgs/pkgs/development/libraries/muparserx/default.nix +++ b/nixpkgs/pkgs/development/libraries/muparserx/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - doCheck = true; checkPhase = '' echo "***Muparserx self-test***" diff --git a/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/nixpkgs/pkgs/development/libraries/nuspell/default.nix index 9369b8cb5f29..5ef4f676aebc 100644 --- a/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -2,24 +2,23 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "sha256-nGC8Um9GutJZXlUcUCK0IiHxMaZmeoe4febw/jC2dRU="; + hash = "sha256-ww7Kqzlnf7065i9RZLeFDUOPBMCVgV/6sBnN0+WvBTk="; }; nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ catch2 ]; propagatedBuildInputs = [ icu ]; - outputs = [ "out" "lib" "dev" ]; + cmakeFlags = [ "-DBUILD_TESTING=YES" ]; + doCheck = true; - postPatch = '' - rm -rf external/Catch2 - ln -sf ${catch2.src} external/Catch2 - ''; + outputs = [ "out" "lib" "dev" ]; meta = with lib; { description = "Free and open source C++ spell checking library"; diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index 6bac6c5a425b..d9b907ebeaae 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -100,8 +100,8 @@ let in { ogre_14 = common { - version = "14.0.1"; - hash = "sha256-jtUm0jy0GsxkGlFdODGodPsuSaQgiE77BORnA6SFViU="; + version = "14.1.0"; + hash = "sha256-CPyXqlUb69uLCsoomjFUbBj7bzPyI01m2yinFuoX5nE="; }; ogre_13 = common { diff --git a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 1b955b57de42..4a9ee61f5614 100644 --- a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -133,7 +133,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DABSL_ENABLE_INSTALL=ON" - "-DCMAKE_BUILD_TYPE=RELEASE" "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" "-DFETCHCONTENT_QUIET=OFF" "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}" diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 231875340567..2b0d778ef3d7 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -221,6 +221,7 @@ let homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; + mainProgram = "openssl"; pkgConfigModules = [ "libcrypto" "libssl" @@ -254,8 +255,8 @@ in { }; openssl_3 = common { - version = "3.0.10"; - sha256 = "sha256-F2HU9bE6ECi5tvPUuOF/6wztyTcPav5h1xk9LNzoMyM="; + version = "3.0.11"; + sha256 = "sha256-s0JdO7SiIY0Gl+tB9/wM3t4BbtGcpJ0Wi3jo2UeIf1U="; patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/nixpkgs/pkgs/development/libraries/packr/default.nix b/nixpkgs/pkgs/development/libraries/packr/default.nix index 5b04c168cf31..1a5bacad59f8 100644 --- a/nixpkgs/pkgs/development/libraries/packr/default.nix +++ b/nixpkgs/pkgs/development/libraries/packr/default.nix @@ -13,12 +13,12 @@ let p2 = buildGoModule rec { owner = "gobuffalo"; repo = "packr"; rev = "v${version}"; - sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ="; }+"/v2"; subPackages = [ "packr2" ]; - vendorSha256 = "12yq121b0bn8z12091fyqhhz421kgx4z1nskrkvbxlhyc47bwyrp"; + vendorHash = "sha256-N3u+DmEe0r72zFPb8El/MwjyIcTehQRE+MgusIII2Is="; doCheck = false; @@ -45,12 +45,12 @@ p1 = buildGoModule rec { owner = "gobuffalo"; repo = "packr"; rev = "v${version}"; - sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ="; }; subPackages = [ "packr" ]; - vendorSha256 = "0m3yj8ww4a16j56p8d8w0sdnyx0g2bkd8zg0l4d8vb72mvg5asga"; + vendorHash = "sha256-6mlV3q7irI0aoeB91OYSD3RvmwYcNXRNkSYowjmSflQ="; doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix index fc0afbe2184c..a94234aec41b 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -58,9 +58,7 @@ stdenv.mkDerivation rec { qttools ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; meta = with lib; { homepage = "https://phonon.kde.org/"; diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix index 42923d4f026b..a50a07dde1a1 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix @@ -28,9 +28,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; meta = with lib; { homepage = "https://community.kde.org/Phonon"; diff --git a/nixpkgs/pkgs/development/libraries/phonon/default.nix b/nixpkgs/pkgs/development/libraries/phonon/default.nix index 59d9e19556aa..dc95b4ed8266 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-fPIC"; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; dontWrapQtApps = true; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index fdc514c286b7..1e66d1573fc5 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -23,6 +23,7 @@ , vulkan-headers , vulkan-loader , webrtc-audio-processing +, webrtc-audio-processing_1 , ncurses , readline # meson can't find <7 as those versions don't have a .pc file , lilv @@ -42,10 +43,11 @@ , bluez , sbc , libfreeaptx -, ldacbt , liblc3 , fdk_aac , libopus +, ldacbtSupport ? bluezSupport && lib.meta.availableOn stdenv.hostPlatform ldacbt +, ldacbt , nativeHspSupport ? true , nativeHfpSupport ? true , nativeModemManagerSupport ? true @@ -70,12 +72,15 @@ , ffado }: +# Bluetooth codec only makes sense if general bluetooth enabled +assert ldacbtSupport -> bluezSupport; + let mesonEnableFeature = b: if b then "enabled" else "disabled"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.79"; + version = "0.3.80"; outputs = [ "out" @@ -93,7 +98,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-pqs991pMqz3IQE+NUk0VNzZS4ExwfoZqBQDWBSGdWcs="; + sha256 = "sha256-6Ka83Bqd/nsfp8rv0GTBerpGP226MeZvC5u/j62FzP0="; }; patches = [ @@ -111,6 +116,12 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch + + # backport fix for building with webrtc-audio-processing 0.3 on platforms where we don't have 1.x + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1f1c308c9766312e684f0b53fc2d1422c7414d31.patch"; + hash = "sha256-ECM7/84G99yzXsg5A2DkFnXFGJSV9lz3vD0IRSzR8vU="; + }) ]; strictDeps = true; @@ -138,13 +149,14 @@ let udev vulkan-headers vulkan-loader - webrtc-audio-processing tinycompress ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) + ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals libcameraSupport [ libcamera libdrm ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt liblc3 sbc fdk_aac libopus ] + ++ lib.optionals bluezSupport [ bluez libfreeaptx liblc3 sbc fdk_aac libopus ] + ++ lib.optional ldacbtSupport ldacbt ++ lib.optional nativeModemManagerSupport modemmanager ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi @@ -184,6 +196,7 @@ let # source code is not easily obtainable "-Dbluez5-codec-lc3plus=disabled" "-Dbluez5-codec-lc3=${mesonEnableFeature bluezSupport}" + "-Dbluez5-codec-ldac=${mesonEnableFeature ldacbtSupport}" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" diff --git a/nixpkgs/pkgs/development/libraries/pkger/default.nix b/nixpkgs/pkgs/development/libraries/pkger/default.nix index f2e984c8c816..073c57c013da 100644 --- a/nixpkgs/pkgs/development/libraries/pkger/default.nix +++ b/nixpkgs/pkgs/development/libraries/pkger/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "markbates"; repo = "pkger"; rev = "v${version}"; - sha256 = "12zcvsd6bv581wwhahp1wy903495s51lw86b99cfihwmxc5qw6ww"; + hash = "sha256-nBuOC+uVw+hYSssgTkPRJZEBkufhQgU5D6jsZZre7Is="; }; - vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; + vendorHash = "sha256-9+2s84bqoNU3aaxmWYzIuFKPA3Tw9phXu5Csaaq/L60="; doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/polkit/default.nix b/nixpkgs/pkgs/development/libraries/polkit/default.nix index a00b6bb07a54..b6de5b02c091 100644 --- a/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -39,7 +39,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "122"; + version = "123"; outputs = [ "bin" "dev" "out" ]; # small man pages in $bin @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { owner = "polkit"; repo = "polkit"; rev = version; - sha256 = "fLY8i8h4McAnwVt8dLOqbyHM7v3SkbWqATz69NkUudU="; + hash = "sha256-/kjWkh6w2FYgtYWzw3g3GlWJKKpkJ3cqwfE0iDqJctw="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.17.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.17.nix deleted file mode 100644 index 36198b5d337b..000000000000 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.17.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3.nix ({ - version = "3.17.3"; - sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d"; -} // args) diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix index 2deb155444ec..60ad747194df 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic-v3-cmake.nix ({ - version = "3.24.2"; - sha256 = "sha256-yVLszyVtsz1CCzeOkioL4O3mWTFKKVBUyOhwDbC5UqE="; + version = "3.24.3"; + sha256 = "sha256-wXGQW/o674DeLXX2IlyZskl5OrBcSRptOMoJqLQGm94="; } // args) diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 384d2d0decb4..5b5ab87bfcd5 100644 --- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -13,53 +13,45 @@ , version , sha256 -# downstream dependencies + # downstream dependencies , python3 +, grpc , ... }: -let - self = stdenv.mkDerivation { - pname = "protobuf"; - inherit version; +stdenv.mkDerivation (finalAttrs: { + pname = "protobuf"; + inherit version; - src = fetchFromGitHub { - owner = "protocolbuffers"; - repo = "protobuf"; - rev = "v${version}"; - inherit sha256; - }; - - # re-create submodule logic - postPatch = '' - rm -rf gmock - cp -r ${gtest.src}/googlemock third_party/gmock - cp -r ${gtest.src}/googletest third_party/ - chmod -R a+w third_party/ + src = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "protobuf"; + rev = "v${version}"; + inherit sha256; + }; - ln -s ../googletest third_party/gmock/gtest - ln -s ../gmock third_party/googletest/googlemock - ln -s $(pwd)/third_party/googletest third_party/googletest/googletest - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; - patches = lib.optionals (lib.versionOlder version "3.22") [ - # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute - # https://github.com/protocolbuffers/protobuf/pull/10090 - (fetchpatch { - url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; - sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; - }) - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - ./static-executables-have-no-rpath.patch - ]; + patches = lib.optionals (lib.versionOlder version "3.22") [ + # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute + # https://github.com/protocolbuffers/protobuf/pull/10090 + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; + sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + }) + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + ./static-executables-have-no-rpath.patch + ]; - nativeBuildInputs = let + nativeBuildInputs = + let protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; - in [ + in + [ cmake ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # protoc of the same version must be available for build. For non-cross builds, it's able to @@ -67,52 +59,54 @@ let buildPackages."protobuf${protobufVersion}" ]; - buildInputs = [ - zlib - ]; + buildInputs = [ + gtest + zlib + ]; - propagatedBuildInputs = [ - abseil-cpp - ]; + propagatedBuildInputs = [ + abseil-cpp + ]; - cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; - cmakeFlags = [ - "-Dprotobuf_ABSL_PROVIDER=package" - ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ - "-Dprotobuf_BUILD_SHARED_LIBS=ON" - ] - # Tests fail to build on 32-bit platforms; fixed in 3.22 - # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optional - (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") - "-Dprotobuf_BUILD_TESTS=OFF"; + strictDeps = true; - # unfortunately the shared libraries have yet to been patched by nix, thus tests will fail - doCheck = false; + cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; + cmakeFlags = [ + "-Dprotobuf_USE_EXTERNAL_GTEST=ON" + "-Dprotobuf_ABSL_PROVIDER=package" + ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ + "-Dprotobuf_BUILD_SHARED_LIBS=ON" + ] + # Tests fail to build on 32-bit platforms; fixed in 3.22 + # https://github.com/protocolbuffers/protobuf/issues/10418 + ++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") [ + "-Dprotobuf_BUILD_TESTS=OFF" + ]; - passthru = { - tests = { - pythonProtobuf = python3.pkgs.protobuf.override(_: { - protobuf = self; - }); - }; + doCheck = true; - inherit abseil-cpp; + passthru = { + tests = { + pythonProtobuf = python3.pkgs.protobuf.override (_: { + protobuf = finalAttrs.finalPackage; + }); + inherit grpc; }; - meta = { - description = "Google's data interchange format"; - longDescription = '' - Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - homepage = "https://developers.google.com/protocol-buffers/"; - maintainers = with lib.maintainers; [ jonringer ]; - mainProgram = "protoc"; - }; + inherit abseil-cpp; + }; + + meta = { + description = "Google's data interchange format"; + longDescription = '' + Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + homepage = "https://protobuf.dev/"; + maintainers = with lib.maintainers; [ jonringer ]; + mainProgram = "protoc"; }; -in - self +}) diff --git a/nixpkgs/pkgs/development/libraries/pulseaudio-qt/default.nix b/nixpkgs/pkgs/development/libraries/pulseaudio-qt/default.nix index c1ba89f05842..9605b5875ec3 100644 --- a/nixpkgs/pkgs/development/libraries/pulseaudio-qt/default.nix +++ b/nixpkgs/pkgs/development/libraries/pulseaudio-qt/default.nix @@ -1,29 +1,31 @@ -{ mkDerivation +{ stdenv , lib , fetchurl , cmake -, extra-cmake-modules , pkg-config +, extra-cmake-modules +, wrapQtAppsHook , pulseaudio }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pulseaudio-qt"; version = "1.3.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${pname}-${lib.versions.majorMinor version}.tar.xz"; + url = "mirror://kde/stable/${finalAttrs.pname}/${finalAttrs.pname}-${lib.versions.majorMinor finalAttrs.version}.tar.xz"; sha256 = "1i4yb0v1mmhih8c2i61hybg6q60qys3pc5wbjb7a0vwl1mihgsxw"; }; - buildInputs = [ - pulseaudio - ]; - nativeBuildInputs = [ - pkg-config cmake + pkg-config extra-cmake-modules + wrapQtAppsHook + ]; + + buildInputs = [ + pulseaudio ]; meta = with lib; { @@ -32,4 +34,4 @@ mkDerivation rec { license = with licenses; [ lgpl2 ]; maintainers = with maintainers; [ doronbehar ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/nixpkgs/pkgs/development/libraries/qpdf/default.nix index 838657f48bbe..d80309f2b16b 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.5.0"; + version = "11.6.1"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "v${version}"; - hash = "sha256-lojvsCgBsT7wVRLWfkeOduEYUG7ztI/uryM0WueWiL0="; + hash = "sha256-QXRzvSMi6gKISJo44KIjTYENNqxh1yDhUUhEZa8uz6Q="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix index bc4263928078..12531286d33d 100644 --- a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix +++ b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix @@ -1,21 +1,21 @@ { stdenv , lib , fetchFromGitHub -, gfortran -, blas , cmake , lapack , which +, gfortran +, blas }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qrupdate"; version = "1.1.5"; src = fetchFromGitHub { owner = "mpimd-csc"; repo = "qrupdate-ng"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dHxLPrN00wwozagY2JyfZkD3sKUD2+BcnbjNgZepzFg="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix index 98d11864e452..f394ff6627e0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qt3d.nix @@ -2,7 +2,7 @@ qtModule { pname = "qt3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix index f5d034bcc327..75766649a404 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtcharts.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtcharts"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index 9725b7babe07..81efb4bee04b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -2,8 +2,12 @@ qtModule { pname = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; buildInputs = lib.optional stdenv.isLinux bluez; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth ]; + propagatedBuildInputs = [ + qtbase + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ + IOBluetooth + ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix index 80a98f24be14..d79320ea139f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtdatavis3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # error: use of undeclared identifier 'stat64' env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f19074e08a0c..892498da43b2 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtdeclarative"; - qtInputs = [ qtbase qtsvg ]; + propagatedBuildInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ python3 ]; outputs = [ "out" "dev" "bin" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix index 4ef4915000e5..93620e42667e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtdoc.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtdoc"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix index 147fb0745dbd..398572673171 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtgamepad"; - qtInputs = [ qtbase qtdeclarative ] + propagatedBuildInputs = [ qtbase qtdeclarative ] ++ lib.optional stdenv.isDarwin GameController; buildInputs = [ ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix index c90280090b8e..2fe865492e36 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtgraphicaleffects"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" "dev" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 52fa4d4ba8ff..f099fc6799b5 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -1,7 +1,12 @@ -{ qtModule, qtbase, libtiff }: +{ qtModule +, qtbase +, libwebp +, jasper +, libmng +, libtiff +}: qtModule { pname = "qtimageformats"; - qtInputs = [ qtbase ]; - propagatedBuildInputs = [ libtiff ]; + propagatedBuildInputs = [ qtbase libwebp jasper libmng libtiff ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix index b5fdc918dc69..a9897648d8e6 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtlocation"; - qtInputs = [ qtbase qtmultimedia ]; + propagatedBuildInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; qmakeFlags = lib.optionals stdenv.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix index d94c289953d0..4231fcb26b1c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtlottie"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 30e363cff59a..da0f5f760bf7 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtmacextras"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; meta = with lib; { maintainers = with maintainers; [ periklis ]; platforms = platforms.darwin; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index 704cb7881c71..d5dc16c52823 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -13,7 +13,7 @@ qtModule { pname = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gstreamer gst-plugins-base ] # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix index 148ed890fc9e..bec5f354a23a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtnetworkauth"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpim.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpim.nix index 702655c6e7fd..01692d9f2ec3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpim.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpim.nix @@ -12,7 +12,7 @@ qtModule { "dev" ]; - qtInputs = [ + propagatedBuildInputs = [ qtbase qtdeclarative ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpositioning.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpositioning.nix index 99b06bbf2536..20f059976323 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpositioning.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtpositioning.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtpositioning"; - qtInputs = [ qtbase qtdeclarative qtserialport ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix index 6c85a91fb78c..3b78a2a6c87e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtquickcontrols"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix index a50ad9e2a304..59070629ddc7 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtquickcontrols2.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtquickcontrols2"; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix index a71f9e8e352d..fde78848c854 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtremoteobjects"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; # cycle is detected in build when adding "dev" "bin" too outputs = [ "out" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix index e7ce86b74a68..07993b72a6d3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscript.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtscript"; - qtInputs = [ qtbase qttools ]; + propagatedBuildInputs = [ qtbase qttools ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscxml.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscxml.nix index cf9af0bc7543..3314934db2ff 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscxml.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtscxml.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtscxml"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix index 3fbd032b968f..fdea92035b90 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsensors.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtsensors"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialbus.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialbus.nix index 4fd6d7cb83c3..3a7285d0a8b0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialbus.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialbus.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtserialbus"; - qtInputs = [ qtbase qtserialport ]; + propagatedBuildInputs = [ qtbase qtserialport ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix index 93f3e130ee74..7907f91b986b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtserialport.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtserialport"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNIXPKGS_LIBUDEV=\"${lib.getLib systemd}/lib/libudev\""; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix index 371162324c0b..94e66cf40044 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtspeech"; - qtInputs = [ ]; + propagatedBuildInputs = [ ]; buildInputs = lib.optionals stdenv.isLinux [ speechd ]; nativeBuildInputs = [ pkg-config ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix index 59c7cf67448c..418c69fb2ebf 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsvg.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtsvg"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsystems.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsystems.nix index 32974bdecc67..921172c2856b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsystems.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtsystems.nix @@ -20,7 +20,7 @@ qtModule { "bin" ]; - qtInputs = [ + propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix index bac70d146bf9..37e4348ed2c2 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qttools.nix @@ -2,7 +2,7 @@ qtModule { pname = "qttools"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; # fixQtBuiltinPaths overwrites a builtin path we should keep diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix index 77f1948dbf43..0bfc242d15b8 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtvirtualkeyboard"; - qtInputs = [ qtbase qtdeclarative qtsvg hunspell ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix index edb15b0b48b1..347a5cf64342 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,10 +1,10 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: +{ qtModule, qtbase, qtquickcontrols, wayland, wayland-scanner, pkg-config }: qtModule { pname = "qtwayland"; - qtInputs = [ qtbase qtquickcontrols ]; + propagatedBuildInputs = [ qtbase qtquickcontrols ]; buildInputs = [ wayland ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wayland-scanner ]; outputs = [ "out" "dev" "bin" ]; patches = [ # NixOS-specific, ensure that app_id is correctly determined for diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix index f49e9e234901..118a5d4f96f6 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebchannel.nix @@ -2,7 +2,6 @@ qtModule { pname = "qtwebchannel"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } - diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 1794e3f8ca67..7326fa54fd38 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -31,7 +31,6 @@ qtModule { pname = "qtwebengine"; - qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ bison flex git gperf ninja pkg-config python which gn nodejs ] ++ lib.optional stdenv.isDarwin xcbuild; @@ -127,6 +126,8 @@ qtModule { ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ + qtdeclarative qtquickcontrols qtlocation qtwebchannel + # Image formats libjpeg libpng libtiff libwebp diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix index d8fd7a692370..b2d93300a664 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtwebglplugin"; - qtInputs = [ qtbase qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtwebsockets ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index fc1766488ecc..9c5d347d110b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -22,7 +22,7 @@ let in qtModule { pname = "qtwebkit"; - qtInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] + propagatedBuildInputs = [ qtbase qtdeclarative qtlocation qtsensors qtwebchannel ] ++ lib.optional stdenv.isDarwin qtmultimedia; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix index 540fcade73c9..a355662aed6c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebsockets.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix index dccc3d6f81ea..fd8755390973 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -2,7 +2,7 @@ qtModule { pname = "qtwebview"; - qtInputs = [ qtdeclarative qtwebengine ]; + propagatedBuildInputs = [ qtdeclarative qtwebengine ]; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation WebKit diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtx11extras.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtx11extras.nix index ad743523bb00..8d5aa2fd235f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtx11extras.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtx11extras.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtx11extras"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix index c602b1e39d2d..ae4ea52dcd8a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix @@ -2,6 +2,6 @@ qtModule { pname = "qtxmlpatterns"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix index bddbf254c5f7..7322ed51e83e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/qtModule.nix @@ -17,7 +17,9 @@ mkDerivation (args // { patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; - propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); + propagatedBuildInputs = + (lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ + (args.propagatedBuildInputs or []); outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index d0c298e51926..0dd6cd75df08 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -3,6 +3,7 @@ , stdenv , fetchurl , fetchpatch +, fetchpatch2 , makeSetupHook , makeWrapper , gst_all_1 @@ -104,7 +105,15 @@ let qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; qtdoc = callPackage ./modules/qtdoc.nix { }; - qtgrpc = callPackage ./modules/qtgrpc.nix { }; + qtgrpc = callPackage ./modules/qtgrpc.nix { + patches = [ + (fetchpatch2 { + # fix compatibility with protobuf 23 + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/d6b33bd915dc6e63b30db2cd29150d55b289d7ed/protobuf-23.patch"; + hash = "sha256-KQAcrjQ3rK9pDQUOUK6AS4ej8YvtRv9WZOxby31Y5r4="; + }) + ]; + }; qthttpserver = callPackage ./modules/qthttpserver.nix { }; qtimageformats = callPackage ./modules/qtimageformats.nix { }; qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qt3d.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qt3d.nix index 2f3a45f67d85..f1df7f6fc254 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qt3d.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qt3d.nix @@ -7,6 +7,5 @@ qtModule { pname = "qt3d"; - qtInputs = [ qtbase qtdeclarative qtmultimedia ]; - propagatedBuildInputs = [ assimp ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtmultimedia assimp ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qt5compat.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qt5compat.nix index f3a62b7b5ec9..d2049d7fc3e5 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qt5compat.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qt5compat.nix @@ -8,6 +8,6 @@ qtModule { pname = "qt5compat"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ libiconv icu openssl ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtcharts.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtcharts.nix index 917697c38623..e9b6c8d6b33f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtcharts.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtcharts.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtcharts"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix index 976fd626f5d1..46d8f925beb0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -11,8 +11,13 @@ qtModule { pname = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ bluez ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ IOBluetooth PCSC ]; + propagatedBuildInputs = [ + qtbase + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ + IOBluetooth + PCSC + ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix index 1d0f9711e588..e6c12508c9d0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdatavis3d.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtdatavis3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index d78a886109af..afdb24d1d291 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -8,8 +8,7 @@ qtModule { pname = "qtdeclarative"; - qtInputs = [ qtbase qtlanguageserver qtshadertools ]; - propagatedBuildInputs = [ openssl python3 ]; + propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl python3 ]; patches = [ # prevent headaches from stale qmlcache data ../patches/qtdeclarative-default-disable-qmlcache.patch diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix index 3bbe39e5ee20..555108caa01a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -14,7 +14,7 @@ qtModule { done ''; nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; - qtInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; cmakeFlags = [ "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS" ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtgrpc.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtgrpc.nix index f2623dd3d566..572fe471d48f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtgrpc.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtgrpc.nix @@ -3,10 +3,12 @@ , qtdeclarative , protobuf , grpc +, patches ? [] }: qtModule { pname = "qtgrpc"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ protobuf grpc ]; + inherit patches; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qthttpserver.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qthttpserver.nix index cd2c9d2a803c..cf32c8a7ea76 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qthttpserver.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qthttpserver.nix @@ -5,5 +5,5 @@ qtModule { pname = "qthttpserver"; - qtInputs = [ qtbase qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtwebsockets ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtimageformats.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtimageformats.nix index b28adbc7295b..50420aaa7e45 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtimageformats.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtimageformats.nix @@ -8,6 +8,6 @@ qtModule { pname = "qtimageformats"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; buildInputs = [ libwebp jasper libmng libtiff ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix index 07115d6755a5..b45ab11fc3ff 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlanguageserver.nix @@ -4,7 +4,7 @@ qtModule { pname = "qtlanguageserver"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; # Doesn't have version set dontCheckQtModuleVersion = true; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlocation.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlocation.nix index 751a2e0915a3..12fa89b9aaea 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlocation.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlocation.nix @@ -6,5 +6,5 @@ qtModule { pname = "qtlocation"; - qtInputs = [ qtbase qtdeclarative qtpositioning ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtpositioning ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlottie.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlottie.nix index d94c289953d0..4231fcb26b1c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlottie.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtlottie.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtlottie"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index 43c6dade7de3..0815cc841590 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -12,5 +12,5 @@ qtModule rec { rev = "v${version}"; hash = "sha256-yyerVzz+nGT5kjNo24zYqZcJmrE50KCp38s3+samjd0="; }; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index cb012ee8bef7..538687dce58a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -22,12 +22,11 @@ qtModule { pname = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative qtsvg qtshadertools ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libunwind orc ] ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland ]; - propagatedBuildInputs = - lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ] + ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix index 148ed890fc9e..bec5f354a23a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtnetworkauth.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtnetworkauth"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtpositioning.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtpositioning.nix index 99b06bbf2536..20f059976323 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtpositioning.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtpositioning.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtpositioning"; - qtInputs = [ qtbase qtdeclarative qtserialport ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtserialport ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3d.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3d.nix index d19a8e725a16..1c84856c0c12 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3d.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3d.nix @@ -6,6 +6,6 @@ qtModule { pname = "qtquick3d"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ openssl ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix index 34c17fc03453..05d121cd9b78 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -7,7 +7,7 @@ qtModule { pname = "qtquick3dphysics"; - qtInputs = [ qtbase qtquick3d ]; + propagatedBuildInputs = [ qtbase qtquick3d ]; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-faligned-allocation"; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix index c86fc92218f3..213814a017e2 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquickeffectmaker.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtquickeffectmaker"; - qtInputs = [ qtbase qtquick3d ]; + propagatedBuildInputs = [ qtbase qtquick3d ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix index 7458515dba26..9ac9c1f09393 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtquicktimeline.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtquicktimeline"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix index 888ec33b461a..1fd3b1b7a253 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtremoteobjects.nix @@ -5,5 +5,5 @@ qtModule { pname = "qtremoteobjects"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtscxml.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtscxml.nix index c49064c5e579..ece975f59e8d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtscxml.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtscxml.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtscxml"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsensors.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsensors.nix index 73ddc394cc46..bc49c7a77f58 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsensors.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsensors.nix @@ -6,5 +6,5 @@ qtModule { pname = "qtsensors"; - qtInputs = [ qtbase qtdeclarative qtsvg ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix index 4fd6d7cb83c3..3a7285d0a8b0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialbus.nix @@ -2,5 +2,5 @@ qtModule { pname = "qtserialbus"; - qtInputs = [ qtbase qtserialport ]; + propagatedBuildInputs = [ qtbase qtserialport ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialport.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialport.nix index 2d23ae17cc5f..27b9eb9c1915 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialport.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtserialport.nix @@ -8,7 +8,6 @@ qtModule { pname = "qtserialport"; - qtInputs = [ qtbase ]; nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = lib.optionals stdenv.isLinux [ udev ]; + propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ udev ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix index 47102896f7e6..5a4b894b9abd 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtshadertools.nix @@ -4,5 +4,5 @@ qtModule { pname = "qtshadertools"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtspeech.nix index ec713bc98c68..77c08fa91951 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtspeech.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtspeech.nix @@ -12,8 +12,8 @@ qtModule { pname = "qtspeech"; - qtInputs = [ qtbase qtmultimedia ]; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Cocoa ]; + propagatedBuildInputs = [ qtbase qtmultimedia ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix index 9031f8805ac9..d81634d9ef1b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtsvg.nix @@ -9,7 +9,7 @@ qtModule { pname = "qtsvg"; - qtInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; buildInputs = [ libwebp jasper libmng zlib ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix index adca87550cca..48f2f5270e80 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -15,8 +15,8 @@ qtModule { llvmPackages.libclang llvmPackages.llvm ]; - qtInputs = [ qtbase qtdeclarative ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ cups ]; + propagatedBuildInputs = [ qtbase qtdeclarative ] + ++ lib.optionals stdenv.isDarwin [ cups ]; patches = [ ../patches/qttools-paths.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix index 9c53f11e1a3c..9f067900dc06 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix @@ -8,7 +8,6 @@ qtModule { pname = "qtvirtualkeyboard"; - qtInputs = [ qtbase qtdeclarative qtsvg ]; - propagatedBuildInputs = [ hunspell ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg hunspell ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix index e28cdb438e5e..ddd402f3c222 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -9,7 +9,7 @@ qtModule { pname = "qtwayland"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix index 49b959c5dea7..bf0ba0f63385 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebchannel.nix @@ -7,6 +7,6 @@ qtModule { pname = "qtwebchannel"; - qtInputs = [ qtbase qtdeclarative qtwebsockets ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtwebsockets ]; buildInputs = [ openssl ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 5d9aa71e8537..4bd8d62c8f31 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -93,7 +93,6 @@ qtModule { pname = "qtwebengine"; - qtInputs = [ qtdeclarative qtwebchannel qtwebsockets qtpositioning ]; nativeBuildInputs = [ bison coreutils @@ -201,6 +200,11 @@ qtModule { ]; propagatedBuildInputs = [ + qtdeclarative + qtwebchannel + qtwebsockets + qtpositioning + # Image formats libjpeg libpng diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix index f81cd64596eb..c3a346a8d78a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebsockets.nix @@ -6,6 +6,6 @@ qtModule { pname = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; + propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ openssl ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebview.nix index 1e7c42397792..e8ebea932f03 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebview.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebview.nix @@ -8,7 +8,7 @@ qtModule { pname = "qtwebview"; - qtInputs = [ qtdeclarative ] - ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ WebKit ]; + propagatedBuildInputs = [ qtdeclarative ] + ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ] + ++ lib.optionals stdenv.isDarwin [ WebKit ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix index ce917a274159..5434be84fa59 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; - propagatedBuildInputs = (args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]); + propagatedBuildInputs = + (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ + (args.propagatedBuildInputs or []); moveToDev = false; diff --git a/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix b/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix index 8fec60db1362..0841c0d457fd 100644 --- a/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtforkawesome/default.nix @@ -1,12 +1,12 @@ { stdenv , lib , fetchFromGitHub +, cmake +, qttools +, perl , cpp-utilities , qtutilities -, qttools , qtbase -, cmake -, perl }: let @@ -16,28 +16,29 @@ let rev = "1.2.0"; sha256 = "sha256-zG6/0dWjU7/y/oDZuSEv+54Mchng64LVyV8bluskYzc="; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "qtforkawesome"; version = "0.1.0"; src = fetchFromGitHub { owner = "Martchus"; - repo = pname; - rev = "v${version}"; + repo = "qtforkawesome"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-9e2TCg3itYtHZSvzCoaiIZmgsCMIoebh6C/XWtKz/2Q="; }; - buildInputs = [ - qtbase - cpp-utilities - qtutilities - ]; nativeBuildInputs = [ cmake qttools perl perl.pkgs.YAML ]; + + buildInputs = [ + qtbase + cpp-utilities + qtutilities + ]; cmakeFlags = [ # Current freetype used by NixOS users doesn't support the `.woff2` font # format, so we use ttf. See @@ -55,5 +56,5 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index a629e8a2ac12..de80fc0709d3 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -1,27 +1,35 @@ { stdenv , lib , fetchFromGitHub -, cpp-utilities +, cmake , qttools +, cpp-utilities , qtbase -, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; version = "6.13.1"; src = fetchFromGitHub { owner = "Martchus"; - repo = pname; - rev = "v${version}"; + repo = "qtutilities"; + rev = "v${finalAttrs.version}"; hash = "sha256-ic1Xnle1fGZ5elf0yH0BF+3spAmIo9kP62WhXLmBVNc="; }; - buildInputs = [ qtbase cpp-utilities ]; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ + cmake + qttools + ]; + buildInputs = [ + qtbase + cpp-utilities + ]; - cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; dontWrapQtApps = true; @@ -32,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/re2/default.nix b/nixpkgs/pkgs/development/libraries/re2/default.nix index adaef49976a7..c5f74854f77c 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 = "2023-08-01"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-RexwqNR/Izf2Rzu1cvMw+le6C4EmL4CeWCOc+vXUBZQ="; + hash = "sha256-dCEkwjIs8ITVUZ4N0+qeGoShGNqKkdvJ88teyGKN6pg="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/reproc/default.nix b/nixpkgs/pkgs/development/libraries/reproc/default.nix index 2083a6a7af4d..680455d4cb5a 100644 --- a/nixpkgs/pkgs/development/libraries/reproc/default.nix +++ b/nixpkgs/pkgs/development/libraries/reproc/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=ON" "-DREPROC++=ON" diff --git a/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix b/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix index d5f5268ac8eb..39a8f1a4b6a6 100644 --- a/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation rec { simd ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - meta = with lib; { description = "A real-time noise suppression plugin for voice based on Xiph's RNNoise"; homepage = "https://github.com/werman/noise-suppression-for-voice"; diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 016ff7af6ea9..e48c812b3912 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; + hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 678aac37e898..c1483f90c433 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.48"; + version = "1.3.50"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7C1syZAhMv0N+AuE/SuXqhatKhlzDOix4ZDxLRyuWOs="; + sha256 = "sha256-B+znuvQ7TTl2u4rw64ylPywfpr066Yf8Wg0qrdByGRE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix index 691140dbf847..8e872f9f8f07 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mongoose/default.nix @@ -6,11 +6,11 @@ }: let - suitesparseVersion = "7.1.0"; + suitesparseVersion = "7.2.0"; in stdenv.mkDerivation { pname = "mongoose"; - version = "3.0.5"; + version = "3.2.1"; outputs = [ "bin" "out" "dev" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${suitesparseVersion}"; - hash = "sha256-UizybioU1J01PLBpu+PfnSzWScGTvMuJN5j9PjuZRwE="; + hash = "sha256-Ss1R3P1fyRwlGQxJchydV36xLEMAGJabMMiQiKykKrc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/seasocks/default.nix b/nixpkgs/pkgs/development/libraries/seasocks/default.nix index 12ec9aa0e894..96db323f90a7 100644 --- a/nixpkgs/pkgs/development/libraries/seasocks/default.nix +++ b/nixpkgs/pkgs/development/libraries/seasocks/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seasocks"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "mattgodbolt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b1KNHuS5ndkBWItKVTiJ//Y+uKi1PcUk9624IILOusQ="; + sha256 = "sha256-R1McxZm2qsUoggFGfL587g+8eQf7si56xVkR8B8nehQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index 9f6ac99c6f02..09989fb7bddf 100644 --- a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { breakpad ]; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DSENTRY_BREAKPAD_SYSTEM=On" ]; diff --git a/nixpkgs/pkgs/development/libraries/smooth/default.nix b/nixpkgs/pkgs/development/libraries/smooth/default.nix index 52d125a8801e..bc4a5601dc45 100644 --- a/nixpkgs/pkgs/development/libraries/smooth/default.nix +++ b/nixpkgs/pkgs/development/libraries/smooth/default.nix @@ -3,9 +3,17 @@ , fetchFromGitHub , pkg-config -, gtk3 +, bzip2 , curl +, fribidi +, gtk3 +, iconv +, libcpuid +, libjpeg +, libpng +, libwebp , libxml2 +, zlib }: stdenv.mkDerivation rec { @@ -25,12 +33,21 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" + "config=systemlibbz2,systemlibcpuid,systemlibcurl,systemlibfribidi,systemlibiconv,systemlibjpeg,systemlibpng,systemlibwebp,systemlibxml2,systemzlib" ]; buildInputs = [ - gtk3 + bzip2 curl + fribidi + gtk3 + iconv + libcpuid + libjpeg + libpng + libwebp libxml2 + zlib ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/nixpkgs/pkgs/development/libraries/spdlog/default.nix index d68e22f1c891..ff42a5ba3b5c 100644 --- a/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; + # Required to build tests, even if they aren't executed + buildInputs = [ catch2_3 ]; propagatedBuildInputs = [ fmt ]; - checkInputs = [ catch2_3 ]; cmakeFlags = [ "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" diff --git a/nixpkgs/pkgs/development/libraries/spglib/default.nix b/nixpkgs/pkgs/development/libraries/spglib/default.nix index 4b634a0f1f69..7cb99f065055 100644 --- a/nixpkgs/pkgs/development/libraries/spglib/default.nix +++ b/nixpkgs/pkgs/development/libraries/spglib/default.nix @@ -1,20 +1,22 @@ -{ stdenv, lib, fetchFromGitHub, cmake, openmp }: +{ stdenv, lib, fetchFromGitHub, cmake, gtest, openmp }: stdenv.mkDerivation rec { pname = "spglib"; - version = "2.0.2"; # N.B: if you change this, please update: pythonPackages.spglib + version = "2.1.0"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { owner = "spglib"; repo = "spglib"; rev = "v${version}"; - sha256 = "sha256-8Voepj35CMbboL3Dc55Gc4+OLPTTSgqVQuvNcRQsqmU="; + hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gtest ]; buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + doCheck = true; + meta = with lib; { description = "C library for finding and handling crystal symmetries"; homepage = "https://spglib.github.io/spglib/"; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index cc26df385a5c..f51ce3a50005 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -7,6 +7,8 @@ , interactive ? false # TODO: can be removed since 3.36 since it is the default now. , enableDeserialize ? false + +, gitUpdater }: let @@ -15,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.42.0"; + version = "3.43.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-erz9FhxuJ0LKXGwIldH4U8lA8gMwSgtJ2k4eyl0IjKY="; + hash = "sha256-ORFslOdmMPItVM2Cw86jCFZfFxX3FtGyUn8cnJabpNk="; }; outputs = [ "bin" "dev" "out" ]; @@ -87,9 +89,18 @@ stdenv.mkDerivation rec { doCheck = false; # fails to link against tcl - passthru.tests = { - inherit (python3Packages) sqlalchemy; - inherit sqldiff sqlite-analyzer tracker; + passthru = { + tests = { + inherit (python3Packages) sqlalchemy; + inherit sqldiff sqlite-analyzer tracker; + }; + + updateScript = gitUpdater { + # No nicer place to look for patest version. + url = "https://github.com/sqlite/sqlite.git"; + # Expect tags like "version-3.43.0". + rev-prefix = "version-"; + }; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index c30ce8d45d9a..31207ad9edf9 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.42.0"; + version = "3.43.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-OMpWoxe+N/sAvZK8KA2bkgm9QAiyl9SDxB7B9geb+20="; + hash = "sha256-IunC70n+b4otvJPE09zgnG1qT1Y95SsKgXGtSajHKRc="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix b/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix index 4212f29e924f..e2c0b4ec35b9 100644 --- a/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, cmake, sqlite, gtest }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, sqlite +, gtest +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sqlitecpp"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "SRombauts"; - repo = pname; - rev = version; - sha256 = "sha256-3Xo/FgifbrSn0AvinriJZerUM2kbcMaoyF5ST8+1Qqw="; + repo = "sqlitecpp"; + rev = finalAttrs.version; + sha256 = "sha256-8l1JRaE7w9vJ4bCSLGAk9zwYHDFeKkBi9pE5fUJfLRc="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ sqlite gtest ]; + nativeBuildInputs = [ + cmake + ]; + buildInputs = [ + sqlite + gtest + ]; doCheck = true; cmakeFlags = [ @@ -27,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.jbedo maintainers.doronbehar ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix index 47a512b56a8c..7a3c1d27432b 100644 --- a/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.6.0"; + version = "6.6.1"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-+QApuNqEbI+v9VMP0fpIRweRiNBAVU9VwdXR4EdD0p0="; + hash = "sha256-UWKw5tGdexQHiiFEHgeVzzjR2IOXO+NZAeAY+bswxUM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/taglib/default.nix b/nixpkgs/pkgs/development/libraries/taglib/default.nix index 0fb207e4e0f7..6eaab9623417 100644 --- a/nixpkgs/pkgs/development/libraries/taglib/default.nix +++ b/nixpkgs/pkgs/development/libraries/taglib/default.nix @@ -7,20 +7,26 @@ stdenv.mkDerivation rec { pname = "taglib"; - version = "1.13"; + version = "1.13.1"; src = fetchFromGitHub { owner = "taglib"; repo = "taglib"; rev = "v${version}"; - sha256 = "sha256-DRALRH+/7c2lBvCpLp8hop3Xxsf76F1q8L7F9qehqQA="; + hash = "sha256-QX0EpHGT36UsgIfRf5iALnwxe0jjLpZvCTbk8vSMFF4="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + # Workaround unconditional ${prefix} until upstream is fixed: + # https://github.com/taglib/taglib/issues/1098 + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; meta = with lib; { homepage = "https://taglib.org/"; diff --git a/nixpkgs/pkgs/development/libraries/tweeny/default.nix b/nixpkgs/pkgs/development/libraries/tweeny/default.nix index 0afc82321d8c..257b966808d2 100644 --- a/nixpkgs/pkgs/development/libraries/tweeny/default.nix +++ b/nixpkgs/pkgs/development/libraries/tweeny/default.nix @@ -4,14 +4,14 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tweeny"; version = "3.2.0"; src = fetchFromGitHub { owner = "mobius3"; repo = "tweeny"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-VmvOMK+FjYZXKH9kPUT2L7pmJMPSr5eXptCcoGWK+qo="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.doronbehar ]; platforms = with platforms; darwin ++ linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/unixODBC/default.nix b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix index 90398e5aef25..8587ad6d2c3c 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBC/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBC/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "unixODBC"; - version = "2.3.11"; + version = "2.3.12"; src = fetchurl { urls = [ "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" "https://www.unixodbc.org/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w="; + sha256 = "sha256-8hBQFEXOIb9ge6Ue+MEl4Q4i3/3/7Dd2RkYt9fAZFew="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/nixpkgs/pkgs/development/libraries/vectorscan/default.nix b/nixpkgs/pkgs/development/libraries/vectorscan/default.nix index 03aec03ad656..12fa0735b27f 100644 --- a/nixpkgs/pkgs/development/libraries/vectorscan/default.nix +++ b/nixpkgs/pkgs/development/libraries/vectorscan/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vectorscan"; - version = "5.4.9"; + version = "5.4.10.1"; src = fetchFromGitHub { owner = "VectorCamp"; repo = "vectorscan"; rev = "vectorscan/${version}"; - hash = "sha256-V5Qgr8aH1H+ZoJ0IZ52HIDRZq+yIwHjLf3gU/ZhjjlY="; + hash = "sha256-x6FefOrUvpN/A4GXTd+3SGZEAQL6pXt83ufxRIY3Q9k="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { code will be abstracted away. ''; homepage = "https://www.vectorcamp.gr/vectorscan/"; - changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG-vectorscan.md"; platforms = platforms.unix; license = with licenses; [ bsd3 /* and */ bsd2 /* and */ licenses.boost ]; maintainers = with maintainers; [ tnias vlaci ]; diff --git a/nixpkgs/pkgs/development/libraries/volk/2.5.0.nix b/nixpkgs/pkgs/development/libraries/volk/2.5.0.nix index 5ac88083aa66..35216cb7e31c 100644 --- a/nixpkgs/pkgs/development/libraries/volk/2.5.0.nix +++ b/nixpkgs/pkgs/development/libraries/volk/2.5.0.nix @@ -8,7 +8,7 @@ , fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "volk"; # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gnuradio"; - repo = pname; - rev = "v${version}"; + repo = "volk"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; fetchSubmodules = true; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/volk/default.nix b/nixpkgs/pkgs/development/libraries/volk/default.nix index 7271a700e92d..02240ac1febf 100644 --- a/nixpkgs/pkgs/development/libraries/volk/default.nix +++ b/nixpkgs/pkgs/development/libraries/volk/default.nix @@ -8,14 +8,14 @@ , removeReferencesTo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "volk"; version = "3.0.0"; src = fetchFromGitHub { owner = "gnuradio"; - repo = pname; - rev = "v${version}"; + repo = "volk"; + rev = "v${finalAttrs.version}"; hash = "sha256-kI4IuO6TLplo5lLAGIPWQWtePcjIEWB9XaJDA6WlqSg="; fetchSubmodules = true; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix index f78d8b35e2a8..2c1e15bfbef3 100644 --- a/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/nixpkgs/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,45 +1,41 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchFromGitLab , darwin , abseil-cpp , meson , ninja +, pkg-config }: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; - version = "1.0"; + version = "1.3"; - src = fetchurl { - url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v${version}/webrtc-audio-processing-v${version}.tar.gz"; - sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pulseaudio"; + repo = "webrtc-audio-processing"; + rev = "v${version}"; + hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; }; nativeBuildInputs = [ meson ninja + pkg-config ]; - buildInputs = [ + propagatedBuildInputs = [ abseil-cpp - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + ]; - patchPhase = '' - # this is just incorrect upstream - # see https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4 - substituteInPlace meson.build \ - --replace "absl_flags_registry" "absl_flags_reflection" - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 - ''; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); meta = with lib; { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h - platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86); - # attempts to inline 256bit AVX instructions on x86 - # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 - broken = stdenv.isx86_32; + # x86-32 disabled due to https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 + platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.mips ++ platforms.riscv ++ platforms.x86_64); }; } diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index b77ec4d3c4a8..4c60ccf6c8ba 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -3,18 +3,19 @@ , fetchFromGitHub , Security , autoreconfHook +, util-linux , openssl }: stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.5.4"; + version = "5.6.3"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "v${version}-stable"; - hash = "sha256-sR/Gjk50kLej5oJzDH1I6/V+7OIRiwtyeg5tEE3fmHk="; + rev = "refs/tags/v${version}-stable"; + hash = "sha256-UN4zs+Rxh/bsLD1BQA+f1YN/UOJ6OB2HduhoetEp10Y="; }; postPatch = '' @@ -43,13 +44,20 @@ stdenv.mkDerivation rec { "out" ]; - propagatedBuildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + nativeBuildInputs = [ autoreconfHook + util-linux ]; doCheck = true; - nativeCheckInputs = [ openssl ]; + + nativeCheckInputs = [ + openssl + ]; postInstall = '' # fix recursive cycle: @@ -62,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; + changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${version}-stable"; platforms = platforms.all; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; diff --git a/nixpkgs/pkgs/development/libraries/yas/default.nix b/nixpkgs/pkgs/development/libraries/yas/default.nix index 137693401eba..b06d995007fa 100644 --- a/nixpkgs/pkgs/development/libraries/yas/default.nix +++ b/nixpkgs/pkgs/development/libraries/yas/default.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/niXman/yas"; description = "Yet Another Serialization"; license = licenses.boost; - maintainers = with maintainers; [ ee2500 ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/yyjson/default.nix b/nixpkgs/pkgs/development/libraries/yyjson/default.nix index 48b10368aee5..7fe163362864 100644 --- a/nixpkgs/pkgs/development/libraries/yyjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/yyjson/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yyjson"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ibireme"; repo = "yyjson"; rev = finalAttrs.version; - hash = "sha256-Cz8K+cWuDpoMY6d+ecuOvXIMc4wtx15LLvxpFibkNyw="; + hash = "sha256-uAh/AUUDudQr+1+3YLkg9KxARgvKWxfDZlqo8388nFY="; }; nativeBuildInputs = [ |