diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
| commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
| tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/development/libraries | |
| parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
| parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
| download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip | |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries')
113 files changed, 430 insertions, 487 deletions
diff --git a/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/nixpkgs/pkgs/development/libraries/CGAL/default.nix index 672facdc230c..e7d26606f271 100644 --- a/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.5.3"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; - hash = "sha256-CgT2YmkyVjKLBbq/q7XjpbfbL1pY1S48Ug350IKN3XM="; + hash = "sha256-zbFefuMeBmNYnTEHp5mIo3t7FxnfPSTyBYVF0bzdWDc="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/nixpkgs/pkgs/development/libraries/abseil-cpp/202401.nix b/nixpkgs/pkgs/development/libraries/abseil-cpp/202401.nix index f540a7f8260a..0192241a9de9 100644 --- a/nixpkgs/pkgs/development/libraries/abseil-cpp/202401.nix +++ b/nixpkgs/pkgs/development/libraries/abseil-cpp/202401.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20240116.0"; + version = "20240116.1"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-HtJh2oYGx87bNT6Ll3WLeYPPxH1f9JwVqCXGErykGnE="; + hash = "sha256-D4E11bICKr3Z5RRah7QkfXVsXtuUg32FMmKpiOGjZDM="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 412052c2e3df..e0c9f5b035e3 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.8.0"; + version = "12.8.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-qJu2/s5c6f3R0BpLwUXPfMC5OcV3fMpG3mnC9eNBLPA="; + hash = "sha256-J4HdOmzF+aSckaRRnd4rHCQzWlv+DMHJiBtjYxQkUrQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/audiality2/default.nix b/nixpkgs/pkgs/development/libraries/audiality2/default.nix index e0ab0accdfde..11625bc64f79 100644 --- a/nixpkgs/pkgs/development/libraries/audiality2/default.nix +++ b/nixpkgs/pkgs/development/libraries/audiality2/default.nix @@ -7,14 +7,14 @@ , jack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "audiality2"; version = "1.9.4"; src = fetchFromGitHub { owner = "olofson"; repo = "audiality2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; }; @@ -35,5 +35,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; -} - +}) diff --git a/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 65ce6580dcec..198d94dbee7e 100644 --- a/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { version = "2.10"; src = fetchFromGitHub { - owner = "c4dm"; + owner = "vamp-plugins"; repo = "vamp-plugin-sdk"; rev = "vamp-plugin-sdk-v${version}"; - sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6"; + hash = "sha256-5jNA6WmeIOVjkEMZXB5ijxyfJT88alVndBif6dnUFdI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index df3d113dfd2c..0381146988a0 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -5,7 +5,6 @@ , pkg-config , libdaemon , dbus -, perlPackages , libpcap , expat , gettext @@ -105,10 +104,7 @@ stdenv.mkDerivation rec { expat libiconv libevent - ] ++ (with perlPackages; [ - perl - XMLParser - ]) ++ lib.optionals stdenv.isFreeBSD [ + ] ++ lib.optionals stdenv.isFreeBSD [ libpcap ] ++ lib.optionals gtk3Support [ gtk3 diff --git a/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix index e18f56fc2f48..87b86036cff2 100644 --- a/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "c-ares"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { url = "https://c-ares.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-vtWMTwKwCQgOvabCRnukaXIqxq679El9xEqD2MYZTlA="; + hash = "sha256-CnK+ZpWZVcQ+KvL70DQY6Cor1UZGBOyaYhR+N6zrQgs="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/catch2/3.nix b/nixpkgs/pkgs/development/libraries/catch2/3.nix index aa8bf62059bd..403c4f729b05 100644 --- a/nixpkgs/pkgs/development/libraries/catch2/3.nix +++ b/nixpkgs/pkgs/development/libraries/catch2/3.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { cmake ]; + hardeningDisable = [ "trivialautovarinit" ]; + cmakeFlags = [ "-DCATCH_DEVELOPMENT_BUILD=ON" "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}" diff --git a/nixpkgs/pkgs/development/libraries/cctz/default.nix b/nixpkgs/pkgs/development/libraries/cctz/default.nix index 0b945c8c5990..c0f8a58a18d9 100644 --- a/nixpkgs/pkgs/development/libraries/cctz/default.nix +++ b/nixpkgs/pkgs/development/libraries/cctz/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cctz"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "google"; repo = "cctz"; rev = "v${version}"; - sha256 = "0254xfwscfkjc3fbvx6qgifr3pwkc2rb03z8pbvvqy098di9alhr"; + sha256 = "sha256-F4h8nT1karymV16FFHC0ldSbdOOx5AMstqi4Bc5m3UQ="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 54a8637ebe21..49ebc34fbcf2 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.6"; + version = "5.24.7"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Lzt/lINfYvzabBbEUdNbF4Ta767WgMre2dxBkMbQnp0="; + sha256 = "sha256-gfyvWnvUXgjocid0nvp3lWhdPb7MYm+1GJRP5RYInEY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index e8e67c3ad437..943b9f28584c 100644 --- a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.24.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-RK5GQymtaYOM6HK2eRK5Rbz6NZva3Jt7lTPTUbSQXxI="; + hash = "sha256-pySnkDnV41rqr4OcNonPtSgv4AJYcF5vtkBg6Ad/IvU="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index 4e48536fa3af..09b15ad4da78 100644 --- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -26,13 +26,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-c7Dur+0HpteI7KkR9oo3WynoH/FCRaBwZA7bJmPDJp8="; + hash = "sha256-NDv4ZlmrbRoecd0qj/sy+camn4uRTrvte4/84L6oUUg="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/dlib/default.nix b/nixpkgs/pkgs/development/libraries/dlib/default.nix index 50709cae8c0b..e433ec46a302 100644 --- a/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -54,7 +54,7 @@ lapack ] ++ lib.optionals guiSupport [ libX11 ] - ++ lib.optionals config.cudaSupport (with cudaPackages; [ + ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cudart.dev cuda_cudart.lib cuda_cudart.static diff --git a/nixpkgs/pkgs/development/libraries/drogon/default.nix b/nixpkgs/pkgs/development/libraries/drogon/default.nix index 5919a45467dc..3e155d6f2d90 100644 --- a/nixpkgs/pkgs/development/libraries/drogon/default.nix +++ b/nixpkgs/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/pLYBCwulHkHQAVEhuAlPUJSS/jc3uvGtU0Q0RWPNn0="; + sha256 = "sha256-en8w8kda0ijg6b6s2WHxHfuGaa+p08928Jw57UBevDU="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/nixpkgs/pkgs/development/libraries/eccodes/default.nix index 844312768002..e8b58762f920 100644 --- a/nixpkgs/pkgs/development/libraries/eccodes/default.nix +++ b/nixpkgs/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.33.0"; + version = "2.34.1"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-vc7IzmNlTsaANADFB/ASIKmqQDpF+mtb3/f9zET9fa8="; + hash = "sha256-+bhoASLjzOwm5u0kqB8bxQ7Z8iMrQx4F5XNniqxNlzQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/faudio/default.nix b/nixpkgs/pkgs/development/libraries/faudio/default.nix index 96734d7325c1..22f422e25317 100644 --- a/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.02"; + version = "24.03"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-xEieWgPNSpRJNYh65F2+NLXVZIlKA5ZE+959+s9zQ/I="; + sha256 = "sha256-O2hnv74Uj3PJCmca9Ynz+jjeJXBw2zbGEWlqax3WfjA="; }; nativeBuildInputs = [cmake]; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index a44501fea081..2410547e2df6 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -40,7 +40,7 @@ , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) , withDrm ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # libdrm support -, withFdkAac ? withFullDeps && withUnfree # Fraunhofer FDK AAC de/encoder +, withFdkAac ? withFullDeps && (!withGPL || withUnfree) # Fraunhofer FDK AAC de/encoder , withFlite ? withFullDeps # Voice Synthesis , withFontconfig ? withHeadlessDeps # Needed for drawtext filter , withFreetype ? withHeadlessDeps # Needed for drawtext filter @@ -63,7 +63,8 @@ , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps -, withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder & AMR-WB decoder +, withOpencoreAmrnb ? withFullDeps && withVersion3 # AMR-NB de/encoder +, withOpencoreAmrwb ? withFullDeps && withVersion3 # AMR-WB decoder , withOpengl ? false # OpenGL rendering , withOpenh264 ? withFullDeps # H.264/AVC encoder , withOpenjpeg ? withFullDeps # JPEG 2000 de/encoder @@ -93,7 +94,7 @@ , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding -, withVulkan ? withFullDeps && !stdenv.isDarwin +, withVulkan ? withSmallDeps && !stdenv.isDarwin , withWebp ? withFullDeps # WebP encoder , withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder , withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder @@ -362,6 +363,14 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = map (patch: fetchpatch patch) (extraPatches + ++ (lib.optional (lib.versionOlder version "6.1") + { + # Backport fix for binutils-2.41. + name = "binutils-2.41.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; + hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; + } + ) ++ (lib.optional (lib.versionAtLeast finalAttrs.version "6" && lib.versionOlder finalAttrs.version "6.1") { # this can be removed post 6.1 name = "fix_aacps_tablegen"; @@ -468,6 +477,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withBluray "libbluray") (enableFeature withBs2b "libbs2b") (enableFeature withBzlib "bzlib") + (enableFeature withCaca "libcaca") (enableFeature withCelt "libcelt") (enableFeature withChromaprint "chromaprint") (enableFeature withCuda "cuda") @@ -478,6 +488,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withFdkAac "libfdk-aac") (enableFeature withFlite "libflite") (enableFeature withFontconfig "fontconfig") + (enableFeature withFontconfig "libfontconfig") (enableFeature withFreetype "libfreetype") (enableFeature withFrei0r "frei0r") (enableFeature withFribidi "libfribidi") @@ -501,6 +512,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withOpenal "openal") (enableFeature withOpencl "opencl") (enableFeature withOpencoreAmrnb "libopencore-amrnb") + (enableFeature withOpencoreAmrwb "libopencore-amrwb") (enableFeature withOpengl "opengl") (enableFeature withOpenh264 "libopenh264") (enableFeature withOpenjpeg "libopenjpeg") @@ -580,7 +592,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ] ++ optionals withCudaLLVM [ clang ]; - buildInputs = optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ] + buildInputs = [] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAom [ libaom ] ++ optionals withAribcaption [ libaribcaption ] @@ -612,10 +624,11 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withModplug [ libmodplug ] ++ optionals withMp3lame [ lame ] ++ optionals withMysofa [ libmysofa ] + ++ optionals (withNvdec || withNvenc) [ (if (lib.versionAtLeast finalAttrs.version "6") then nv-codec-headers-12 else nv-codec-headers) ] ++ optionals withOgg [ libogg ] ++ optionals withOpenal [ openal ] ++ optionals withOpencl [ ocl-icd opencl-headers ] - ++ optionals withOpencoreAmrnb [ opencore-amr ] + ++ optionals (withOpencoreAmrnb || withOpencoreAmrwb) [ opencore-amr ] ++ optionals withOpengl [ libGL libGLU ] ++ optionals withOpenh264 [ openh264 ] ++ optionals withOpenjpeg [ openjpeg ] @@ -707,6 +720,10 @@ stdenv.mkDerivation (finalAttrs: { postFixup = optionalString (stdenv.isLinux && withLib) '' addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so + '' + # https://trac.ffmpeg.org/ticket/10809 + + optionalString (versionAtLeast version "5.0" && withVulkan) '' + patchelf $lib/lib/libavcodec.so --add-needed libvulkan.so --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index e2677bdea25d..4dd6d86fdaeb 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.1"; - sha256 = "sha256-H9+1lEaHM12nzXSmo9m8S6527t+97e6necayyjCPm1A="; + version = "10.2.1"; + sha256 = "sha256-pEltGLAHLZ3xypD/Ur4dWPWJ9BGVXwqQyKcDWVmC3co="; }; } diff --git a/nixpkgs/pkgs/development/libraries/gensio/default.nix b/nixpkgs/pkgs/development/libraries/gensio/default.nix index cd20eab42a62..74eb0f05d3f2 100644 --- a/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SwY9FAUljaxap2ZlPS3JJ8VkYiJFWoSLU1miEQIEerE="; + sha256 = "sha256-GmVekTySfSOIWkKLdVuhhtJFQBBBfHBj410jNUfSrkc="; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 2a1bae9cf41b..9a5569cd1543 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchurl +, fetchpatch , gettext , meson , ninja @@ -63,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: { ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] ++ [ + (fetchpatch { + name = "GLib-against-PCRE2-10.43.patch"; + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/cce3ae98a2c1966719daabff5a4ec6cf94a846f6.patch"; + hash = "sha256-vgKzb5hQmFQGD8zxRrXnuX9Gpg/TeSrzehlOH2vA1xU="; + }) + ./glib-appinfo-watch.patch ./schema-override-variable.patch diff --git a/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/nixpkgs/pkgs/development/libraries/gnutls/default.nix index 86b22eb7cfd7..3bef1d935564 100644 --- a/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -106,6 +106,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + hardeningDisable = [ "trivialautovarinit" ]; + buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit ++ lib.optional (tpmSupport && stdenv.isLinux) trousers; diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix index 2d25a6d9e4d6..97779b477c30 100644 --- a/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.56"; + version = "0.10.57"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "uGQKL+4MCld4SypbkpRKKTLHidsQOd31ommtY0eW5+I="; + hash = "sha256-Zr/X4x0vZ1bVpiw2cDg8u6ArPLTBBClQGSqAG3Kjyas="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/grpc/default.nix b/nixpkgs/pkgs/development/libraries/grpc/default.nix index f6dec8b7b1b4..ba1a4a8c123e 100644 --- a/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.61.1"; # N.B: if you change this, please update: + version = "1.62.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-vrLkiNnsW6IpZNGhs6iZgEhdlV9Qpg8PLMDG2BKY2wo="; + hash = "sha256-iqoxgo/oocO9gBq0o5bmZvre/EwRguMrWnmwvyLGLr8="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/nixpkgs/pkgs/development/libraries/gstreamer/core/setup-hook.sh index 026a4e5f55a0..43d839eac7a7 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/core/setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/gstreamer/core/setup-hook.sh @@ -1,9 +1,8 @@ addGstreamer1LibPath () { if test -d "$1/lib/gstreamer-1.0" then - export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0-}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0" + addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 "$1/lib/gstreamer-1.0" fi } addEnvHooks "$hostOffset" addGstreamer1LibPath - diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 1935061e3c4b..fbb79028bdaf 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, fetchpatch +, substituteAll , meson , nasm , ninja @@ -24,9 +24,10 @@ , gdk-pixbuf , aalib , libcaca -, libsoup +, libsoup_3 , libpulseaudio , libintl +, libxml2 , Cocoa , lame , mpg123 @@ -63,6 +64,14 @@ stdenv.mkDerivation rec { hash = "sha256-JpWfz+v/9jfU6gjvQDFrrzG2G7dymCCwaE6ADDoUeLY="; }; + patches = [ + # dlopen libsoup_3 with an absolute path + (substituteAll { + src = ./souploader.diff; + nixLibSoup3Path = "${lib.getLib libsoup_3}/lib"; + }) + ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; @@ -102,8 +111,9 @@ stdenv.mkDerivation rec { gdk-pixbuf aalib libcaca - libsoup + libsoup_3 libshout + libxml2 lame mpg123 twolame diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/souploader.diff b/nixpkgs/pkgs/development/libraries/gstreamer/good/souploader.diff new file mode 100644 index 000000000000..8662207de8f2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/souploader.diff @@ -0,0 +1,13 @@ +diff --git a/ext/soup/gstsouploader.c b/ext/soup/gstsouploader.c +index 85048ce303..d7d818cf95 100644 +--- a/ext/soup/gstsouploader.c ++++ b/ext/soup/gstsouploader.c +@@ -181,7 +181,7 @@ gst_soup_load_library (void) + GST_DEBUG ("LibSoup 2 found"); + } else { + GST_DEBUG ("Trying all libsoups"); +- libsoup_sonames[0] = LIBSOUP_3_SONAME; ++ libsoup_sonames[0] = "@nixLibSoup3Path@/" LIBSOUP_3_SONAME; + libsoup_sonames[1] = LIBSOUP_2_SONAME; + } + diff --git a/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix b/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix index c91d3cbaac4f..59bf04f72609 100644 --- a/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake +, doxygen , boost , eigen , assimp @@ -14,20 +15,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.4.1"; + version = "2.4.4"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Suow6dvDZI0uS/CkzfkWIxYjn+i4Fbyd2EnqlxM2gMY="; + hash = "sha256-BwS9RSirdlD6Cqwp7KD59dkh2WsJVwdlH9LzM2AFjI4="; }; strictDeps = true; nativeBuildInputs = [ cmake + doxygen ]; propagatedBuildInputs = [ @@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DHPP_FCL_HAS_QHULL=ON" + "-DINSTALL_DOCUMENTATION=ON" ] ++ lib.optionals (!pythonSupport) [ "-DBUILD_PYTHON_INTERFACE=OFF" ]; @@ -53,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: { "hppfcl" ]; + outputs = [ "dev" "out" "doc" ]; + postFixup = '' + moveToOutput share/ament_index "$dev" + moveToOutput share/${finalAttrs.pname} "$dev" + ''; + + meta = with lib; { description = "An extension of the Flexible Collision Library"; homepage = "https://github.com/humanoid-path-planner/hpp-fcl"; diff --git a/nixpkgs/pkgs/development/libraries/imath/default.nix b/nixpkgs/pkgs/development/libraries/imath/default.nix index 79b91afcd529..ae7bbe2fba3f 100644 --- a/nixpkgs/pkgs/development/libraries/imath/default.nix +++ b/nixpkgs/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.10"; + version = "3.1.11"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-Of/F2FfSvVnhrafRqAyV/2VZpRtDN5Pg5AnUAgL3wiM="; + sha256 = "sha256-Cnl0BTXUzkDvgLSNXJbh5ATczBdbxiwbS4J9L6N8sKI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/impy/default.nix b/nixpkgs/pkgs/development/libraries/impy/default.nix index 6d148dd14639..8682e95a5758 100644 --- a/nixpkgs/pkgs/development/libraries/impy/default.nix +++ b/nixpkgs/pkgs/development/libraries/impy/default.nix @@ -9,14 +9,14 @@ , libjpeg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "impy"; version = "0.2"; src = fetchFromGitHub { owner = "bcampbell"; repo = "impy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0bHm3jawYgcIeF2COALWlypX7kvPw1hifB/W+TKcC4M="; }; @@ -40,5 +40,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} - +}) diff --git a/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/bcel/default.nix index 49cc12b2b33e..f25f4a552b7c 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.8.0"; + version = "6.8.1"; pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; - hash = "sha256-DdH+LcVY7C9sFqMY1UkMHRcAbtAsyINdTEmaj5Dr0OI="; + hash = "sha256-a7PqcVvS+7tHSU2uXi5gLpl82ZN9hA03VEnCnc5cnRc="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix index 7c1c9f361145..4c010829c6ff 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.11.0"; + version = "2.15.1"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-9RXVNzjEhdYCYWbB9/xW3rm+gSOuD6+jwAO9zJVt4fk="; + sha256 = "sha256-nYoYGHetdd3vFryFXLxuvvSUCIs6VZyPwWb8s0h+edg="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 6398f8b872d5..fdce5118e6b3 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -5,13 +5,13 @@ ffmpeg_6-full.overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0.1-2"; + version = "6.0.1-3"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-wc9OGwjcRDTDxlHYVTlbLe1B/F11z0Xcz6WRrO42zn4="; + hash = "sha256-UINiXO61nB/AL0HJJy7G7emujakk/mQv81aUioyJz0Y="; }; # Clobber upstream patches as they don't apply to the Jellyfin fork diff --git a/nixpkgs/pkgs/development/libraries/jose/default.nix b/nixpkgs/pkgs/development/libraries/jose/default.nix index 08fc7e6dc99e..795fb8244c85 100644 --- a/nixpkgs/pkgs/development/libraries/jose/default.nix +++ b/nixpkgs/pkgs/development/libraries/jose/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jose"; - version = "11"; + version = "12"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - hash = "sha256-TKcXswF50B8MS+XHSEvqHaFSAct7VdsnZ0RtZCF04Lc="; + hash = "sha256-MuYRgYskIT2rmd32gziCdiRwIWMKQ6iTx0Qm/jJI+Iw="; }; nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; diff --git a/nixpkgs/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch b/nixpkgs/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch index 3ee3198cb229..61fd56ee0880 100644 --- a/nixpkgs/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch +++ b/nixpkgs/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch @@ -1,4 +1,4 @@ -From 1cf6b108882669f1b20c18fb5f2d6dff0fc83296 Mon Sep 17 00:00:00 2001 +From eadfee17e7d3a1c1bb2a0ff8585772b40331ebd7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> Date: Sat, 24 Dec 2022 15:31:51 +0100 Subject: [PATCH 1/4] libbacktrace: avoid libtool wrapping tests @@ -21,7 +21,7 @@ https://autotools.info/libtool/wrappers.html 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am -index c53cbae..6eab991 100644 +index 3d67909..06ccf3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -107,6 +107,8 @@ check_DATA = @@ -90,7 +90,7 @@ index c53cbae..6eab991 100644 unittest_LDADD = libbacktrace.la BUILDTESTS += unittest -@@ -253,7 +263,7 @@ if HAVE_OBJCOPY_DEBUGLINK +@@ -254,7 +264,7 @@ if HAVE_OBJCOPY_DEBUGLINK b2test_SOURCES = $(btest_SOURCES) b2test_CFLAGS = $(libbacktrace_TEST_CFLAGS) @@ -99,7 +99,7 @@ index c53cbae..6eab991 100644 b2test_LDADD = libbacktrace_elf_for_test.la check_PROGRAMS += b2test -@@ -263,7 +273,7 @@ if HAVE_DWZ +@@ -264,7 +274,7 @@ if HAVE_DWZ b3test_SOURCES = $(btest_SOURCES) b3test_CFLAGS = $(libbacktrace_TEST_CFLAGS) @@ -108,7 +108,7 @@ index c53cbae..6eab991 100644 b3test_LDADD = libbacktrace_elf_for_test.la check_PROGRAMS += b3test -@@ -276,6 +286,7 @@ endif HAVE_ELF +@@ -278,6 +288,7 @@ endif HAVE_ELF btest_SOURCES = btest.c testlib.c btest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O @@ -116,7 +116,7 @@ index c53cbae..6eab991 100644 btest_LDADD = libbacktrace.la BUILDTESTS += btest -@@ -330,6 +341,7 @@ endif HAVE_DWZ +@@ -332,6 +343,7 @@ endif HAVE_DWZ stest_SOURCES = stest.c stest_CFLAGS = $(libbacktrace_TEST_CFLAGS) @@ -124,7 +124,7 @@ index c53cbae..6eab991 100644 stest_LDADD = libbacktrace.la BUILDTESTS += stest -@@ -352,6 +364,7 @@ if HAVE_ELF +@@ -354,6 +366,7 @@ if HAVE_ELF ztest_SOURCES = ztest.c testlib.c ztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" @@ -132,7 +132,7 @@ index c53cbae..6eab991 100644 ztest_LDADD = libbacktrace.la ztest_alloc_LDADD = libbacktrace_alloc.la -@@ -371,6 +384,7 @@ BUILDTESTS += ztest_alloc +@@ -373,6 +386,7 @@ BUILDTESTS += ztest_alloc zstdtest_SOURCES = zstdtest.c testlib.c zstdtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" @@ -140,7 +140,7 @@ index c53cbae..6eab991 100644 zstdtest_LDADD = libbacktrace.la zstdtest_alloc_LDADD = libbacktrace_alloc.la -@@ -392,6 +406,7 @@ endif HAVE_ELF +@@ -394,6 +408,7 @@ endif HAVE_ELF edtest_SOURCES = edtest.c edtest2_build.c testlib.c edtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) @@ -148,7 +148,7 @@ index c53cbae..6eab991 100644 edtest_LDADD = libbacktrace.la BUILDTESTS += edtest -@@ -422,6 +437,7 @@ BUILDTESTS += ttest +@@ -424,6 +439,7 @@ BUILDTESTS += ttest ttest_SOURCES = ttest.c testlib.c ttest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -pthread @@ -156,7 +156,7 @@ index c53cbae..6eab991 100644 ttest_LDADD = libbacktrace.la if USE_DSYMUTIL -@@ -460,12 +476,12 @@ if HAVE_COMPRESSED_DEBUG +@@ -472,12 +488,12 @@ if HAVE_COMPRESSED_DEBUG ctestg_SOURCES = btest.c testlib.c ctestg_CFLAGS = $(libbacktrace_TEST_CFLAGS) @@ -171,7 +171,7 @@ index c53cbae..6eab991 100644 ctesta_LDADD = libbacktrace.la BUILDTESTS += ctestg ctesta -@@ -474,7 +490,7 @@ if HAVE_COMPRESSED_DEBUG_ZSTD +@@ -486,7 +502,7 @@ if HAVE_COMPRESSED_DEBUG_ZSTD ctestzstd_SOURCES = btest.c testlib.c ctestzstd_CFLAGS = $(libbacktrace_TEST_CFLAGS) @@ -180,7 +180,7 @@ index c53cbae..6eab991 100644 ctestzstd_LDADD = libbacktrace.la BUILDTESTS += ctestzstd -@@ -521,6 +537,7 @@ endif +@@ -533,6 +549,7 @@ endif mtest_SOURCES = mtest.c testlib.c mtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O @@ -188,7 +188,7 @@ index c53cbae..6eab991 100644 mtest_LDADD = libbacktrace.la BUILDTESTS += mtest -@@ -553,6 +570,7 @@ if HAVE_ELF +@@ -565,6 +582,7 @@ if HAVE_ELF xztest_SOURCES = xztest.c testlib.c xztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" @@ -197,5 +197,5 @@ index c53cbae..6eab991 100644 xztest_alloc_SOURCES = $(xztest_SOURCES) -- -2.38.1 +2.43.1 diff --git a/nixpkgs/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch b/nixpkgs/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch index 37da7ef4d964..ee6063875091 100644 --- a/nixpkgs/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch +++ b/nixpkgs/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch @@ -1,4 +1,4 @@ -From f409ee343fe6cdc059bb411746f27a515aec66a8 Mon Sep 17 00:00:00 2001 +From 2ceaa9bc8a9a0c8a02806a92e19bd21b3fccf3a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> Date: Sat, 24 Dec 2022 16:46:18 +0100 Subject: [PATCH 2/4] libbacktrace: Allow configuring debug dir @@ -14,13 +14,13 @@ the path can be changed. The same flag is supported by gdb: https://github.com/bminor/binutils-gdb/blob/095f84c7e3cf85cd68c657c46b80be078f336bc9/gdb/configure.ac#L113-L115 --- - Makefile.am | 11 ++++++----- + Makefile.am | 13 +++++++------ configure.ac | 8 ++++++++ elf.c | 4 ++-- - 3 files changed, 16 insertions(+), 7 deletions(-) + 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 6eab991..da443c1 100644 +index 06ccf3f..6304faa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,8 @@ ACLOCAL_AMFLAGS = -I config @@ -53,7 +53,7 @@ index 6eab991..da443c1 100644 $(SED) "s%$$SEARCH%$$REPLACE%" \ $< \ > $@.tmp -@@ -468,7 +469,7 @@ endif HAVE_OBJCOPY_DEBUGLINK +@@ -474,13 +475,13 @@ endif HAVE_OBJCOPY_DEBUGLINK %_buildid: % ./install-debuginfo-for-buildid.sh \ @@ -62,8 +62,15 @@ index 6eab991..da443c1 100644 $< $(OBJCOPY) --strip-debug $< $@ + %_buildidfull: % + ./install-debuginfo-for-buildid.sh \ +- "$(TEST_BUILD_ID_DIR)" \ ++ "$(TEST_DEBUG_DIR)/.build-id" \ + $< + $(OBJCOPY) --strip-all $< $@ + diff --git a/configure.ac b/configure.ac -index 7f122cb..bb590ab 100644 +index 69304ea..aeb2ee9 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,14 @@ AM_MAINTAINER_MODE @@ -82,7 +89,7 @@ index 7f122cb..bb590ab 100644 # the wrong, non-multilib-adjusted value will be used in multilibs. # As a side effect, we have to subst CFLAGS ourselves. diff --git a/elf.c b/elf.c -index e82ecc5..8b1189c 100644 +index 3ef07bb..21fbe4f 100644 --- a/elf.c +++ b/elf.c @@ -856,7 +856,7 @@ elf_readlink (struct backtrace_state *state, const char *filename, @@ -104,5 +111,5 @@ index e82ecc5..8b1189c 100644 const char * const suffix = ".debug"; const size_t suffix_len = strlen (suffix); -- -2.38.1 +2.43.1 diff --git a/nixpkgs/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch b/nixpkgs/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch index f223217a8313..7b8f8f0f61dc 100644 --- a/nixpkgs/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch +++ b/nixpkgs/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch @@ -1,4 +1,4 @@ -From de122af5382d8017cae63bdee946206c6c6c23ab Mon Sep 17 00:00:00 2001 +From 47c3503938c863d55c835463d8815b5fa4ab8326 Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> Date: Sat, 24 Dec 2022 20:19:27 +0100 Subject: [PATCH 3/4] libbacktrace: Support multiple build id directories @@ -16,7 +16,7 @@ to debug data installed using distribution’s package manager. 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/elf.c b/elf.c -index 8b1189c..65c647a 100644 +index 21fbe4f..ccffa95 100644 --- a/elf.c +++ b/elf.c @@ -865,12 +865,12 @@ elf_readlink (struct backtrace_state *state, const char *filename, @@ -34,7 +34,7 @@ index 8b1189c..65c647a 100644 const size_t prefix_len = strlen (prefix); const char * const suffix = ".debug"; const size_t suffix_len = strlen (suffix); -@@ -6936,27 +6936,42 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, +@@ -6947,27 +6947,42 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, if (buildid_data != NULL) { int d; @@ -53,9 +53,9 @@ index 8b1189c..65c647a 100644 - elf_release_view (state, &debuglink_view, error_callback, data); - if (debugaltlink_view_valid) - elf_release_view (state, &debugaltlink_view, error_callback, data); -- ret = elf_add (state, "", d, NULL, 0, base_address, error_callback, -- data, fileline_fn, found_sym, found_dwarf, NULL, 0, -- 1, NULL, 0); +- ret = elf_add (state, "", d, NULL, 0, base_address, opd, +- error_callback, data, fileline_fn, found_sym, +- found_dwarf, NULL, 0, 1, NULL, 0); - if (ret < 0) - backtrace_close (d, error_callback, data); - else if (descriptor >= 0) @@ -81,9 +81,9 @@ index 8b1189c..65c647a 100644 + elf_release_view (state, &debuglink_view, error_callback, data); + if (debugaltlink_view_valid) + elf_release_view (state, &debugaltlink_view, error_callback, data); -+ ret = elf_add (state, "", d, NULL, 0, base_address, error_callback, -+ data, fileline_fn, found_sym, found_dwarf, NULL, 0, -+ 1, NULL, 0); ++ ret = elf_add (state, "", d, NULL, 0, base_address, opd, ++ error_callback, data, fileline_fn, found_sym, ++ found_dwarf, NULL, 0, 1, NULL, 0); + if (ret < 0) + backtrace_close (d, error_callback, data); + else if (descriptor >= 0) @@ -97,5 +97,5 @@ index 8b1189c..65c647a 100644 if (buildid_view_valid) -- -2.38.1 +2.43.1 diff --git a/nixpkgs/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch b/nixpkgs/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch index 9abbbedb9eaa..2da495e95521 100644 --- a/nixpkgs/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch +++ b/nixpkgs/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch @@ -1,4 +1,4 @@ -From a3b7510e4c9e7201a4301f2a45d8569b06354607 Mon Sep 17 00:00:00 2001 +From 884ef7c843be906d62e4240c2a0e885dcd5a5726 Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> Date: Sat, 24 Dec 2022 20:30:22 +0100 Subject: [PATCH 4/4] libbacktrace: Support NIX_DEBUG_INFO_DIRS environment @@ -13,10 +13,10 @@ Let’s make debug data lookup work on NixOS just like in gdb. 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/elf.c b/elf.c -index 65c647a..5c8abc0 100644 +index ccffa95..e86950d 100644 --- a/elf.c +++ b/elf.c -@@ -6935,11 +6935,18 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, +@@ -6946,11 +6946,18 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor, if (buildid_data != NULL) { @@ -38,5 +38,5 @@ index 65c647a..5c8abc0 100644 debug_dir = strtok (debug_directories, ":"); while (debug_dir != NULL) -- -2.38.1 +2.43.1 diff --git a/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix b/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix index 288185f92281..32c199a57c4e 100644 --- a/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbacktrace/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "libbacktrace"; - version = "unstable-2023-11-30"; + version = "0-unstable-2024-03-02"; src = fetchFromGitHub { owner = "ianlancetaylor"; repo = "libbacktrace"; - rev = "14818b7783eeb9a56c3f0fca78cefd3143f8c5f6"; - sha256 = "DQZQsqzeQ/0v87bfqs6sXqS2M5Tunc1OydTWRSB3PCw="; + rev = "28824f2cc9069e3fdc39d3702acdf753e35c41b4"; + sha256 = "1k1O1GT22hZAWPF8NYP0y4qe+e3pGfzT9Mz2TH+H/v4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libbap/default.nix b/nixpkgs/pkgs/development/libraries/libbap/default.nix index ebbf02603cbb..3ed92edd78e1 100644 --- a/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, ctypes-foreign, autoreconfHook, which }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; - buildInputs = [ bap ctypes ]; + buildInputs = [ bap ctypes ctypes-foreign ]; preInstall = '' mkdir -p $out/lib diff --git a/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/nixpkgs/pkgs/development/libraries/libcbor/default.nix index 43a73d374ea5..349f4589172a 100644 --- a/nixpkgs/pkgs/development/libraries/libcbor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcbor/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , cmocka @@ -14,28 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "PJK"; repo = "libcbor"; rev = "v${finalAttrs.version}"; - hash = "sha256-eE11hYPsOKqfoX8fx/oYfOAichhUe4mMpNQNVZ6vAUI="; + hash = "sha256-N1xYkZw/6lX/nX/TE6/pVuEFgSyDiUJ50msK42NrKwI="; }; outputs = [ "out" "dev" ]; - patches = [ - # Pull fix pending upstream inclusion to support - # `CMAKE_INSTALL_INCLUDEDIR`: - # https://github.com/PJK/libcbor/pull/297 - (fetchpatch { - name = "includedir.patch"; - url = "https://github.com/PJK/libcbor/commit/d00a63e6d6858a2ed6be9b431b42799ed2c99ad8.patch"; - hash = "sha256-kBCSbAHOCGOs/4Yu6Vh0jcmzA/jYPkkPXPGPrptRfyk="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libcifpp/default.nix b/nixpkgs/pkgs/development/libraries/libcifpp/default.nix index 2ec4a6da2ce6..782844453a12 100644 --- a/nixpkgs/pkgs/development/libraries/libcifpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcifpp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "7.0.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-nOKekN3re2Gg7h2RAJ6yRZMfEEk65N2zvb9NafRCVbE="; + hash = "sha256-13jJH7YFlnb9hltCo/3kygPkXoE3ZZwZkG/ezbOxE2w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libdatovka/default.nix b/nixpkgs/pkgs/development/libraries/libdatovka/default.nix index 99fce98b1926..7d6896efa639 100644 --- a/nixpkgs/pkgs/development/libraries/libdatovka/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdatovka/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libdatovka"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; - sha256 = "sha256-+n2gKEi0TyTl/zEdJYpX1oPfGSftk6TzVjbVOuIMU3Q="; + sha256 = "sha256-4JFPlEpSFv5t3p/NGq0cfn+neJj2M0BNWWd6nlCjHE0="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch b/nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch deleted file mode 100644 index 33bd39ed61e5..000000000000 --- a/nixpkgs/pkgs/development/libraries/libedit/01-cygwin.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libedit-20120311-3.0/src/chartype.h 2012-03-11 10:54:58.000000000 +0100 -+++ libedit-20120311-3.0/src/chartype.h 2012-05-03 19:00:20.651847423 +0200 -@@ -56,9 +56,11 @@ - /* Oh for a <uchar.h> with char32_t and __STDC_UTF_32__ in it... - * ref: ISO/IEC DTR 19769 - */ -+#ifndef __CYGWIN__ - #if WCHAR_MAX < INT32_MAX - #warning Build environment does not support non-BMP characters - #endif -+#endif - - #ifndef HAVE_WCSDUP - wchar_t *wcsdup(const wchar_t *s); ---- libedit-20120311-3.0/src/editline/readline.h 2011-02-26 23:42:59.000000000 +0100 -+++ libedit-20120311-3.0/src/editline/readline.h 2012-05-03 19:00:49.211244803 +0200 -@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap; - - #ifndef CTRL - #include <sys/ioctl.h> --#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) -+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__CYGWIN__) - #include <sys/ttydefaults.h> - #endif - #ifndef CTRL diff --git a/nixpkgs/pkgs/development/libraries/libedit/default.nix b/nixpkgs/pkgs/development/libraries/libedit/default.nix deleted file mode 100644 index 97636e36e848..000000000000 --- a/nixpkgs/pkgs/development/libraries/libedit/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - pname = "libedit"; - version = "20230828-3.1"; - - src = fetchurl { - url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; - sha256 = "sha256-TugYK25WkpDn0fRPD3jayHFrNfZWt2Uo9pnGnJiBTa0="; - }; - - outputs = [ "out" "dev" ]; - - # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - # NROFF = "${groff}/bin/nroff"; - - # GCC automatically include `stdc-predefs.h` while Clang does not do - # this by default. While Musl is ISO 10646 compliant, doesn't define - # __STDC_ISO_10646__. This definition is in `stdc-predefs.h` that's - # why libedit builds just fine with GCC and Musl. - # There is a DR to fix this issue with Clang which is not merged - # yet. - # https://reviews.llvm.org/D137043 - env.NIX_CFLAGS_COMPILE = - lib.optionalString (stdenv.targetPlatform.isMusl && stdenv.cc.isClang) - "-D__STDC_ISO_10646__=201103L"; - - patches = [ ./01-cygwin.patch ]; - - propagatedBuildInputs = [ ncurses ]; - - postInstall = '' - find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \ - -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g' - ''; - - meta = with lib; { - homepage = "http://www.thrysoee.dk/editline/"; - description = "A port of the NetBSD Editline library (libedit)"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/libffi/default.nix b/nixpkgs/pkgs/development/libraries/libffi/default.nix index ac910dc3d649..edd16ec21506 100644 --- a/nixpkgs/pkgs/development/libraries/libffi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libffi/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libffi"; - version = "3.4.4"; + version = "3.4.6"; src = fetchurl { url = with finalAttrs; "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1mxWrSWags8qnfxAizK/XaUjcVALhHRff7i2RXEt9nY="; + hash = "sha256-sN6p3yPIY6elDoJUQPPr/6vWXfFJcQjl1Dd0eEOJWk4="; }; # Note: this package is used for bootstrapping fetchurl, and thus @@ -23,9 +23,6 @@ stdenv.mkDerivation (finalAttrs: { # cgit) that are needed here should be included directly in Nixpkgs as # files. patches = [ - # Fix implicit function declarations (clang-16 build failure): - # https://github.com/libffi/libffi/pull/764 - ./fix-implicit-fun-decl.patch ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch b/nixpkgs/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch deleted file mode 100644 index c0bd32d4333c..000000000000 --- a/nixpkgs/pkgs/development/libraries/libffi/fix-implicit-fun-decl.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/libffi/libffi/commit/ce077e5565366171aa1b4438749b0922fce887a4.patch - -From ce077e5565366171aa1b4438749b0922fce887a4 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille <serge.guelton@telecom-bretagne.eu> -Date: Thu, 2 Feb 2023 14:46:29 +0000 -Subject: [PATCH] Forward declare open_temp_exec_file (#764) - -It's defined in closures.c and used in tramp.c. -Also declare it as an hidden symbol, as it should be. - -Co-authored-by: serge-sans-paille <sguelton@mozilla.com> ---- - include/ffi_common.h | 4 ++++ - src/tramp.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/include/ffi_common.h b/include/ffi_common.h -index 2bd31b03d..c53a79493 100644 ---- a/include/ffi_common.h -+++ b/include/ffi_common.h -@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; - static trampoline. */ - int ffi_tramp_is_present (void *closure) FFI_HIDDEN; - -+/* Return a file descriptor of a temporary zero-sized file in a -+ writable and executable filesystem. */ -+int open_temp_exec_file(void) FFI_HIDDEN; -+ - /* Extended cif, used in callback from assembly routine */ - typedef struct - { -diff --git a/src/tramp.c b/src/tramp.c -index 7e005b054..5f19b557f 100644 ---- a/src/tramp.c -+++ b/src/tramp.c -@@ -39,6 +39,10 @@ - #ifdef __linux__ - #define _GNU_SOURCE 1 - #endif -+ -+#include <ffi.h> -+#include <ffi_common.h> -+ - #include <stdio.h> - #include <unistd.h> - #include <stdlib.h> diff --git a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 99a3351d56ee..7e90a05fb5b0 100644 --- a/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.45.0"; + version = "0.46.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-PBRUvBWG0Xd29ix1BdQ6BtOr0uLjVkLMpHf6IvJ9mC8="; + hash = "sha256-OHr1xNSENIKl+/GD0B3ZYZtLha+g1olcXuyzpgEvrCE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libgig/default.nix b/nixpkgs/pkgs/development/libraries/libgig/default.nix index 48d45797096b..fcc44025400c 100644 --- a/nixpkgs/pkgs/development/libraries/libgig/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgig"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ZwQMrK8da12lFz7UAY2i+eW3rzPFhngdUfeV3hW65iI="; + sha256 = "sha256-/cie+rH5BhKObFRymWdXfo0EYgFwGLwSVRJX313+OqQ="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/nixpkgs/pkgs/development/libraries/libgsf/default.nix index eec93fa11169..bd3ece423599 100644 --- a/nixpkgs/pkgs/development/libraries/libgsf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgsf/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.51"; + version = "1.14.52"; outputs = [ "out" "dev" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libgsf"; rev = "LIBGSF_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-iJcfR+iy1bbRkh+yCAEhY5ks8V6vXIPH7namZSvP98c="; + hash = "sha256-uSi2/pZiST07YutU8SHNoY2LifEQhohQeyaH9spyG2s="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libheif/default.nix b/nixpkgs/pkgs/development/libraries/libheif/default.nix index d14df84d3483..cdff03fc09ae 100644 --- a/nixpkgs/pkgs/development/libraries/libheif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libheif/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook +, cmake , pkg-config , dav1d , rav1e @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.15.2"; + version = "1.17.6"; outputs = [ "bin" "out" "dev" "man" ]; @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "sha256-VbMBZ17leGezng2FYKgiSq04Se0PT0a3WqjM6xZ3zS4="; + sha256 = "sha256-pp+PjV/pfExLqzFE61mxliOtVAYOePh1+i1pwZxDLAM="; }; nativeBuildInputs = [ - autoreconfHook pkg-config + cmake ]; buildInputs = [ @@ -49,11 +49,15 @@ stdenv.mkDerivation rec { gdk-pixbuf ]; - enableParallelBuilding = true; - # Fix installation path for gdk-pixbuf module PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}"; + # Wrong include path in .cmake. It's a bit difficult to patch because of special characters. + postFixup = '' + sed '/^ INTERFACE_INCLUDE_DIRECTORIES/s|"[^"]*/include"|"${placeholder "dev"}/include"|' \ + -i "$dev"/lib/cmake/libheif/libheif-config.cmake + ''; + passthru.tests = { inherit gimp imagemagick imlib2Full imv vips; }; diff --git a/nixpkgs/pkgs/development/libraries/libidn/default.nix b/nixpkgs/pkgs/development/libraries/libidn/default.nix index da37ef781b35..59cacfc4466e 100644 --- a/nixpkgs/pkgs/development/libraries/libidn/default.nix +++ b/nixpkgs/pkgs/development/libraries/libidn/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { included. ''; + mainProgram = "idn"; license = lib.licenses.lgpl2Plus; pkgConfigModules = [ "libidn" ]; platforms = lib.platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/nixpkgs/pkgs/development/libraries/libidn2/default.nix index 8fcbe42650fc..bfe9c2a24264 100644 --- a/nixpkgs/pkgs/development/libraries/libidn2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libidn2/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { detailed information. ''; + mainProgram = "idn2"; license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ fpletz ]; diff --git a/nixpkgs/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix b/nixpkgs/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix index e5922073437d..216beb5c48bd 100644 --- a/nixpkgs/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix +++ b/nixpkgs/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix @@ -8,6 +8,7 @@ runCommandLocal passthru = { inherit (libidn2) out info devdoc; # no need to touch these store paths }; + inherit (libidn2) meta; } '' cp -r '${libidn2.bin}' "$bin" diff --git a/nixpkgs/pkgs/development/libraries/libime/default.nix b/nixpkgs/pkgs/development/libraries/libime/default.nix index 5f914485993a..ff9301eb9caf 100644 --- a/nixpkgs/pkgs/development/libraries/libime/default.nix +++ b/nixpkgs/pkgs/development/libraries/libime/default.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - hash = "sha256-AvlQOpjrHSifUtWSTft2bywlWhwka26VcqqReqAlcv8="; + hash = "sha256-PhzJtAGmSkMeXMSe2uR/JKHKlZtL0e3tPDZVoRCvAis="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/libjwt/default.nix b/nixpkgs/pkgs/development/libraries/libjwt/default.nix index 4d2c11601135..3d26d6a090c6 100644 --- a/nixpkgs/pkgs/development/libraries/libjwt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "sha256-5hbmEen31lB6Xdv5WU+8InKa0+1OsuB8QG0jVa1+a2w="; + sha256 = "sha256-ZMmXn/vKARz9Erg3XS2YICSq5u38NZFMDAafXXzE1Ss="; }; buildInputs = [ jansson openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 94acb13205b5..ee81e63ba5e4 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "23.11"; + version = "24.01"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-GX5U/MeePA1d9EqPWNxOAYvC+F0T+jvtVK89xW1ehT0="; + hash = "sha256-oC38Zon0hc7Ab6EqNBTDw6ooU7Td4YrqtLVKVsgxYlk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.77.nix b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.77.nix new file mode 100644 index 000000000000..189b691e0b60 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmicrohttpd/0.9.77.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.77"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + hash = "sha256-nnAjoVESAGDSgGpupME8qZM+zk6s/FyUZNIO3dt2sKA="; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/libnabo/default.nix b/nixpkgs/pkgs/development/libraries/libnabo/default.nix index af5e78c25d66..c6268ea3ee7e 100644 --- a/nixpkgs/pkgs/development/libraries/libnabo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnabo/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, cmake, eigen, boost}: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.1.0"; pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; repo = "libnabo"; rev = version; - sha256 = "17vxlmszzpm95vvfdxnm98d5p297i10fyblblj6kf0ynq8r2mpsh"; + sha256 = "sha256-KWqNJWdyFFe5zAs1HzGnIshGXkBAKjnbEmBZXxty99E="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libnats-c/default.nix b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix index e0ee93c16286..35aff3d5deef 100644 --- a/nixpkgs/pkgs/development/libraries/libnats-c/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-BIEe3DhPqyK+vAAk/6x8Ui+4t+IUyvtHf5Lk2AZVuC8="; + sha256 = "sha256-fIm5RBX6m0zSeq2WvpIEi2+ibpnyqsFkeP0T9NS+sOw="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix index e960c8d1bf48..c424879a8191 100644 --- a/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + hardeningDisable = [ "trivialautovarinit" ]; + buildInputs = [ libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libqaccessibilityclient/default.nix b/nixpkgs/pkgs/development/libraries/libqaccessibilityclient/default.nix index e05400114d06..0d518a48308d 100644 --- a/nixpkgs/pkgs/development/libraries/libqaccessibilityclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqaccessibilityclient/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqaccessibilityclient"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-${version}.tar.xz"; - hash = "sha256-cEdyVDo7AFuUBhpT6vn51klE5oGLBMWcD7ClA8gaxKA="; + hash = "sha256-TFDESGItycUEHtENp9h7Pk5xzLSdSDGoSSEdQjxfXTM="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/development/libraries/libre/default.nix b/nixpkgs/pkgs/development/libraries/libre/default.nix index 92749a35e93a..ace7d5f5f786 100644 --- a/nixpkgs/pkgs/development/libraries/libre/default.nix +++ b/nixpkgs/pkgs/development/libraries/libre/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - version = "3.9.0"; + version = "3.10.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-oFaCeVaUrAN83DT8m4gvXSaKzxq5AJw2RHwOelm8HAU="; + sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libremidi/default.nix b/nixpkgs/pkgs/development/libraries/libremidi/default.nix index 3fad374e87be..4c19375a07f1 100644 --- a/nixpkgs/pkgs/development/libraries/libremidi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libremidi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libremidi"; - version = "4.2.4"; + version = "4.4.0"; src = fetchFromGitHub { owner = "jcelerier"; repo = "libremidi"; rev = "v${version}"; - hash = "sha256-AWONCZa4tVZ7HMze9WSVzHQUXIrn1i6ZZ4Hgufkrep8="; + hash = "sha256-raVBJ75/UmM3P69s8VNUXRE/2jV4WqPIfI4eXaf6UEg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 3c5b5c489c07..514b8c05177b 100644 --- a/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.21.3"; + version = "0.21.4"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-mj4lcfEEgDXYAjj1LIdgEliEpDuvilgP7bclDBrQqec="; + hash = "sha256-Fj0I14O+bUq5qXnOtaT+y8HZZg08NBaMWBMBzVORKyA="; }; depsBuildBuild = [ diff --git a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 83c84fac602b..75f365ddcb38 100644 --- a/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.9"; + version = "2.0.10"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "sha256-kUpeofullQ70uK/YZUD0ikHCquFTGwev7MxBYj0oHeU="; + sha256 = "sha256-JrAYtoS8wNmmhbgnprD7vNz1N64ekIryjK77rAKTyaQ="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/libunibreak/default.nix b/nixpkgs/pkgs/development/libraries/libunibreak/default.nix index f740bd82bb73..557ad37f23d2 100644 --- a/nixpkgs/pkgs/development/libraries/libunibreak/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunibreak/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libunibreak"; - version = "5.1"; + version = "6.1"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "sha256-hjgT5DCQ6KFXKlxk9LLzxGHz6B71X/3Ot7ipK3KY85A="; + sha256 = "sha256-8yheb+XSvc1AqITjSutF+/4OWb4+7hweedKzhKJcE1Y="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/libraries/litehtml/default.nix b/nixpkgs/pkgs/development/libraries/litehtml/default.nix index 3927f7cce4a5..b1864f6497a9 100644 --- a/nixpkgs/pkgs/development/libraries/litehtml/default.nix +++ b/nixpkgs/pkgs/development/libraries/litehtml/default.nix @@ -5,14 +5,14 @@ , gumbo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "litehtml"; version = "0.6"; src = fetchFromGitHub { owner = "litehtml"; repo = "litehtml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix b/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix index 4fc1573eea1a..c8b4dec313be 100644 --- a/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/lmdbxx/default.nix @@ -2,14 +2,14 @@ , fetchFromGitHub , lmdb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lmdbxx"; version = "1.0.0"; src = fetchFromGitHub { owner = "hoytech"; repo = "lmdbxx"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo="; }; @@ -22,5 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ fgaz ]; }; -} - +}) diff --git a/nixpkgs/pkgs/development/libraries/mesa/backport-radeon-crash-fix.patch b/nixpkgs/pkgs/development/libraries/mesa/backport-radeon-crash-fix.patch new file mode 100644 index 000000000000..62915abcf242 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/mesa/backport-radeon-crash-fix.patch @@ -0,0 +1,13 @@ +diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +index 2e1d9c488e2..7979cad75fa 100644 +--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c ++++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +@@ -729,7 +729,7 @@ bool radeon_bo_can_reclaim_slab(void *priv, struct pb_slab_entry *entry) + { + struct radeon_bo *bo = container_of(entry, struct radeon_bo, u.slab.entry); + +- return radeon_bo_can_reclaim(NULL, &bo->base); ++ return radeon_bo_can_reclaim(priv, &bo->base); + } + + static void radeon_bo_slab_destroy(void *winsys, struct pb_buffer_lean *_buf) diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index dff2f0021d46..a40f5c6b15e4 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -3,7 +3,7 @@ , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau +, elfutils, libvdpau , libglvnd, libunwind, lm_sensors , vulkan-loader, glslang , galliumDrivers ? @@ -81,8 +81,8 @@ # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "24.0.1"; - hash = "sha256-84cZKwjEccVFWQ3RIjCio0MkSAS1/oZv7GrqAuq1dhM="; + version = "24.0.2"; + hash = "sha256-lOKKjtrQbY7SuD61PyU7nrWqYsMID5OXAuGzA5tWyeg="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -141,6 +141,11 @@ self = stdenv.mkDerivation { patches = [ ./opencl.patch + + # Backport crash fix for Radeon (legacy) kernel driver + # see https://gitlab.freedesktop.org/mesa/mesa/-/issues/10613 + # FIXME: remove when merged upstream + ./backport-radeon-crash-fix.patch ]; postPatch = '' @@ -241,7 +246,7 @@ self = stdenv.mkDerivation { buildInputs = with xorg; [ expat glslang llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr - libffi libvdpau libelf libXvMC + libffi libvdpau libXvMC libpthreadstubs openssl zstd ] ++ lib.optionals withLibunwind [ @@ -249,7 +254,7 @@ self = stdenv.mkDerivation { ] ++ [ python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] + ++ lib.optionals stdenv.isLinux [ elfutils libomxil-bellagio libva-minimal udev lm_sensors ] ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator ] ++ lib.optional withValgrind valgrind-light ++ lib.optional haveZink vulkan-loader diff --git a/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/nixpkgs/pkgs/development/libraries/mongoc/default.nix index 85b41061228e..576c2e7a9ed4 100644 --- a/nixpkgs/pkgs/development/libraries/mongoc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-uXHCd7KDnx3n6KO0opoITpf8LtUS67bc94tPHioeb4o="; + hash = "sha256-LUtKOAlQVpN5Y+mHsNTlgDSeCjodG4RDleO1eXzTdMg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/nng/default.nix b/nixpkgs/pkgs/development/libraries/nng/default.nix index e6b851817eff..34f0aee7d707 100644 --- a/nixpkgs/pkgs/development/libraries/nng/default.nix +++ b/nixpkgs/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-CG6Gw/Qrbi96koF2VxKMYPMPT2Zj9U97vNk2JdrfRro="; + hash = "sha256-oP7hO3wCXNPW7877wK+HpGsw7j+U0q4i8aTRVi1v0r0="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/nixpkgs/pkgs/development/libraries/nv-codec-headers/10_x.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/10_x.nix deleted file mode 100644 index b1fe1611301f..000000000000 --- a/nixpkgs/pkgs/development/libraries/nv-codec-headers/10_x.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchgit }: - -stdenv.mkDerivation rec { - pname = "nv-codec-headers"; - version = "10.0.26.2"; - - src = fetchgit { - url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; - rev = "n${version}"; - sha256 = "0n5jlwjfv5irx1if1g0n52m279bw7ab6bd3jz2v4vwg9cdzbxx85"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "FFmpeg version of headers for NVENC"; - homepage = "https://ffmpeg.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.MP2E ]; - platforms = lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/nv-codec-headers/11_x.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/11_x.nix deleted file mode 100644 index fba333ff6dbe..000000000000 --- a/nixpkgs/pkgs/development/libraries/nv-codec-headers/11_x.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv -, lib -, fetchgit -}: - -stdenv.mkDerivation rec { - pname = "nv-codec-headers"; - version = "11.1.5.2"; - - src = fetchgit { - url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; - rev = "n${version}"; - sha256 = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk="; - }; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - meta = with lib; { - description = "FFmpeg version of headers for NVENC"; - homepage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; - license = licenses.mit; - maintainers = with maintainers; [ MP2E ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix deleted file mode 100644 index dcbb34e33cdb..000000000000 --- a/nixpkgs/pkgs/development/libraries/nv-codec-headers/12_x.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv -, lib -, fetchgit -}: - -stdenv.mkDerivation rec { - pname = "nv-codec-headers"; - version = "12.1.14.0"; - - src = fetchgit { - url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; - rev = "n${version}"; - sha256 = "sha256-WJYuFmMGSW+B32LwE7oXv/IeTln6TNEeXSkquHh85Go="; - }; - - makeFlags = [ - "PREFIX=$(out)" - ]; - - meta = with lib; { - description = "FFmpeg version of headers for NVENC"; - homepage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; - license = licenses.mit; - maintainers = with maintainers; [ MP2E ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix index 9b8323e6c978..b582548d79f5 100644 --- a/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/nv-codec-headers/default.nix @@ -1,22 +1,32 @@ -{ lib, stdenv, fetchgit }: +{ lib +, fetchgit +, stdenvNoCC +}: -stdenv.mkDerivation rec { - pname = "nv-codec-headers"; - version = "9.1.23.1"; - - src = fetchgit { - url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; - rev = "n${version}"; - sha256 = "1xfvb3mhz6wfx9c732888xa82ivaig903lhvvrqqzs31qfznsplh"; +let + make-nv-codec-headers = (import ./make-nv-codec-headers.nix) { + inherit lib fetchgit stdenvNoCC; }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "FFmpeg version of headers for NVENC"; - homepage = "https://ffmpeg.org/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.MP2E ]; - platforms = lib.platforms.all; +in +{ + nv-codec-headers-8 = make-nv-codec-headers { + version = "8.2.15.2"; + hash = "sha256-TKYT8vXqnUpq+M0grDeOR37n/ffqSWDYTrXIbl++BG4="; + }; + nv-codec-headers-9 = make-nv-codec-headers { + version = "9.1.23.1"; + hash = "sha256-kF5tv8Nh6I9x3hvSAdKLakeBVEcIiXFY6o6bD+tY2/U="; + }; + nv-codec-headers-10 = make-nv-codec-headers { + version = "10.0.26.2"; + hash = "sha256-BfW+fmPp8U22+HK0ZZY6fKUjqigWvOBi6DmW7SSnslg="; + }; + nv-codec-headers-11 = make-nv-codec-headers { + version = "11.1.5.2"; + hash = "sha256-KzaqwpzISHB7tSTruynEOJmSlJnAFK2h7/cRI/zkNPk="; + }; + nv-codec-headers-12 = make-nv-codec-headers { + version = "12.1.14.0"; + hash = "sha256-WJYuFmMGSW+B32LwE7oXv/IeTln6TNEeXSkquHh85Go="; }; } diff --git a/nixpkgs/pkgs/development/libraries/nv-codec-headers/make-nv-codec-headers.nix b/nixpkgs/pkgs/development/libraries/nv-codec-headers/make-nv-codec-headers.nix new file mode 100644 index 000000000000..b6bdc6dd58d7 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nv-codec-headers/make-nv-codec-headers.nix @@ -0,0 +1,32 @@ +{ lib +, stdenvNoCC +, fetchgit +}: + +{ pname ? "nv-codec-headers" +, version +, hash +}: + +stdenvNoCC.mkDerivation { + inherit pname version; + + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + inherit hash; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = { + description = "FFmpeg version of headers for NVENC"; + homepage = "https://ffmpeg.org/"; + downloadPage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 2518cecb9b6c..44ff2ee1f88a 100644 --- a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.3.1"; + version = "3.4"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-br2ssI4MRk9O6u+5voBmxBZtmTFPKoJJe3ZEN2blq7Y="; + hash = "sha256-uV/Skp//tGy/hZBeN2NCbectlSoaz+H0ukYQd2j1lC4="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index f804dcdc1d4b..4ece5feea365 100644 --- a/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix @@ -187,8 +187,8 @@ effectiveStdenv.mkDerivation rec { ] ++ lib.optionals pythonSupport [ "-Donnxruntime_ENABLE_PYTHON=ON" ] ++ lib.optionals cudaSupport [ - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" cutlass) - (lib.cmakeFeature "onnxruntime_CUDNN_HOME" cudaPackages.cudnn) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") + (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) ]; diff --git a/nixpkgs/pkgs/development/libraries/opencollada/default.nix b/nixpkgs/pkgs/development/libraries/opencollada/default.nix index 340b1299e832..d822050c08a2 100644 --- a/nixpkgs/pkgs/development/libraries/opencollada/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencollada/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { }; patches = [ + ./pcre.patch + # fix build with gcc 13 (fetchurl { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b"; @@ -27,7 +29,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 pcre ]; postPatch = '' - patch -p1 < ${./pcre.patch} + # Drop blanket -Werror as it tends to fail on newer toolchain for + # minor warnings. In this case it was gcc-13 build failure. + substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"' '' + lib.optionalString stdenv.isDarwin '' substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ --replace math.h cmath diff --git a/nixpkgs/pkgs/development/libraries/opencomposite/default.nix b/nixpkgs/pkgs/development/libraries/opencomposite/default.nix index 935e59a53a41..fc1b6e631964 100644 --- a/nixpkgs/pkgs/development/libraries/opencomposite/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencomposite/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "unstable-2024-02-05"; + version = "unstable-2024-02-16"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "c1649b0e4f3c4f51c12904c0b818263006d56f00"; - hash = "sha256-K8Vtd60cKmhEKMBrlNZxoC73m1BY0014ejJM2mWkwsA="; + rev = "737bbedd29343bc2f808804e2b24302390a07655"; + hash = "sha256-azb7T0d0YMQRc0Slq1tzNj6bOmCzfHW3ciY9lN+RTao="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/openjpeg/default.nix b/nixpkgs/pkgs/development/libraries/openjpeg/default.nix index d528e2fc0302..12b05df234d8 100644 --- a/nixpkgs/pkgs/development/libraries/openjpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/openjpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server @@ -12,32 +12,17 @@ in stdenv.mkDerivation rec { pname = "openjpeg"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "uclouvain"; repo = "openjpeg"; rev = "v${version}"; - sha256 = "sha256-/0o3Fl6/jx5zu854TCqMyOz/8mnEyEC9lpZ6ij/tbHc="; + hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw="; }; outputs = [ "out" "dev" ]; - patches = [ - # modernise cmake files, also fixes them for multiple outputs - # https://github.com/uclouvain/openjpeg/pull/1424 - (fetchpatch { - name = "uclouvain-openjpeg-pull-1424.patch"; - url = "https://github.com/uclouvain/openjpeg/compare/52927287402a9f7353de8854c88f931051211e2f...9d4f70cfe99626f82f9c8dcbf45f07709e3511b2.patch"; - sha256 = "sha256-CxVRt1u4HVOMUjWiZ2plmZC29t/zshCpSY+N4Wlrlvg="; - }) - # fix cmake files cross compilation - (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/commit/c6ceb84c221b5094f1e8a4c0c247dee3fb5074e8.patch"; - sha256 = "sha256-gBUtmO/7RwSWEl7rc8HGr8gNtvNFdhjEwm0Dd51p5O8="; - }) - ]; - cmakeFlags = [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" "-DBUILD_SHARED_LIBS=ON" diff --git a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 3c739d30d386..c89baab7936b 100644 --- a/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.33"; + version = "1.0.34"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-26CRpxiTfZOq6sQSl0H53UmYzPY/6mP33EPObdkwnQs="; + sha256 = "sha256-AzqGNFJozmtivj+gXYHPZX2iYginQ2gXbLCImhMH9Jc="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/partio/default.nix b/nixpkgs/pkgs/development/libraries/partio/default.nix index 472478e37100..75817ff568f7 100644 --- a/nixpkgs/pkgs/development/libraries/partio/default.nix +++ b/nixpkgs/pkgs/development/libraries/partio/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "partio"; - version = "1.17.1"; + version = "1.17.3"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; rev = "refs/tags/v${version}"; - hash = "sha256-3t3y3r4R/ePw2QE747rqumbrYRm1wNkSKN3n8MPPIVg="; + hash = "sha256-wV9byR85qwOkoTyLjG0gOLC3Gc19ykwiLpDy4T/MENQ="; }; outputs = [ "dev" "out" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/pcre2/default.nix b/nixpkgs/pkgs/development/libraries/pcre2/default.nix index 2113b52047d6..4d1c256e301b 100644 --- a/nixpkgs/pkgs/development/libraries/pcre2/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcre2/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.42"; + version = "10.43"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-jTbNjLbqKkwrs1j/ZBGwx4hjOipF2rvxrrS3AdG16EA="; + hash = "sha256-4qU5hP8LB9/bWuRIa7ubIcyo598kNAlsyb8bcow1C8s="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/poppler/default.nix b/nixpkgs/pkgs/development/libraries/poppler/default.nix index 3a37fcb87e6b..6e22ec349d5f 100644 --- a/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "24.01.0"; # beware: updates often break cups-filters build, check scribus too! + version = "24.02.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-x972k6ekkoMPSdSXqAzGuchctXsV6b4tLWFRU7ecrgg="; + hash = "sha256-GRh6P90F8z59YExHmcGD3lygEYZAyIs3DdzzE2NDIi4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/proj/default.nix b/nixpkgs/pkgs/development/libraries/proj/default.nix index 326f219cddda..daab5ac2a566 100644 --- a/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.3.1"; + version = "9.4.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ="; + hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/py3c/default.nix b/nixpkgs/pkgs/development/libraries/py3c/default.nix index f4d2aa95a2e8..11ccba4c9ee3 100644 --- a/nixpkgs/pkgs/development/libraries/py3c/default.nix +++ b/nixpkgs/pkgs/development/libraries/py3c/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/encukou/py3c"; description = "Python 2/3 compatibility layer for C extensions"; license = licenses.mit; - maintainers = with maintainers; [ ajs124 dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 9c5d347d110b..bd05954ddb35 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison, flex, gdb, gperf, perl, pkg-config, python38, ruby +, bison, flex, gdb, gperf, perl, pkg-config, python3, ruby , ICU, OpenGL }: @@ -26,7 +26,7 @@ qtModule { ++ 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 ]; - nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python38 ruby cmake ]; + nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python3 ruby cmake ]; cmakeFlags = [ "-DPORT=Qt" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix index eb85f9d606cc..addcd53aea81 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/qtModule.nix @@ -31,12 +31,15 @@ stdenv.mkDerivation (args // { outputs = args.outputs or [ "out" "dev" ]; dontWrapQtApps = args.dontWrapQtApps or true; - - meta = with lib; { +}) // { + meta = with lib; let + pos = builtins.unsafeGetAttrPos "pname" args; + in { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao ]; platforms = platforms.unix; + position = "${pos.file}:${toString pos.line}"; } // (args.meta or { }); -}) +} diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 797e9fb891b6..8d385afc148d 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.13.4"; + version = "6.13.5"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-AlDPu2mD2OrjBq3tUxQBAoqD32L9MiSjcUNGWzpj/xc="; + hash = "sha256-ZPfyJAQHtE5ae/X9f8s/69UNiB4CnyACPLvYp8RgpKg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/quarto/default.nix b/nixpkgs/pkgs/development/libraries/quarto/default.nix index c9223aef6550..c61bb41e4484 100644 --- a/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.550"; + version = "1.4.551"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-cWHd7ZWGBdRTaSHYVa8LuTDA5gefJ5baOGERS2g6Vvg="; + sha256 = "sha256-RUnlLjJOf8hSj7aRCrmDSXFeNHCXnMY/bdbE3fbbThQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix index f24da2c899f1..1544eff83621 100644 --- a/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { - owner = "maxbachmann"; + owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-N9yGOxlk1+wgRXWLbDIXWQz+/pwbnYVs3ub4/16Nzws="; + hash = "sha256-v/apbqRyv93PZsO397lvyIMtA1JtYrOpbWAVAbMCmP4="; }; nativeBuildInputs = [ @@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; - homepage = "https://github.com/maxbachmann/rapidfuzz-cpp"; - changelog = "https://github.com/maxbachmann/rapidfuzz-cpp/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + homepage = "https://github.com/rapidfuzz/rapidfuzz-cpp"; + changelog = "https://github.com/rapidfuzz/rapidfuzz-cpp/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index aa8c3f54e2fe..65f7d61d0269 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cfitsio"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz"; - hash = "sha256-R6fI7gVoe+Hh2O7rlPuI8GD7882KTfUsy4jV6w9QYr4="; + hash = "sha256-lZAM+VrnYIOefLlninsvrQhY1qwSI0+TS9HLa/wka6k="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix index f6d00411221c..17838ab37390 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amd-blis"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "amd"; repo = "blis"; rev = version; - hash = "sha256-1vd4uBg/+Vufqsr+MnAWSUW/THkribHNSMeq1/is8K4="; + hash = "sha256-mLigzaA2S7qFCQT8UWC6bHWAvBjgpqvtgabPyFWBYT0="; }; inherit blas64; diff --git a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix index b03352c54e8a..0ca1c4950541 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "amd-libflame"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "amd"; repo = "libflame"; rev = version; - hash = "sha256-SZk11oOAnvn1vb7ucX6U9b0YtAJNxl3tQu4ExHpwwoo="; + hash = "sha256-eiH2eq+nKUjlB1bZTZNRW1+efCHZ68UOSFy0NpcY1FI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix index 23d749f1b297..e4bbd09a7586 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/clblast/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clblast"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "CNugteren"; repo = "CLBlast"; rev = version; - hash = "sha256-1ddjmoLhFoLi/z2cae0HZidUTySsZQDk1T8MVPTbfi4="; + hash = "sha256-S25g25Il6rzkpU9IqOFDDeEr3uYyt/uewZZAl09YSts="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index f4b168b37fe2..90e6c05da77d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -68,9 +68,7 @@ in stdenvNoCC.mkDerivation ({ dontUnpack = stdenvNoCC.isLinux; - unpackPhase = if stdenvNoCC.isDarwin then '' - 7zz x $src - '' else null; + sourceRoot = if stdenvNoCC.isDarwin then "." else null; nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin then diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 21c7d45a9099..4ee82bc0633e 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openlibm"; rev = "v${version}"; - sha256 = "sha256-q7BYUU8oChjuBFbVnpT+vqIAu+BVotT4xY2Dn0hmWfc="; + sha256 = "sha256-EnpwYtBpY+s5FVI2jhaFHTtAKHeaRlZVnWE/o2T1+FY="; }; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = { description = "High quality system independent, portable, open source libm implementation"; diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 1995068ebd92..ac08cb876253 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "9.0.2"; + version = "9.0.3"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-wPg5A1lwtRPDO5gPbllEFkRJFRIhkqqaVd4CBdPavKE="; + hash = "sha256-qRRrxMshLLEltCzXFv/j6NgRi6x1SHlAuKG5NfLiBFs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix b/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix index 4d820c0e36dc..c7795c3c1c2c 100644 --- a/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sdbus-cpp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - hash = "sha256-AOqwC7CABvQsG9P1PnUg2DIhNmHqYpgbKzm9C2gWNIQ="; + hash = "sha256-oO8QNffwNI245AEPdutOGqxj4qyusZYK3bZWLh2Lcag="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix index f2fc6a1a8676..0c40f67c21ee 100644 --- a/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.99"; + version = "0.2.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RxzysZsfTdhAtJCO3JOa/bSBNnHBRWkqBdwBa8sB74I="; + sha256 = "sha256-tMt6UBDqpdjAhxAJlVOFFlE3RC36/t8K0gBAzbesnsg="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/slib/default.nix b/nixpkgs/pkgs/development/libraries/slib/default.nix index 91c32b5dd3a8..54aa046bd676 100644 --- a/nixpkgs/pkgs/development/libraries/slib/default.nix +++ b/nixpkgs/pkgs/development/libraries/slib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "slib"; - version = "3b7"; + version = "3c1"; src = fetchurl { url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip"; - hash = "sha256-9dXNrTNTlaWlqjfv/iiqgHiyFuo5kR9lGSlnjxrCKLY="; + hash = "sha256-wvjrmOYFMN9TIRmF1LQDtul6epaYM8Gm0b+DVh2gx4E="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/span-lite/default.nix b/nixpkgs/pkgs/development/libraries/span-lite/default.nix index 1af8466a4d07..724870e0751c 100644 --- a/nixpkgs/pkgs/development/libraries/span-lite/default.nix +++ b/nixpkgs/pkgs/development/libraries/span-lite/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "span-lite"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "martinmoene"; repo = "span-lite"; rev = "v${version}"; - hash = "sha256-WfoyyPLBqXSGGATWN/wny6P++3aCmQMOMLCARhB+R3c="; + hash = "sha256-BYRSdGzIvrOjPXxeabMj4tPFmQ0wfq7y+zJf6BD/bTw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 05576b0dab14..d35f654650ee 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.5"; + version = "4.5.6"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-amWYkVQr+Rmcj+32lFDRq43Q+Ojj8V8B6KoURqdwGt0="; + hash = "sha256-tfDjl1l1vMWZsxFNEPK9jOrUN260/3k2kX6rVHPCZ0k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/termbox/default.nix b/nixpkgs/pkgs/development/libraries/termbox/default.nix index 51c2ca1c8084..22657cd663a2 100644 --- a/nixpkgs/pkgs/development/libraries/termbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/termbox/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "termbox"; version = "1.1.4"; src = fetchFromGitHub { owner = "termbox"; repo = "termbox"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "075swv6ajx8m424dbmgbf6fs6nd5q004gjpvx48gkxmnf9spvykl"; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/termbox/termbox/releases"; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/tevent/default.nix b/nixpkgs/pkgs/development/libraries/tevent/default.nix index 1d68421c6dcd..18e4522de9ea 100644 --- a/nixpkgs/pkgs/development/libraries/tevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/tevent/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tevent"; - version = "0.16.0"; + version = "0.16.1"; src = fetchurl { url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "sha256-GqWPIQF+2ML2Bq6Eqn55W1Q57dTdX2jxo4in1vtA9oI="; + sha256 = "sha256-Nilx4PMtwZBfb+RzYxnEuDSMItyFqmw/aQoo7+VIAp4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix index 6589e718f10e..ded5013cca99 100644 --- a/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/nixpkgs/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation { meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = lib.licenses.free; + license = lib.licenses.zlib; platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index d1b52fc5694c..4d4d837e2e92 100644 --- a/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -43,13 +43,13 @@ mariadb = stdenv.mkDerivation rec { pname = "mariadb-connector-odbc"; - version = "3.1.14"; + version = "3.1.20"; src = fetchFromGitHub { owner = "mariadb-corporation"; repo = "mariadb-connector-odbc"; rev = version; - sha256 = "0wvy6m9qfvjii3kanf2d1rhfaww32kg0d7m57643f79qb05gd6vg"; + hash = "sha256-l+HlS7/A0shwsEXYKDhi+QCmwHaMTeKrtcvo9yYpYws="; # this driver only seems to build correctly when built against the mariadb-connect-c subrepo # (see https://github.com/NixOS/nixpkgs/issues/73258) fetchSubmodules = true; @@ -64,12 +64,13 @@ buildInputs = [ unixODBC openssl libiconv zlib ] ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; - preConfigure = '' + # TODO: remove preConfigure on staging + preConfigure = if !stdenv.isDarwin then '' # we don't want to build a .pkg substituteInPlace CMakeLists.txt \ --replace "IF(APPLE)" "IF(0)" \ --replace "CMAKE_SYSTEM_NAME MATCHES AIX" "APPLE" - ''; + '' else null; cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" @@ -80,6 +81,10 @@ "-DWITH_IODBC=OFF" ]; + buildFlags = if stdenv.isDarwin then [ "maodbc" ] else null; + + installTargets = if stdenv.isDarwin then [ "install/fast" ] else null; + # see the top of the file for an explanation passthru = { fancyName = "MariaDB"; diff --git a/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix b/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix index a0fd70e10d3b..0483d2718541 100644 --- a/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/nixpkgs/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-1+x4KE2xh6KWbdCBlPxDvHvcKUEj4hiW4fEPCeYfTwc="; + sha256 = "sha256-trfKWCMIuYV0XyCcIsNP8LCTc0MYotXvslRvp76YnKU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/xgboost/default.nix b/nixpkgs/pkgs/development/libraries/xgboost/default.nix index 0af51a40dfb1..b700dd2581c4 100644 --- a/nixpkgs/pkgs/development/libraries/xgboost/default.nix +++ b/nixpkgs/pkgs/development/libraries/xgboost/default.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-tRx6kJwIoVSN701ppuyZpIFUQIFy4LBMFyirLtwApjA="; + hash = "sha256-LWco3A6zwdnAf8blU4qjW7PFEeZaTcJlVTwVrs7nwWM="; }; nativeBuildInputs = [ cmake ] @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; + mainProgram = "xgboost"; platforms = platforms.unix; maintainers = with maintainers; [ abbradar nviets ]; }; diff --git a/nixpkgs/pkgs/development/libraries/xvidcore/default.nix b/nixpkgs/pkgs/development/libraries/xvidcore/default.nix index 82520572c376..5ec3d44dfb62 100644 --- a/nixpkgs/pkgs/development/libraries/xvidcore/default.nix +++ b/nixpkgs/pkgs/development/libraries/xvidcore/default.nix @@ -35,12 +35,17 @@ stdenv.mkDerivation rec { rm $out/lib/*.a ''; + # Dependants of xvidcore don't know to look in bin for dependecies. Link them + # in lib so other depedants of xvidcore can find the dlls. + postFixup = lib.optionalString stdenv.hostPlatform.isMinGW '' + ln -s $out/bin/*.dll $out/lib + ''; + meta = with lib; { description = "MPEG-4 video codec for PC"; - homepage = "https://www.xvid.com/"; - license = licenses.gpl2; + homepage = "https://www.xvid.com/"; + license = licenses.gpl2; maintainers = with maintainers; [ codyopel lovek323 ]; - platforms = platforms.all; + platforms = platforms.all; }; } - diff --git a/nixpkgs/pkgs/development/libraries/zlog/default.nix b/nixpkgs/pkgs/development/libraries/zlog/default.nix index 4baa18b9d46f..df6c253075e6 100644 --- a/nixpkgs/pkgs/development/libraries/zlog/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "1.2.17"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ckpDMRLxObpl8N539DC5u2bPpmD7jM+KugurUfta6tg="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-22857.patch"; + url = "https://github.com/HardySimpson/zlog/commit/c47f781a9f1e9604f5201e27d046d925d0d48ac4.patch"; + hash = "sha256-3FAAHJ2R/OpNpErWXptjEh0x370/jzvK2VhuUuyaOjE="; + }) + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { |